summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-20 02:56:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-20 02:56:17 +0000
commitc4dbe835b4c289079e9ae6c4844606218639f9d0 (patch)
tree895b5469b23448844de3201edff31e22f01782ed /package
parent75a63f1981e3579963296b08de21aba7489f1b5c (diff)
downloadmtk-20170518-c4dbe835b4c289079e9ae6c4844606218639f9d0.zip
mtk-20170518-c4dbe835b4c289079e9ae6c4844606218639f9d0.tar.gz
mtk-20170518-c4dbe835b4c289079e9ae6c4844606218639f9d0.tar.bz2
busybox: fix issues with static routes and 6rd option parsing (thx, Florian Fuessl)
SVN-Revision: 26737
Diffstat (limited to 'package')
-rw-r--r--package/busybox/patches/244-udhcpc_add_6rd_option.patch22
1 files changed, 8 insertions, 14 deletions
diff --git a/package/busybox/patches/244-udhcpc_add_6rd_option.patch b/package/busybox/patches/244-udhcpc_add_6rd_option.patch
index 18a5996..21107ae 100644
--- a/package/busybox/patches/244-udhcpc_add_6rd_option.patch
+++ b/package/busybox/patches/244-udhcpc_add_6rd_option.patch
@@ -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
+++ 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
{ OPTION_STATIC_ROUTES , 0x79 }, /* DHCP_STATIC_ROUTES */
{ OPTION_STATIC_ROUTES , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */
@@ -11,16 +9,16 @@ index 0a60261..eaf2b4b 100644
{ OPTION_STRING , 0xfc }, /* DHCP_WPAD */
/* Options below have no match in dhcp_option_strings[],
-@@ -118,6 +120,8 @@ const char dhcp_option_strings[] ALIGN1 =
- // doesn't work in udhcpd.conf since OPTION_STATIC_ROUTES
+@@ -119,6 +121,8 @@ const char dhcp_option_strings[] ALIGN1
// is not handled yet by "string->option" conversion code:
"staticroutes" "\0"/* DHCP_STATIC_ROUTES */
+ "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
+ "ip6rd" "\0" /* DHCP_6RD (RFC) */
+ "ip6rd" "\0" /* DHCP_6RD (Comcast) */
- "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
"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,
/* Just like OPTION_STRING, we use minimum length here */
[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
+++ b/networking/udhcp/common.h
@@ -88,6 +88,7 @@ enum {
@@ -40,11 +36,9 @@ index f8f18ff..56cd8b0 100644
#if ENABLE_FEATURE_UDHCP_RFC3397
OPTION_DNS_STRING, /* RFC1035 compressed domain name list */
OPTION_SIP_SERVERS,
-diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 78aabed..993326f 100644
--- a/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_PAIR ] = sizeof("255.255.255.255 ") * 2,
[OPTION_STATIC_ROUTES ] = sizeof("255.255.255.255/32 255.255.255.255 "),
@@ -52,7 +46,7 @@ index 78aabed..993326f 100644
[OPTION_STRING ] = 1,
#if ENABLE_FEATURE_UDHCP_RFC3397
[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]);
}
@@ -76,7 +70,7 @@ index 78aabed..993326f 100644
/* really simple implementation, just count the bits */
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;
}