Changeset 24245


Ignore:
Timestamp:
2010-12-04T20:15:16+01:00 (7 years ago)
Author:
jow
Message:

[package] busybox: Comcast uses option 150 for 6RD DHCP announcements, cover it

Location:
trunk/package/busybox/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/busybox/patches/244-udhcpc_add_6rd_option.patch

    r23990 r24245  
    11--- a/networking/udhcp/common.c 
    22+++ b/networking/udhcp/common.c 
    3 @@ -54,6 +54,7 @@ const struct dhcp_optflag dhcp_optflags[ 
     3@@ -54,6 +54,8 @@ const struct dhcp_optflag dhcp_optflags[ 
    44        { OPTION_SIP_SERVERS                      , 0x78 }, /* DHCP_SIP_SERVERS   */ 
    55 #endif 
    66        { OPTION_STATIC_ROUTES                    , 0x79 }, /* DHCP_STATIC_ROUTES */ 
    7 +       { OPTION_6RD                              , 0xd4 }, /* DHCP_6RD           */ 
     7+       { OPTION_6RD                              , 0xd4 }, /* DHCP_6RD (RFC)     */ 
     8+       { OPTION_6RD                              , 0x96 }, /* DHCP_6RD (Comcast) */ 
    89        { OPTION_STRING                           , 0xfc }, /* DHCP_WPAD          */ 
    910  
    1011        /* Options below have no match in dhcp_option_strings[], 
    11 @@ -114,6 +115,7 @@ const char dhcp_option_strings[] ALIGN1  
     12@@ -114,6 +116,8 @@ const char dhcp_option_strings[] ALIGN1  
    1213 // doesn't work in udhcpd.conf since OPTION_STATIC_ROUTES 
    1314 // is not handled yet by "string->option" conversion code: 
    1415        "staticroutes" "\0"/* DHCP_STATIC_ROUTES  */ 
    15 +       "ip6rd" "\0"       /* DHCP_6RD            */ 
     16+       "ip6rd" "\0"       /* DHCP_6RD (RFC)      */ 
     17+       "ip6rd" "\0"       /* DHCP_6RD (Comcast)  */ 
    1618        "wpad" "\0"        /* DHCP_WPAD           */ 
    1719        ; 
    1820  
    19 @@ -141,6 +143,7 @@ const uint8_t dhcp_option_lengths[] ALIG 
     21@@ -141,6 +145,7 @@ const uint8_t dhcp_option_lengths[] ALIG 
    2022        [OPTION_S32] =     4, 
    2123        /* Just like OPTION_STRING, we use minimum length here */ 
  • trunk/package/busybox/patches/524-udhcpc_renew.patch

    r22660 r24245  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -711,7 +711,6 @@ static void perform_renew(void) 
     3@@ -793,7 +793,6 @@ static void perform_renew(void) 
    44                state = RENEW_REQUESTED; 
    55                break; 
Note: See TracChangeset for help on using the changeset viewer.