From 6fcc96c11b47d9b1d2351171f12f722505a8fb77 Mon Sep 17 00:00:00 2001 From: Toastman Date: Wed, 25 Jan 2012 23:53:48 +0700 Subject: [PATCH] route modem IP - fix missed changes, cosmetics --- release/src/router/rc/firewall.c | 2 +- release/src/router/rc/network.c | 2 +- release/src/router/www/basic-network.asp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/src/router/rc/firewall.c b/release/src/router/rc/firewall.c index deb3f5e79e..8a12498cb7 100644 --- a/release/src/router/rc/firewall.c +++ b/release/src/router/rc/firewall.c @@ -753,7 +753,7 @@ static void nat_table(void) #endif char *modem_ipaddr; - if ( (nvram_match("wan_proto", "pppoe") || nvram_match("wan_proto", "dhcp") ) + if ( (nvram_match("wan_proto", "pppoe") || nvram_match("wan_proto", "dhcp") || nvram_match("wan_proto", "static") ) && (modem_ipaddr = nvram_safe_get("modem_ipaddr")) && *modem_ipaddr && !nvram_match("modem_ipaddr","0.0.0.0") ) ipt_write("-A POSTROUTING -o %s -d %s -j MASQUERADE\n", nvram_safe_get("wan_ifname"), modem_ipaddr); diff --git a/release/src/router/rc/network.c b/release/src/router/rc/network.c index 70e37d6a2c..c4cd900faa 100644 --- a/release/src/router/rc/network.c +++ b/release/src/router/rc/network.c @@ -729,7 +729,7 @@ void do_static_routes(int add) free(buf); char *modem_ipaddr; - if ( (nvram_match("wan_proto", "pppoe") || nvram_match("wan_proto", "dhcp") ) + if ( (nvram_match("wan_proto", "pppoe") || nvram_match("wan_proto", "dhcp") || nvram_match("wan_proto", "static") ) && (modem_ipaddr = nvram_safe_get("modem_ipaddr")) && *modem_ipaddr && !nvram_match("modem_ipaddr","0.0.0.0") ) { char ip[16]; char *end = rindex(modem_ipaddr,'.')+1; diff --git a/release/src/router/www/basic-network.asp b/release/src/router/www/basic-network.asp index 32a170fc5a..d05364ec1d 100644 --- a/release/src/router/www/basic-network.asp +++ b/release/src/router/www/basic-network.asp @@ -1615,7 +1615,7 @@ createFieldTable('', [ { name: 'mtu_enable', type: 'select', options: [['0', 'Default'],['1','Manual']], value: nvram.mtu_enable }, { name: 'f_wan_mtu', type: 'text', maxlen: 4, size: 6, value: nvram.wan_mtu } ] }, { title: 'Single Line MLPPP', name: 'f_ppp_mlppp', type: 'checkbox', value: (nvram.ppp_mlppp == 1) }, - { title: 'Route Modem IP', name: 'modem_ipaddr', type: 'text', maxlen: 15, size: 17, suffix: ' (must be in different subnet to router)', value: nvram.modem_ipaddr }, + { title: 'Route Modem IP', name: 'modem_ipaddr', type: 'text', maxlen: 15, size: 17, suffix: ' (must be in different subnet to router, 0.0.0.0 to disable)', value: nvram.modem_ipaddr }, /* NOVLAN-BEGIN */ { title: 'Use WAN port for LAN', name: 'f_wan_islan', type: 'checkbox', value: (nvram.wan_islan == 1) } /* NOVLAN-END */ -- 2.11.4.GIT