diff -Nru old/etc/inc/interfaces.inc new/etc/inc/interfaces.inc
--- old/etc/inc/interfaces.inc 2004-08-22 11:41:15.000000000 +0200
+++ new/etc/inc/interfaces.inc 2004-10-18 20:51:44.000000000 +0200
@@ -431,6 +431,10 @@
$wancfg = $config['interfaces']['wan'];
$pppoecfg = $config['pppoe'];
+ if (!$pppoecfg['ondemand']) {
+ $pppoecfg['ondemand'] = "disable";
+ }
+
/* generate mpd.conf */
$fd = fopen("{$g['varetc_path']}/mpd.conf", "w");
if (!$fd) {
@@ -442,9 +446,11 @@
pppoe:
new -i ng0 pppoe pppoe
set iface route default
- set iface disable on-demand
- set iface idle 0
set iface up-script /usr/local/sbin/ppp-linkup
+ set iface down-script /usr/local/sbin/ppp-linkdown
+ set iface {$pppoecfg['ondemand']} on-demand
+ set iface addrs 10.0.0.1 10.0.0.2
+ set iface idle {$pppoecfg['timeout']}
set bundle disable multilink
set bundle authname "{$pppoecfg['username']}"
set bundle password "{$pppoecfg['password']}"
@@ -497,6 +503,10 @@
$wancfg = $config['interfaces']['wan'];
$pptpcfg = $config['pptp'];
+ if (!$pptpcfg['ondemand']) {
+ $pptpcfg['ondemand'] = "disable";
+ }
+
/* generate mpd.conf */
$fd = fopen("{$g['varetc_path']}/mpd.conf", "w");
if (!$fd) {
@@ -508,9 +518,11 @@
pptp:
new -i ng0 pptp pptp
set iface route default
- set iface disable on-demand
- set iface idle 0
set iface up-script /usr/local/sbin/ppp-linkup
+ set iface down-script /usr/local/sbin/ppp-linkdown
+ set iface {$pptpcfg['ondemand']} on-demand
+ set iface addrs {$pptpcfg['local']} {$pptpcfg['remote']}
+ set iface idle {$pptpcfg['timeout']}
set bundle disable multilink
set bundle authname "{$pptpcfg['username']}"
set bundle password "{$pptpcfg['password']}"
diff -Nru old/usr/local/sbin/ppp-linkdown new/usr/local/sbin/ppp-linkdown
--- old/usr/local/sbin/ppp-linkdown 1970-01-01 01:00:00.000000000 +0100
+++ new/usr/local/sbin/ppp-linkdown 2004-10-09 18:18:43.000000000 +0200
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# flush entries from NAT table
+/sbin/ipnat -CF
diff -Nru old/usr/local/www/interfaces_wan.php new/usr/local/www/interfaces_wan.php
--- old/usr/local/www/interfaces_wan.php 2004-08-22 11:41:15.000000000 +0200
+++ new/usr/local/www/interfaces_wan.php 2004-10-18 21:02:45.000000000 +0200
@@ -37,12 +37,16 @@
$pconfig['username'] = $config['pppoe']['username'];
$pconfig['password'] = $config['pppoe']['password'];
$pconfig['provider'] = $config['pppoe']['provider'];
+$pconfig['pppoe_dialondemand'] = $config['pppoe']['ondemand'];
+$pconfig['pppoe_idletimeout'] = $config['pppoe']['timeout'];
$pconfig['pptp_username'] = $config['pptp']['username'];
$pconfig['pptp_password'] = $config['pptp']['password'];
$pconfig['pptp_local'] = $config['pptp']['local'];
$pconfig['pptp_subnet'] = $config['pptp']['subnet'];
$pconfig['pptp_remote'] = $config['pptp']['remote'];
+$pconfig['pptp_dialondemand'] = $config['pptp']['ondemand'];
+$pconfig['pptp_idletimeout'] = $config['pptp']['timeout'];
$pconfig['bigpond_username'] = $config['bigpond']['username'];
$pconfig['bigpond_password'] = $config['bigpond']['password'];
@@ -88,12 +92,22 @@
$reqdfieldsn = explode(",", "IP address,Subnet bit count,Gateway");
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
} else if ($_POST['type'] == "PPPoE") {
- $reqdfields = explode(" ", "username password");
- $reqdfieldsn = explode(",", "PPPoE username,PPPoE password");
+ if ($_POST['pppoe_dialondemand']) {
+ $reqdfields = explode(" ", "username password pppoe_dialondemand pppoe_idletimeout");
+ $reqdfieldsn = explode(",", "PPPoE username,PPPoE password,Dial On Demand,Idle Timeout Value");
+ } else {
+ $reqdfields = explode(" ", "username password");
+ $reqdfieldsn = explode(",", "PPPoE username,PPPoE password");
+ }
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
} else if ($_POST['type'] == "PPTP") {
- $reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote");
- $reqdfieldsn = explode(",", "PPTP username,PPTP password,PPTP local IP address,PPTP subnet,PPTP remote IP address");
+ if ($_POST['pptp_dialondemand']) {
+ $reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote pptp_dialondemand pptp_idletimeout");
+ $reqdfieldsn = explode(",", "PPTP username,PPTP password,PPTP local IP address,PPTP subnet,PPTP remote IP address,Dial On Demand,Idle Timeout Value");
+ } else {
+ $reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote");
+ $reqdfieldsn = explode(",", "PPTP username,PPTP password,PPTP local IP address,PPTP subnet,PPTP remote IP address");
+ }
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
} else if ($_POST['type'] == "BigPond") {
$reqdfields = explode(" ", "bigpond_username bigpond_password");
@@ -113,6 +127,9 @@
if (($_POST['provider'] && !is_domain($_POST['provider']))) {
$input_errors[] = "The service name contains invalid characters.";
}
+ if ($_POST['pppoe_idletimeout'] && !is_numericint($_POST['pppoe_idletimeout'])) {
+ $input_errors[] = "The Idle Timeout Value must be an integer.";
+ }
if (($_POST['pptp_local'] && !is_ipaddr($_POST['pptp_local']))) {
$input_errors[] = "A valid PPTP local IP address must be specified.";
}
@@ -122,6 +139,9 @@
if (($_POST['pptp_remote'] && !is_ipaddr($_POST['pptp_remote']))) {
$input_errors[] = "A valid PPTP remote IP address must be specified.";
}
+ if ($_POST['pptp_idletimeout'] && !is_numericint($_POST['pptp_idletimeout'])) {
+ $input_errors[] = "The Idle Timeout Value must be an integer.";
+ }
if (($_POST['bigpond_authserver'] && !is_domain($_POST['bigpond_authserver']))) {
$input_errors[] = "The authentication server name contains invalid characters.";
}
@@ -155,11 +175,15 @@
unset($config['pppoe']['username']);
unset($config['pppoe']['password']);
unset($config['pppoe']['provider']);
+ unset($config['pppoe']['ondemand']);
+ unset($config['pppoe']['timeout']);
unset($config['pptp']['username']);
unset($config['pptp']['password']);
unset($config['pptp']['local']);
unset($config['pptp']['subnet']);
unset($config['pptp']['remote']);
+ unset($config['pptp']['ondemand']);
+ unset($config['pptp']['timeout']);
unset($config['bigpond']['username']);
unset($config['bigpond']['password']);
unset($config['bigpond']['authserver']);
@@ -178,6 +202,8 @@
$config['pppoe']['username'] = $_POST['username'];
$config['pppoe']['password'] = $_POST['password'];
$config['pppoe']['provider'] = $_POST['provider'];
+ $config['pppoe']['ondemand'] = $_POST['pppoe_dialondemand'];
+ $config['pppoe']['timeout'] = $_POST['pppoe_idletimeout'];
} else if ($_POST['type'] == "PPTP") {
$wancfg['ipaddr'] = "pptp";
$config['pptp']['username'] = $_POST['pptp_username'];
@@ -185,6 +211,8 @@
$config['pptp']['local'] = $_POST['pptp_local'];
$config['pptp']['subnet'] = $_POST['pptp_subnet'];
$config['pptp']['remote'] = $_POST['pptp_remote'];
+ $config['pptp']['ondemand'] = $_POST['pptp_dialondemand'];
+ $config['pptp']['timeout'] = $_POST['pptp_idletimeout'];
} else if ($_POST['type'] == "BigPond") {
$wancfg['ipaddr'] = "bigpond";
$config['bigpond']['username'] = $_POST['bigpond_username'];
@@ -218,12 +246,32 @@