diff options
| -rw-r--r-- | config/arpwatch.xml | 7 | ||||
| -rwxr-xr-x | config/arpwatch_reports.php | 1 | ||||
| -rw-r--r-- | config/iperf.xml | 15 | ||||
| -rw-r--r-- | config/iperfserver.xml | 8 |
4 files changed, 13 insertions, 18 deletions
diff --git a/config/arpwatch.xml b/config/arpwatch.xml index f77fce34..ea3f6795 100644 --- a/config/arpwatch.xml +++ b/config/arpwatch.xml @@ -7,13 +7,10 @@ /* ========================================================================== /* arpwatch.xml - part of pfSense (http://www.pfSense.com) - Copyright (C) 2007 to whom it may belong + part of pfSense (https://www.pfsense.org) + Copyright (C) 2007-2014 Electric Sheep Fencing LP All rights reserved. - Based on m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>. - All rights reserved. */ /* ========================================================================== */ /* diff --git a/config/arpwatch_reports.php b/config/arpwatch_reports.php index c2b4401e..9b3b1c6c 100755 --- a/config/arpwatch_reports.php +++ b/config/arpwatch_reports.php @@ -63,7 +63,6 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td> diff --git a/config/iperf.xml b/config/iperf.xml index f64500d9..3b17f549 100644 --- a/config/iperf.xml +++ b/config/iperf.xml @@ -150,13 +150,12 @@ $iperf_options = ""; if($_POST['protocol'] == "udp") $iperf_options .= " -u"; if($_POST['format'] == "bytes") $iperf_options .= " -f A"; - if($_POST['interval'] != "") $iperf_options .= " -i {$_POST['interval']}"; - if($_POST['length'] != "") $iperf_options .= " -l {$_POST['length']}"; - if($_POST['window'] != "") $iperf_options .= " -w {$_POST['window']}"; - if($_POST['udpbandwidth'] != "") $iperf_options .= " -b {$_POST['udpbandwidth']}"; - if($_POST['port'] != "") $iperf_options .= " -p {$_POST['port']}"; - $iperf_options .= " -c {$_POST['hostname']}"; + if($_POST['interval'] != "") $iperf_options .= " -i " . escapeshellarg($_POST['interval']); + if($_POST['length'] != "") $iperf_options .= " -l " . escapeshellarg($_POST['length']); + if($_POST['window'] != "") $iperf_options .= " -w " . escapeshellarg($_POST['window']); + if($_POST['udpbandwidth'] != "") $iperf_options .= " -b " . escapeshellarg($_POST['udpbandwidth']); + if($_POST['port'] != "") $iperf_options .= " -p " . escapeshellarg($_POST['port']); + $iperf_options .= " -c " . escapeshellarg($_POST['hostname']); system("/usr/local/bin/iperf" . $iperf_options); </custom_add_php_command> -</packagegui> - +</packagegui>
\ No newline at end of file diff --git a/config/iperfserver.xml b/config/iperfserver.xml index 493c41c8..f0dc074a 100644 --- a/config/iperfserver.xml +++ b/config/iperfserver.xml @@ -130,10 +130,10 @@ $iperf_options = ""; if($_POST['protocol'] == "udp") $iperf_options .= " -u"; if($_POST['format'] == "bytes") $iperf_options .= " -f A"; - if($_POST['interval'] != "") $iperf_options .= " -i {$_POST['interval']}"; - if($_POST['length'] != "") $iperf_options .= " -l {$_POST['length']}"; - if($_POST['window'] != "") $iperf_options .= " -w {$_POST['window']}"; - if($_POST['port'] != "") $iperf_options .= " -p {$_POST['port']}"; + if($_POST['interval'] != "") $iperf_options .= " -i " . escapeshellarg($_POST['interval']); + if($_POST['length'] != "") $iperf_options .= " -l " . escapeshellarg($_POST['length']); + if($_POST['window'] != "") $iperf_options .= " -w " . escapeshellarg($_POST['window']); + if($_POST['port'] != "") $iperf_options .= " -p " . escapeshellarg($_POST['port']); $iperf_options .= " -s"; mwexec_bg("/usr/local/bin/iperf" . $iperf_options); </custom_add_php_command> |