diff options
-rw-r--r-- | etc/inc/interfaces.inc | 45 | ||||
-rw-r--r-- | etc/inc/priv.defs.inc | 10 | ||||
-rwxr-xr-x | usr/local/www/diag_logs.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_auth.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_dhcp.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter_dynamic.php | 1 | ||||
-rw-r--r-- | usr/local/www/diag_logs_filter_summary.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ipsec.php | 1 | ||||
-rw-r--r-- | usr/local/www/diag_logs_ntpd.php | 1 | ||||
-rw-r--r-- | usr/local/www/diag_logs_openvpn.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ppp.php | 124 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_relayd.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_settings.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_slbd.php | 99 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_vpn.php | 1 | ||||
-rw-r--r-- | usr/local/www/help.php | 1 | ||||
-rw-r--r-- | usr/local/www/interfaces_ppps_edit.php | 14 |
18 files changed, 273 insertions, 32 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index c117065..a88e4ad 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1054,19 +1054,19 @@ EOD; function interface_ppps_configure($interface) { global $config, $g; - $wancfg = &$config['interfaces'][$interface]; + $intcfg = &$config['interfaces'][$interface]; if (is_array($config['ppps']['ppp']) && count($config['ppps']['ppp'])) { foreach ($config['ppps']['ppp'] as $pppid => $ppp) { - if ($wancfg['ptpid'] == $ppp['ptpid']) + if ($intcfg['ptpid'] == $ppp['ptpid']) break; } } - if (!$ppp || $wancfg['ptpid'] != $ppp['ptpid']){ + if (!$ppp || $intcfg['ptpid'] != $ppp['ptpid']){ log_error("PPP configuration error in interface_ppps_configure()."); return; } - $pppif = $wancfg['if']; + $pppif = $intcfg['if']; if ($ppp['type'] == "ppp") $type = "modem"; else @@ -1156,7 +1156,7 @@ EOD; if (isset($ppp['ondemand'])) { $mpdconf .= <<<EOD - set iface addrs 10.5.5.1 10.5.0.2 + set iface addrs 10.10.1.1 10.10.1.2 EOD; } @@ -1187,7 +1187,7 @@ EOD; EOD; } /* - if (!isset($wancfg['dnsnosec']) && isset($config['system']['dnsallowoverride'])) { + if (!isset($intcfg['dnsnosec']) && isset($config['system']['dnsallowoverride'])) { $mpdconf .= <<<EOD set ipcp enable req-sec-dns @@ -1330,6 +1330,10 @@ EOD; conf_mount_ro(); } } + // Check for PPPoE periodic reset request + if ($type == "pppoe" && isset($ppp['pppoe-reset-type'])) + setup_pppoe_reset_file($ppp['ptpid'], $interface); + if(file_exists("{$g['varrun_path']}/{$ppp['type']}_{$interface}.pid") and $g['booting']) { /* if we are booting and mpd has already been started then don't start again. */ } else { @@ -2274,7 +2278,7 @@ function interface_configure($interface = "wan", $reloadall = false) { interface_ppps_configure($interface); break; case 'pptp': - interface_pps_configure($interface); + interface_ppps_configure($interface); break; case 'ppp': interface_ppps_configure($interface); @@ -3484,24 +3488,25 @@ function is_jumbo_capable($int) { return false; } -function setup_pppoe_reset_file($ptpid, $status) { +function setup_pppoe_reset_file($ptpid, $interface) { + global $g; define("CRON_PPPOE_CMD_FILE", "{$g['varetc_path']}/ppp_restart_{$ptpid}"); - - if (is_array($config['interfaces']) && count($config['interfaces'])) { - foreach ($config['interfaces'] as $interface => $intcfg) { - if ($intcfg['ptpid'] == $ptpid) + $found = false; + if(isset($interface) && isset($ptpid)){ + $iflist = get_configured_interface_list(); + foreach($iflist as $if) { + if($if == $interface){ + $found = true; break; + } } } - if ($intcfg['ptpid'] == $ptpid){ - define("CRON_PPPOE_CMD", "#!/bin/sh\necho '<?php require(\"config.inc\"); require(\"interfaces.inc\"); interface_reconfigure({$interface}); ?>' | /usr/local/bin/php -q"); - } else - define("CRON_PPPOE_CMD", "#!/bin/sh\necho '<?php require(\"config.inc\"); log_error(\"PPPoE Periodic Reset defined for link that is NOT assigned to a WAN/OPTx interface.\"); ?>' | /usr/local/bin/php -q"); - if ($status == true) { - file_put_contents(CRON_PPPOE_CMD_FILE, CRON_PPPOE_CMD); - chmod(CRON_PPPOE_CMD_FILE, 0700); - + if ($found) { + define("CRON_PPPOE_CMD", "#!/bin/sh\necho '<?php require(\"config.inc\"); require(\"interfaces.inc\"); interface_reconfigure({$interface}); log_error(\"PPPoE periodic reset executed on {$interface}\"); ?>' | /usr/local/bin/php -q"); + file_put_contents(CRON_PPPOE_CMD_FILE, CRON_PPPOE_CMD); + chmod(CRON_PPPOE_CMD_FILE, 0700); + sigkillbypid("{$g['varrun_path']}/cron.pid", "HUP"); } else unlink_if_exists(CRON_PPPOE_CMD_FILE); } diff --git a/etc/inc/priv.defs.inc b/etc/inc/priv.defs.inc index 2c4543d..c9394d3 100644 --- a/etc/inc/priv.defs.inc +++ b/etc/inc/priv.defs.inc @@ -133,8 +133,8 @@ $priv_list['page-diagnostics-logs-settings']['match'] = array(); $priv_list['page-diagnostics-logs-settings']['match'][] = "diag_logs_settings.php*"; $priv_list['page-diagnostics-logs-pptpvpn'] = array(); -$priv_list['page-diagnostics-logs-pptpvpn']['name'] = "WebCfg - Diagnostics: Logs: VPN page"; -$priv_list['page-diagnostics-logs-pptpvpn']['descr'] = "Allow access to the 'Diagnostics: Logs: VPN' page."; +$priv_list['page-diagnostics-logs-pptpvpn']['name'] = "WebCfg - Diagnostics: Logs: PPTP VPN page"; +$priv_list['page-diagnostics-logs-pptpvpn']['descr'] = "Allow access to the 'Diagnostics: Logs: PPTP VPN' page."; $priv_list['page-diagnostics-logs-pptpvpn']['match'] = array(); $priv_list['page-diagnostics-logs-pptpvpn']['match'][] = "diag_logs_vpn.php*"; @@ -318,6 +318,12 @@ $priv_list['page-getstats']['descr'] = "Allow access to the 'AJAX: Get Stats' pa $priv_list['page-getstats']['match'] = array(); $priv_list['page-getstats']['match'][] = "getstats.php*"; +$priv_list['page-status-systemlogs-ppp'] = array(); +$priv_list['page-status-systemlogs-ppp']['name'] = "WebCfg - Status: System logs: IPsec VPN page"; +$priv_list['page-status-systemlogs-ppp']['descr'] = "Allow access to the 'Status: System logs: IPsec VPN' page."; +$priv_list['page-status-systemlogs-ppp']['match'] = array(); +$priv_list['page-status-systemlogs-ppp']['match'][] = "diag_logs_ppp.php*"; + $priv_list['page-diagnostics-nanobsd'] = array(); $priv_list['page-diagnostics-nanobsd']['name'] = "WebCfg - Diagnostics: NanoBSD"; $priv_list['page-diagnostics-nanobsd']['descr'] = "Allow access to the 'Diagnostics: NanoBSD' page."; diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 58470f9..85b61df 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -79,6 +79,7 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 25e92d6..700b6dc 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -67,6 +67,7 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", true, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 0b94962..b95b969 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -69,6 +69,7 @@ include("head.inc"); $tab_array[] = array("DHCP", true, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 819a4ce..9d8d9cd 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -103,6 +103,7 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index a8ac4b5..a07b52b 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -102,6 +102,7 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php index 485e26b..4904127 100644 --- a/usr/local/www/diag_logs_filter_summary.php +++ b/usr/local/www/diag_logs_filter_summary.php @@ -186,6 +186,7 @@ include("head.inc"); ?> $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 33052b5..039193b 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -89,6 +89,7 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", true, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index 033b6fc..d168f70 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -67,6 +67,7 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index 73e6ed5..aa50856 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -71,6 +71,7 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", true, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php new file mode 100755 index 0000000..470d33d --- /dev/null +++ b/usr/local/www/diag_logs_ppp.php @@ -0,0 +1,124 @@ +<?php +/* $Id$ */ +/* + diag_logs.php + Copyright (C) 2004-2009 Scott Ullrich + All rights reserved. + + originally part of m0n0wall (http://m0n0.ch/wall) + Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ + +/* + pfSense_BUILDER_BINARIES: /sbin/ifconfig /usr/bin/awk + pfSense_MODULE: +*/ + +##|+PRIV +##|*IDENT=page-status-systemlogs-ppp +##|*NAME=Status: System logs: IPsec VPN page +##|*DESCR=Allow access to the 'Status: System logs: IPsec VPN' page. +##|*MATCH=diag_logs_ppp.php* +##|-PRIV + +require("guiconfig.inc"); + +$ppp_logfile = "{$g['varlog_path']}/ppp.log"; + +$nentries = $config['syslog']['nentries']; +if (!$nentries) + $nentries = 50; + +if ($_POST['clear']) + clear_log_file($ppp_logfile); + +$ppp_logarr = return_clog($ppp_logfile, $nentries); + +$pgtitle = array("Status","System logs","PPP"); +include("head.inc"); + +?> +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<?php include("fbegin.inc"); ?> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td> +<?php + $tab_array = array(); + $tab_array[] = array("System", false, "diag_logs.php"); + $tab_array[] = array("Firewall", false, "diag_logs_filter.php"); + $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); + $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); + $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", true, "diag_logs_ppp.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); + $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); + $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); + $tab_array[] = array("Settings", false, "diag_logs_settings.php"); + display_top_tabs($tab_array); +?> + </td> + </tr> + <tr> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2" class="listtopic">Last <?=$nentries;?> PPP log entries</td> + </tr> + <?php + foreach($ppp_logarr as $logent){ + if(isset($match)) { + $logent = preg_replace($search, $replace, $logent); + } else { + $searchs = "/(racoon: )([A-Z:].*?)([0-9].+\.[0-9].+.[0-9].+.[0-9].+\[[0-9].+\])(.*)/i"; + $replaces = "$1<strong><font color=red>[Unknown Gateway/Dynamic]</font></strong>: $2$3$4"; + $logent = preg_replace($searchs, $replaces, $logent); + } + $logent = preg_split("/\s+/", $logent, 6); + echo "<tr valign=\"top\">\n"; + $entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3))); + echo "<td class=\"listlr\" nowrap>" . $entry_date_time . "</td>\n"; + echo "<td class=\"listr\">" . $logent[4] . " " . $logent[5] . "</td>\n"; + echo "</tr>\n"; + } + ?> + <tr> + <td> + <br> + <form action="diag_logs_ppp.php" method="post"> + <input name="clear" type="submit" class="formbtn" value="Clear log"> + </form> + </td> + </tr> + </table> + </div> + </td> + </tr> +</table> +<?php include("fend.inc"); ?> +</body> +</html> diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index a7a52a0..f267c74 100755 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -67,6 +67,7 @@ include("head.inc"); $tab_array[] = array("Firewall", false, "diag_logs_filter.php"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", true, "diag_logs_relayd.php"); diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 93e1169..f2b7861 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -171,6 +171,7 @@ function enable_change(enable_over) { $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php new file mode 100755 index 0000000..c55809a --- /dev/null +++ b/usr/local/www/diag_logs_slbd.php @@ -0,0 +1,99 @@ +<?php +/* $Id$ */ +/* + diag_logs_slbd.php + part of pfSense + + Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>. + Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ + +/* + pfSense_MODULE: routing +*/ + +##|+PRIV +##|*IDENT=page-status-systemlogs-loadbalancer +##|*NAME=Status: System logs: Load Balancer page +##|*DESCR=Allow access to the 'Status: System logs: Load Balancer' page. +##|*MATCH=diag_logs_slbd.php* +##|-PRIV + +require("guiconfig.inc"); + +$slbd_logfile = "{$g['varlog_path']}/slbd.log"; + +$nentries = $config['syslog']['nentries']; +if (!$nentries) + $nentries = 50; + +if ($_POST['clear']) + clear_log_file($slbd_logfile); + +$pgtitle = array("Status","System logs","Load Balancer"); +include("head.inc"); + +?> + +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<?php include("fbegin.inc"); ?> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td> +<?php + $tab_array = array(); + $tab_array[] = array("System", false, "diag_logs.php"); + $tab_array[] = array("Firewall", false, "diag_logs_filter.php"); + $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); + $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); + $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("Load Balancer", true, "diag_logs_slbd.php"); + $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); + $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); + $tab_array[] = array("Settings", false, "diag_logs_settings.php"); + display_top_tabs($tab_array); +?> + </td></tr> + <tr> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2" class="listtopic"> + Last <?=$nentries;?> Load Balancer log entries</td> + </tr> + <?php dump_clog($slbd_logfile, $nentries); ?> + <tr><td><br><form action="diag_logs_slbd.php" method="post"> + <input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr> + </table> + </div> +</form> + </td> + </tr> +</table> +<?php include("fend.inc"); ?> +</body> +</html> diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index e0faf23..83d0ecd 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -103,6 +103,7 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", true, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/help.php b/usr/local/www/help.php index 8a7514d..e5ac529 100644 --- a/usr/local/www/help.php +++ b/usr/local/www/help.php @@ -58,6 +58,7 @@ $helppages = array( 'diag_logs_filter_dynamic.php' => 'http://doc.pfsense.org/index.php/Firewall_Logs', 'diag_logs_filter_summary.php' => 'http://doc.pfsense.org/index.php/Firewall_Logs', 'diag_logs_ntpd.php' => 'http://doc.pfsense.org/index.php/NTP_Logs', + 'diag_logs_ppp.php' => 'http://doc.pfsense.org/index.php/PPP_Logs', 'diag_logs_relayd.php' => 'http://doc.pfsense.org/index.php/Load_Balancer_Logs', 'diag_logs_settings.php' => 'http://doc.pfsense.org/index.php/Log_Settings', 'diag_logs_vpn.php' => 'http://doc.pfsense.org/index.php/PPTP_VPN_Logs', diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php index 47c2901..ac5f7ba 100644 --- a/usr/local/www/interfaces_ppps_edit.php +++ b/usr/local/www/interfaces_ppps_edit.php @@ -373,7 +373,7 @@ if ($_POST) { $iflist = get_configured_interface_list(); foreach ($iflist as $if) { - if ($config['interfaces'][$if]['ptpid'] == $ppp['ptpid']){ + if ($config['interfaces'][$if]['ptpid'] == $_POST['ptpid']){ $thisif = $if; break; } @@ -385,7 +385,7 @@ if ($_POST) { write_config(); - if (!empty($thisif)){ + if (isset($thisif)){ interface_ppps_configure($thisif); } header("Location: interfaces_ppps.php"); @@ -397,7 +397,8 @@ function handle_pppoe_reset() { global $_POST, $config, $g; /* perform a periodic reset? */ if(empty($_POST['pppoe-reset-type'])) { - setup_pppoe_reset_file($_POST['ptpid'], false); + log_error("Calling setup_pppoe_reset to unlink reset file for {$_POST['ptpid']}."); + setup_pppoe_reset_file($_POST['ptpid']); return; } @@ -465,13 +466,6 @@ function handle_pppoe_reset() { $config['cron']['item'][$itemhash['ID']] = $item; else $config['cron']['item'][] = $item; - - // finally install the pppoerestart file - if (isset($_POST['pppoe-reset-type'])) { - setup_pppoe_reset_file($_POST['ptpid'], true); - sigkillbypid("{$g['varrun_path']}/cron.pid", "HUP"); - } else - setup_pppoe_reset_file($_POST['ptpid'], false); } $closehead = false; |