Ticket #667. Take another approach at handling dial-on-demand and Connect/Disconnect button. If the link is chosen for dial on demand during a disconnect request it will be brough up again instead of just leaving it down so traffic will flow easily when there is a request.

1 files changed, 6 insertions, 4 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index dc4cbdf..aaeef0b 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -819,10 +819,12 @@ function interface_bring_down($interface = "wan", $destroy = false) {
 		if (is_array($config['ppps']['ppp']) && count($config['ppps']['ppp'])) {
 			foreach ($config['ppps']['ppp'] as $pppid => $ppp) {
 				if ($realif == $ppp['if']) {
-					if (!isset($ppp['ondemand'])) {
-						killbypid("{$g['varrun_path']}/{$ifcfg['ipaddr']}_{$interface}.pid");
-						sleep(2);
-						unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf");
+					killbypid("{$g['varrun_path']}/{$ifcfg['ipaddr']}_{$interface}.pid");
+					sleep(2);
+					unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf");
+					if (isset($ppp['ondemand'])) {
+						$destroy = false;
+						interface_configure("wan");
 					}
 					break;
 				}