aboutsummaryrefslogtreecommitdiff
path: root/networking/udhcp/common.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-10-19 22:40:35 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2011-10-19 22:40:35 +0200
commit1f56e51ca1d96b70635eb1b9df1d1ab0edd98a72 (patch)
treeec991d04a4708e2bc2ac32b251e0ecd853a781cd /networking/udhcp/common.c
parent2ea73b513dfa831e75a297dd602576b40d38be3f (diff)
downloadbusybox-w32-1f56e51ca1d96b70635eb1b9df1d1ab0edd98a72.tar.gz
busybox-w32-1f56e51ca1d96b70635eb1b9df1d1ab0edd98a72.tar.bz2
busybox-w32-1f56e51ca1d96b70635eb1b9df1d1ab0edd98a72.zip
udhcpc: add support for DHCP option 212 (RFC 5969)
The patch is from OpenWRT people. function old new delta xmalloc_optname_optval 637 874 +237 dhcp_option_strings 237 243 +6 dhcp_optflags 68 70 +2 len_of_option_as_string 12 13 +1 dhcp_option_lengths 12 13 +1 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 5/0 up/down: 247/0) Total: 247 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/udhcp/common.c')
-rw-r--r--networking/udhcp/common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 70e34614c..ba41905cc 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -59,6 +59,7 @@ const struct dhcp_optflag dhcp_optflags[] = {
59 { OPTION_U16 , 0x84 }, /* DHCP_VLAN_ID */ 59 { OPTION_U16 , 0x84 }, /* DHCP_VLAN_ID */
60 { OPTION_U8 , 0x85 }, /* DHCP_VLAN_PRIORITY */ 60 { OPTION_U8 , 0x85 }, /* DHCP_VLAN_PRIORITY */
61#endif 61#endif
62 { OPTION_6RD , 0xd4 }, /* DHCP_6RD */
62 { OPTION_STATIC_ROUTES , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ 63 { OPTION_STATIC_ROUTES , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
63 { OPTION_STRING , 0xfc }, /* DHCP_WPAD */ 64 { OPTION_STRING , 0xfc }, /* DHCP_WPAD */
64 65
@@ -126,6 +127,7 @@ const char dhcp_option_strings[] ALIGN1 =
126 "vlanid" "\0" /* DHCP_VLAN_ID */ 127 "vlanid" "\0" /* DHCP_VLAN_ID */
127 "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */ 128 "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */
128#endif 129#endif
130 "ip6rd" "\0" /* DHCP_6RD */
129 "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ 131 "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
130 "wpad" "\0" /* DHCP_WPAD */ 132 "wpad" "\0" /* DHCP_WPAD */
131 ; 133 ;
@@ -154,6 +156,7 @@ const uint8_t dhcp_option_lengths[] ALIGN1 = {
154 [OPTION_S32] = 4, 156 [OPTION_S32] = 4,
155 /* Just like OPTION_STRING, we use minimum length here */ 157 /* Just like OPTION_STRING, we use minimum length here */
156 [OPTION_STATIC_ROUTES] = 5, 158 [OPTION_STATIC_ROUTES] = 5,
159 [OPTION_6RD] = 22, /* ignored by udhcp_str2optset */
157}; 160};
158 161
159 162