mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 17:15:00 +02:00
[package] busybox: Comcast uses option 150 for 6RD DHCP announcements, cover it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24245 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
0085e07976
commit
a1177f1d98
@ -1,22 +1,24 @@
|
||||
--- a/networking/udhcp/common.c
|
||||
+++ b/networking/udhcp/common.c
|
||||
@@ -54,6 +54,7 @@ const struct dhcp_optflag dhcp_optflags[
|
||||
@@ -54,6 +54,8 @@ const struct dhcp_optflag dhcp_optflags[
|
||||
{ OPTION_SIP_SERVERS , 0x78 }, /* DHCP_SIP_SERVERS */
|
||||
#endif
|
||||
{ OPTION_STATIC_ROUTES , 0x79 }, /* DHCP_STATIC_ROUTES */
|
||||
+ { OPTION_6RD , 0xd4 }, /* DHCP_6RD */
|
||||
+ { OPTION_6RD , 0xd4 }, /* DHCP_6RD (RFC) */
|
||||
+ { OPTION_6RD , 0x96 }, /* DHCP_6RD (Comcast) */
|
||||
{ OPTION_STRING , 0xfc }, /* DHCP_WPAD */
|
||||
|
||||
/* Options below have no match in dhcp_option_strings[],
|
||||
@@ -114,6 +115,7 @@ const char dhcp_option_strings[] ALIGN1
|
||||
@@ -114,6 +116,8 @@ const char dhcp_option_strings[] ALIGN1
|
||||
// doesn't work in udhcpd.conf since OPTION_STATIC_ROUTES
|
||||
// is not handled yet by "string->option" conversion code:
|
||||
"staticroutes" "\0"/* DHCP_STATIC_ROUTES */
|
||||
+ "ip6rd" "\0" /* DHCP_6RD */
|
||||
+ "ip6rd" "\0" /* DHCP_6RD (RFC) */
|
||||
+ "ip6rd" "\0" /* DHCP_6RD (Comcast) */
|
||||
"wpad" "\0" /* DHCP_WPAD */
|
||||
;
|
||||
|
||||
@@ -141,6 +143,7 @@ const uint8_t dhcp_option_lengths[] ALIG
|
||||
@@ -141,6 +145,7 @@ const uint8_t dhcp_option_lengths[] ALIG
|
||||
[OPTION_S32] = 4,
|
||||
/* Just like OPTION_STRING, we use minimum length here */
|
||||
[OPTION_STATIC_ROUTES] = 5,
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/networking/udhcp/dhcpc.c
|
||||
+++ b/networking/udhcp/dhcpc.c
|
||||
@@ -711,7 +711,6 @@ static void perform_renew(void)
|
||||
@@ -793,7 +793,6 @@ static void perform_renew(void)
|
||||
state = RENEW_REQUESTED;
|
||||
break;
|
||||
case RENEW_REQUESTED: /* impatient are we? fine, square 1 */
|
||||
|
Loading…
Reference in New Issue
Block a user