mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-18 18:06:17 +02:00
ca93116b8d
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24779 3c298f89-4303-0410-b956-a3cf2f4a3e73
23 lines
1.3 KiB
Diff
23 lines
1.3 KiB
Diff
--- a/networking/udhcp/common.c
|
|
+++ b/networking/udhcp/common.c
|
|
@@ -53,7 +53,8 @@ const struct dhcp_optflag dhcp_optflags[
|
|
{ OPTION_DNS_STRING | OPTION_LIST , 0x77 }, /* DHCP_DOMAIN_SEARCH */
|
|
{ OPTION_SIP_SERVERS , 0x78 }, /* DHCP_SIP_SERVERS */
|
|
#endif
|
|
- { OPTION_STATIC_ROUTES , 0x79 }, /* DHCP_STATIC_ROUTES */
|
|
+ { OPTION_STATIC_ROUTES , 0x79 }, /* DHCP_STATIC_ROUTES (RFC) */
|
|
+ { OPTION_STATIC_ROUTES , 0xf9 }, /* DHCP_STATIC_ROUTES (Microsoft) */
|
|
{ OPTION_6RD , 0xd4 }, /* DHCP_6RD (RFC) */
|
|
{ OPTION_6RD , 0x96 }, /* DHCP_6RD (Comcast) */
|
|
{ OPTION_STRING , 0xfc }, /* DHCP_WPAD */
|
|
@@ -115,7 +116,8 @@ const char dhcp_option_strings[] ALIGN1
|
|
#endif
|
|
// doesn't work in udhcpd.conf since OPTION_STATIC_ROUTES
|
|
// is not handled yet by "string->option" conversion code:
|
|
- "staticroutes" "\0"/* DHCP_STATIC_ROUTES */
|
|
+ "staticroutes" "\0" /* DHCP_STATIC_ROUTES (RFC) */
|
|
+ "msstaticroutes" "\0"/* DHCP_STATIC_ROUTES (Microsoft) */
|
|
"ip6rd" "\0" /* DHCP_6RD (RFC) */
|
|
"ip6rd" "\0" /* DHCP_6RD (Comcast) */
|
|
"wpad" "\0" /* DHCP_WPAD */
|