diff options
| author | Denys Vlasenko | 2021-06-02 15:07:46 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2021-06-02 15:07:46 +0200 |
| commit | 698cdef538f51bb85b68d591b1e42eb6b04d891c (patch) | |
| tree | 0946d0c3a0f0749f30d4f16a6c50e519e03f5de9 /networking/udhcp/common.c | |
| parent | 265fcddd08f22c99a2a419a1537c18f4d6d43e9f (diff) | |
| download | busybox-698cdef538f51bb85b68d591b1e42eb6b04d891c.zip busybox-698cdef538f51bb85b68d591b1e42eb6b04d891c.tar.gz | |
udhcpc: remove deprecated -H/-h HOSTNAME options (9 years), deprecate -V VENDOR
function old new delta
udhcpc_main 2563 2582 +19
dhcp_option_strings 294 301 +7
dhcp_optflags 80 82 +2
.rodata 103250 103248 -2
udhcpc_longopts 252 241 -11
add_client_options 209 175 -34
alloc_dhcp_option 59 - -59
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 3/3 up/down: 28/-106) Total: -78 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/udhcp/common.c')
| -rw-r--r-- | networking/udhcp/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c index 684d76b..7929950 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c @@ -49,6 +49,7 @@ const struct dhcp_optflag dhcp_optflags[] = { { OPTION_U32 , 0x33 }, /* DHCP_LEASE_TIME */ { OPTION_IP , 0x36 }, /* DHCP_SERVER_ID */ { OPTION_STRING , 0x38 }, /* DHCP_ERR_MESSAGE */ + { OPTION_STRING , 0x3c }, /* DHCP_VENDOR */ //TODO: must be combined with 'sname' and 'file' handling: { OPTION_STRING_HOST , 0x42 }, /* DHCP_TFTP_SERVER_NAME */ { OPTION_STRING , 0x43 }, /* DHCP_BOOT_FILE */ @@ -83,7 +84,6 @@ const struct dhcp_optflag dhcp_optflags[] = { { OPTION_U8 , 0x35 }, /* DHCP_MESSAGE_TYPE */ { OPTION_U16 , 0x39 }, /* DHCP_MAX_SIZE */ //looks like these opts will work just fine even without these defs: -// { OPTION_STRING , 0x3c }, /* DHCP_VENDOR */ // /* not really a string: */ // { OPTION_STRING , 0x3d }, /* DHCP_CLIENT_ID */ { 0, 0 } /* zeroed terminating entry */ @@ -120,6 +120,7 @@ const char dhcp_option_strings[] ALIGN1 = "lease" "\0" /* DHCP_LEASE_TIME */ "serverid" "\0" /* DHCP_SERVER_ID */ "message" "\0" /* DHCP_ERR_MESSAGE */ + "vendor" "\0" /* DHCP_VENDOR */ "tftp" "\0" /* DHCP_TFTP_SERVER_NAME*/ "bootfile" "\0" /* DHCP_BOOT_FILE */ // "userclass" "\0" /* DHCP_USER_CLASS */ |