qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 00:30:16 +02:00
Code

busybox: fix issues with static routes and 6rd option parsing (thx, Florian Fuessl)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26737 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-04-20 02:56:17 +00:00
parent f3a65e72db
commit 9649fa8eb2
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
package/busybox/patches/244-udhcpc_add_6rd_option.patch
View File

@ -1,8 +1,6 @@
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 0a60261..eaf2b4b 100644
--- a/networking/udhcp/common.c --- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c +++ b/networking/udhcp/common.c
@@ -56,6 +56,8 @@ const struct dhcp_optflag dhcp_optflags[] = { @@ -56,6 +56,8 @@ const struct dhcp_optflag dhcp_optflags[
#endif #endif
{ OPTION_STATIC_ROUTES , 0x79 }, /* DHCP_STATIC_ROUTES */ { OPTION_STATIC_ROUTES , 0x79 }, /* DHCP_STATIC_ROUTES */
{ OPTION_STATIC_ROUTES , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ { OPTION_STATIC_ROUTES , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
@ -11,16 +9,16 @@ index 0a60261..eaf2b4b 100644
{ OPTION_STRING , 0xfc }, /* DHCP_WPAD */ { OPTION_STRING , 0xfc }, /* DHCP_WPAD */
/* Options below have no match in dhcp_option_strings[], /* Options below have no match in dhcp_option_strings[],
@@ -118,6 +120,8 @@ const char dhcp_option_strings[] ALIGN1 = @@ -119,6 +121,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: // is not handled yet by "string->option" conversion code:
"staticroutes" "\0"/* DHCP_STATIC_ROUTES */ "staticroutes" "\0"/* DHCP_STATIC_ROUTES */
"msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
+ "ip6rd" "\0" /* DHCP_6RD (RFC) */ + "ip6rd" "\0" /* DHCP_6RD (RFC) */
+ "ip6rd" "\0" /* DHCP_6RD (Comcast) */ + "ip6rd" "\0" /* DHCP_6RD (Comcast) */
"msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
"wpad" "\0" /* DHCP_WPAD */ "wpad" "\0" /* DHCP_WPAD */
; ;
@@ -146,6 +150,7 @@ const uint8_t dhcp_option_lengths[] ALIGN1 = {
@@ -146,6 +150,7 @@ const uint8_t dhcp_option_lengths[] ALIG
[OPTION_S32] = 4, [OPTION_S32] = 4,
/* Just like OPTION_STRING, we use minimum length here */ /* Just like OPTION_STRING, we use minimum length here */
[OPTION_STATIC_ROUTES] = 5, [OPTION_STATIC_ROUTES] = 5,
@ -28,8 +26,6 @@ index 0a60261..eaf2b4b 100644
}; };
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index f8f18ff..56cd8b0 100644
--- a/networking/udhcp/common.h --- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h +++ b/networking/udhcp/common.h
@@ -88,6 +88,7 @@ enum { @@ -88,6 +88,7 @@ enum {
@ -40,11 +36,9 @@ index f8f18ff..56cd8b0 100644
#if ENABLE_FEATURE_UDHCP_RFC3397 #if ENABLE_FEATURE_UDHCP_RFC3397
OPTION_DNS_STRING, /* RFC1035 compressed domain name list */ OPTION_DNS_STRING, /* RFC1035 compressed domain name list */
OPTION_SIP_SERVERS, OPTION_SIP_SERVERS,
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 78aabed..993326f 100644
--- a/networking/udhcp/dhcpc.c --- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c
@@ -45,6 +45,7 @@ static const uint8_t len_of_option_as_string[] = { @@ -45,6 +45,7 @@ static const uint8_t len_of_option_as_st
[OPTION_IP ] = sizeof("255.255.255.255 "), [OPTION_IP ] = sizeof("255.255.255.255 "),
[OPTION_IP_PAIR ] = sizeof("255.255.255.255 ") * 2, [OPTION_IP_PAIR ] = sizeof("255.255.255.255 ") * 2,
[OPTION_STATIC_ROUTES ] = sizeof("255.255.255.255/32 255.255.255.255 "), [OPTION_STATIC_ROUTES ] = sizeof("255.255.255.255/32 255.255.255.255 "),
@ -52,7 +46,7 @@ index 78aabed..993326f 100644
[OPTION_STRING ] = 1, [OPTION_STRING ] = 1,
#if ENABLE_FEATURE_UDHCP_RFC3397 #if ENABLE_FEATURE_UDHCP_RFC3397
[OPTION_DNS_STRING ] = 1, /* unused */ [OPTION_DNS_STRING ] = 1, /* unused */
@@ -68,6 +69,23 @@ static int sprint_nip(char *dest, const char *pre, const uint8_t *ip) @@ -68,6 +69,23 @@ static int sprint_nip(char *dest, const
return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]); return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]);
} }
@ -76,7 +70,7 @@ index 78aabed..993326f 100644
/* really simple implementation, just count the bits */ /* really simple implementation, just count the bits */
static int mton(uint32_t mask) static int mton(uint32_t mask)
{ {
@@ -177,6 +195,70 @@ static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_ @@ -177,6 +195,70 @@ static NOINLINE char *xmalloc_optname_op
return ret; return ret;
} }