From f94e6a834302c2a19ff8c7f7415a58d67cf85da7 Mon Sep 17 00:00:00 2001
From: Kevin Darbyshire-Bryant <kdbtomato@darbyshire-bryant.me.uk>
Date: Mon, 20 May 2013 21:34:07 +0100
Subject: [PATCH] Expose pppoe lcp echo parameters in gui

---
 release/src/router/httpd/tomato.c        |  2 ++
 release/src/router/nvram/defaults.c      |  4 ++--
 release/src/router/www/basic-network.asp | 24 +++++++++++++++++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/release/src/router/httpd/tomato.c b/release/src/router/httpd/tomato.c
index dd91b1007d..24a9892242 100644
--- a/release/src/router/httpd/tomato.c
+++ b/release/src/router/httpd/tomato.c
@@ -560,6 +560,8 @@ static const nvset_t nvset_list[] = {
 	{ "wan_mtu",			V_RANGE(576, 1500)	},
 	{ "wan_islan",			V_01				},
 	{ "modem_ipaddr",		V_IP				},
+	{ "pppoe_lei",			V_RANGE(1, 60)			},
+	{ "pppoe_lef",			V_RANGE(1, 10)			},
 
 	// 3G MODEM
 	{ "modem_pin",			V_LENGTH(0,6)	},
diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c
index 477c5b3985..42a6ed8c2d 100644
--- a/release/src/router/nvram/defaults.c
+++ b/release/src/router/nvram/defaults.c
@@ -159,8 +159,8 @@ const defaults_t defaults[] = {
 	{ "ppp_custom",			""				},	// PPPD additional options
 	{ "ppp_mlppp",			"0"				},	// PPPoE single line MLPPP
 
-	{ "pppoe_lei",			""				},
-	{ "pppoe_lef",			""				},
+	{ "pppoe_lei",			"10"				},	// PPP LCP Echo interval
+	{ "pppoe_lef",			"5"				},	// PPP LCP echo link failure limit
 
 #ifdef TCONFIG_IPV6
 	// IPv6 parameters
diff --git a/release/src/router/www/basic-network.asp b/release/src/router/www/basic-network.asp
index 2bcbdf561b..587dc00585 100644
--- a/release/src/router/www/basic-network.asp
+++ b/release/src/router/www/basic-network.asp
@@ -46,7 +46,7 @@
 <script type='text/javascript' src='interfaces.js'></script>
 <script type='text/javascript'>
 
-//	<% nvram("dhcp_lease,dhcp_num,dhcp_start,dhcpd_startip,dhcpd_endip,l2tp_server_ip,lan_gateway,lan_ipaddr,lan_netmask,lan_proto,mtu_enable,ppp_demand,ppp_idletime,ppp_passwd,ppp_redialperiod,ppp_service,ppp_username,ppp_custom,pptp_server_ip,pptp_dhcp,wl_security_mode,wan_dns,wan_gateway,wan_ipaddr,wan_mtu,wan_netmask,wan_proto,wan_wins,wl_wds_enable,wl_channel,wl_closed,wl_crypto,wl_key,wl_key1,wl_key2,wl_key3,wl_key4,wl_lazywds,wl_mode,wl_net_mode,wl_passphrase,wl_radio,wl_radius_ipaddr,wl_radius_port,wl_ssid,wl_wds,wl_wep_bit,wl_wpa_gtk_rekey,wl_wpa_psk,wl_radius_key,wl_auth,wl_hwaddr,wan_islan,t_features,wl_nbw_cap,wl_nctrlsb,wl_nband,wl_phytype,lan_ifname,lan_stp,lan1_ifname,lan1_ipaddr,lan1_netmask,lan1_proto,lan1_stp,dhcp1_start,dhcp1_num,dhcp1_lease,dhcpd1_startip,dhcpd1_endip,lan2_ifname,lan2_ipaddr,lan2_netmask,lan2_proto,lan2_stp,dhcp2_start,dhcp2_num,dhcp2_lease,dhcpd2_startip,dhcpd2_endip,lan3_ifname,lan3_ipaddr,lan3_netmask,lan3_proto,lan3_stp,dhcp3_start,dhcp3_num,dhcp3_lease,dhcpd3_startip,dhcpd3_endip,ppp_mlppp,modem_ipaddr,modem_pin,modem_dev,modem_init,modem_apn,cstats_enable"); %>
+//	<% nvram("dhcp_lease,dhcp_num,dhcp_start,dhcpd_startip,dhcpd_endip,l2tp_server_ip,lan_gateway,lan_ipaddr,lan_netmask,lan_proto,mtu_enable,ppp_demand,ppp_idletime,pppoe_lei,pppoe_lef,ppp_passwd,ppp_redialperiod,ppp_service,ppp_username,ppp_custom,pptp_server_ip,pptp_dhcp,wl_security_mode,wan_dns,wan_gateway,wan_ipaddr,wan_mtu,wan_netmask,wan_proto,wan_wins,wl_wds_enable,wl_channel,wl_closed,wl_crypto,wl_key,wl_key1,wl_key2,wl_key3,wl_key4,wl_lazywds,wl_mode,wl_net_mode,wl_passphrase,wl_radio,wl_radius_ipaddr,wl_radius_port,wl_ssid,wl_wds,wl_wep_bit,wl_wpa_gtk_rekey,wl_wpa_psk,wl_radius_key,wl_auth,wl_hwaddr,wan_islan,t_features,wl_nbw_cap,wl_nctrlsb,wl_nband,wl_phytype,lan_ifname,lan_stp,lan1_ifname,lan1_ipaddr,lan1_netmask,lan1_proto,lan1_stp,dhcp1_start,dhcp1_num,dhcp1_lease,dhcpd1_startip,dhcpd1_endip,lan2_ifname,lan2_ipaddr,lan2_netmask,lan2_proto,lan2_stp,dhcp2_start,dhcp2_num,dhcp2_lease,dhcpd2_startip,dhcpd2_endip,lan3_ifname,lan3_ipaddr,lan3_netmask,lan3_proto,lan3_stp,dhcp3_start,dhcp3_num,dhcp3_lease,dhcpd3_startip,dhcpd3_endip,ppp_mlppp,modem_ipaddr,modem_pin,modem_dev,modem_init,modem_apn,cstats_enable"); %>
 
 /* VLAN-BEGIN */
 var lg = new TomatoGrid();
@@ -719,6 +719,8 @@ function verifyFields(focused, quiet)
 		_ppp_demand: 1,
 		_ppp_idletime: 1,
 		_ppp_redialperiod: 1,
+		_pppoe_lei: 1,
+		_pppoe_lef: 1,
 		_mtu_enable: 1,
 		_f_wan_mtu: 1,
 		_f_wan_islan: 0,
@@ -827,9 +829,13 @@ function verifyFields(focused, quiet)
 		vis._modem_dev = 0;
 		vis._modem_init = 0;
 		vis._modem_apn = 0;
+		vis._pppoe_lei = 0;
+		vis._pppoe_lef = 0;
 		break;
 	case 'dhcp':
 		vis._l2tp_server_ip = 0;
+		vis._pppoe_lei = 0;
+		vis._pppoe_lef = 0;
 		vis._ppp_demand = 0;
 		vis._ppp_service = 0;
 		vis._ppp_username = 0;
@@ -864,6 +870,8 @@ function verifyFields(focused, quiet)
 		vis._modem_apn = 0;
 		break;
 	case 'ppp3g':
+		vis._pppoe_lei = 0;
+		vis._pppoe_lef = 0;
 		vis._ppp_service = 0;
 		vis._l2tp_server_ip = 0;
 		vis._pptp_server_ip = 0;
@@ -876,6 +884,8 @@ function verifyFields(focused, quiet)
 		vis._f_ppp_mlppp = 0;
 		break;
 	case 'static':
+		vis._pppoe_lei = 0;
+		vis._pppoe_lef = 0;
 		vis._l2tp_server_ip = 0;
 		vis._ppp_demand = 0;
 		vis._ppp_service = 0;
@@ -893,6 +903,8 @@ function verifyFields(focused, quiet)
 		vis._modem_apn = 0;
 		break;
 	case 'pptp':
+		vis._pppoe_lei = 0;
+		vis._pppoe_lef = 0;
 		vis._l2tp_server_ip = 0;
 		vis._ppp_service = 0;
 		vis._wan_gateway = (!E('_f_pptp_dhcp').checked);
@@ -906,6 +918,8 @@ function verifyFields(focused, quiet)
 		vis._modem_apn = 0;
 		break;
 	case 'l2tp':
+		vis._pppoe_lei = 0;
+		vis._pppoe_lef = 0;
 		vis._pptp_server_ip = 0;
 		vis._ppp_service = 0;
 		vis._wan_gateway = (!E('_f_pptp_dhcp').checked);
@@ -1216,10 +1230,11 @@ REMOVE-END */
 	// range
 /* NOVLAN-BEGIN */
 	a = [['_ppp_idletime', 3, 1440],['_ppp_redialperiod', 1, 86400],['_f_wan_mtu', 576, 1500],
-		 ['_dhcp_lease', 1, 10080]];
+		 ['_dhcp_lease', 1, 10080],['_pppoe_lei', 1, 60],['_pppoe_lef', 1, 10]];
 /* NOVLAN-END */
 /* VLAN-BEGIN */
-	a = [['_ppp_idletime', 3, 1440],['_ppp_redialperiod', 1, 86400],['_f_wan_mtu', 576, 1500]];
+	a = [['_ppp_idletime', 3, 1440],['_ppp_redialperiod', 1, 86400],['_f_wan_mtu', 576, 1500],
+		['_pppoe_lei', 1, 60],['_pppoe_lef', 1, 10]];
 /* VLAN-END */
 	for (i = a.length - 1; i >= 0; --i) {
 		v = a[i];
@@ -1657,6 +1672,9 @@ createFieldTable('', [
 		value: nvram.ppp_idletime },
 	{ title: 'Redial Interval', indent: 2, name: 'ppp_redialperiod', type: 'text', maxlen: 5, size: 7, suffix: ' <i>(seconds)</i>',
 		value: nvram.ppp_redialperiod },
+	{ title: 'LCP Echo Interval', indent: 2, name: 'pppoe_lei', type: 'text', maxlen: 5, size: 7, suffix: ' <i>(seconds)</i>',
+		value: nvram.pppoe_lei },
+	{ title: 'LCP Echo Link fail limit', indent: 2, name: 'pppoe_lef', type: 'text', maxlen: 5, size: 7, value: nvram.pppoe_lef },
 	{ title: 'MTU', multi: [
 		{ 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 } ] },
-- 
2.11.4.GIT