[package] busybox: Comcast uses option 150 for 6RD DHCP announcements, cover it
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 4 Dec 2010 19:15:16 +0000 (19:15 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 4 Dec 2010 19:15:16 +0000 (19:15 +0000)
SVN-Revision: 24245

package/busybox/patches/244-udhcpc_add_6rd_option.patch
package/busybox/patches/524-udhcpc_renew.patch

index 3037708..0bf6ff0 100644 (file)
@@ -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,
index 2a72755..2a8e1c1 100644 (file)
@@ -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 */