gitignore: add *.rej and *.orig to .gitignore
[openwrt.git] / package / busybox / patches / 245-udhcpc_add_msroutes_option.patch
1 --- a/networking/udhcp/common.c
2 +++ b/networking/udhcp/common.c
3 @@ -53,7 +53,8 @@ const struct dhcp_optflag dhcp_optflags[
4         { OPTION_DNS_STRING | OPTION_LIST         , 0x77 }, /* DHCP_DOMAIN_SEARCH */
5         { OPTION_SIP_SERVERS                      , 0x78 }, /* DHCP_SIP_SERVERS   */
6  #endif
7 -       { OPTION_STATIC_ROUTES                    , 0x79 }, /* DHCP_STATIC_ROUTES */
8 +       { OPTION_STATIC_ROUTES                    , 0x79 }, /* DHCP_STATIC_ROUTES (RFC)       */
9 +       { OPTION_STATIC_ROUTES                    , 0xf9 }, /* DHCP_STATIC_ROUTES (Microsoft) */
10         { OPTION_6RD                              , 0xd4 }, /* DHCP_6RD (RFC)     */
11         { OPTION_6RD                              , 0x96 }, /* DHCP_6RD (Comcast) */
12         { OPTION_STRING                           , 0xfc }, /* DHCP_WPAD          */
13 @@ -115,7 +116,8 @@ const char dhcp_option_strings[] ALIGN1 
14  #endif
15  // doesn't work in udhcpd.conf since OPTION_STATIC_ROUTES
16  // is not handled yet by "string->option" conversion code:
17 -       "staticroutes" "\0"/* DHCP_STATIC_ROUTES  */
18 +       "staticroutes" "\0"  /* DHCP_STATIC_ROUTES (RFC)       */
19 +       "msstaticroutes" "\0"/* DHCP_STATIC_ROUTES (Microsoft) */
20         "ip6rd" "\0"       /* DHCP_6RD (RFC)      */
21         "ip6rd" "\0"       /* DHCP_6RD (Comcast)  */
22         "wpad" "\0"        /* DHCP_WPAD           */