aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/diag_states_pt/diag_new_states.php362
-rw-r--r--config/diag_states_pt/diag_new_states.xml78
-rw-r--r--pkg_config.10.xml2
3 files changed, 212 insertions, 230 deletions
diff --git a/config/diag_states_pt/diag_new_states.php b/config/diag_states_pt/diag_new_states.php
index d187068f..00b22e33 100644
--- a/config/diag_states_pt/diag_new_states.php
+++ b/config/diag_states_pt/diag_new_states.php
@@ -1,43 +1,35 @@
<?php
/*
- diag_new_staes.php
- Copyright (C) 2002 Paul Taylor
- 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.
+ diag_new_states.php
+ part of pfSense (https://www.pfSense.org/)
+ Copyright (C) 2002 Paul Taylor
+ Copyright (C) 2015 ESF, LLC
+ 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.
*/
-
require_once("guiconfig.inc");
-
global $config;
-if ($config['version'] >= 6)
- $pgtitle = array("Diagnostics", "Show States");
-else
- $pgtitle = "Diagnostics: Show States";
-
-/* put your custom HTML head content here */
-/* using some of the $pfSenseHead function calls */
-
function displayIP($ip, $col) {
global $viewPassThru;
@@ -55,10 +47,10 @@ function displayIP($ip, $col) {
case 'dstip':
if ($_GET['dfilter']) {
- if ($_GET['dfilter'] == $ip)
+ if ($_GET['dfilter'] == $ip) {
return $ip;
- }
- else {
+ }
+ } else {
return '<a href="?dfilter='.$ip.$viewPassThru.'">'. $ip .'</a>';
}
break;
@@ -69,32 +61,34 @@ function displayIP($ip, $col) {
function sortOrder($column) {
if ($_GET['order'] == $column) {
- if ($_GET['sort'] == 'des')
- return "&sort=asc";
- return "&sort=des";
+ if ($_GET['sort'] == 'des') {
+ return "&amp;sort=asc";
+ }
+ return "&amp;sort=des";
+ } else {
+ return "&amp;sort=asc";
}
- else
- return "&sort=asc";
}
+// FIXME: Needs changes to handle IPv6 addresses properly
function stripPort($ip, $showPort = false) {
if (!$showPort) {
- if (strpos($ip,':') > 0)
- return substr($ip,0,strpos($ip,":"));
- else
+ if (strpos($ip, ':') > 0) {
+ return substr($ip, 0, strpos($ip, ":"));
+ } else {
return ($ip);
- }
- else {
- if (strpos($ip,':') > 0) {
- return substr($ip,(strpos($ip,":")+1));
}
- else
+ } else {
+ if (strpos($ip, ':') > 0) {
+ return substr($ip, (strpos($ip, ":")+1));
+ } else {
return "&nbsp;";
+ }
}
}
// sfilter and dfilter allow setting of source and dest IP filters
-// on the output. $filterPassThru allows these source and dest
+// on the output. $filterPassThru allows these source and dest
// filters to be passed on in the column sorting links.
if (($_GET['sfilter']) or ($_GET['dfilter'])) {
@@ -102,18 +96,18 @@ if (($_GET['sfilter']) or ($_GET['dfilter'])) {
if ($_GET['sfilter']) {
if (is_ipaddr($_GET['sfilter'])) {
$sfilter = $_GET['sfilter'];
- $filterPassThru = '&sfilter=' . $_GET['sfilter'];
- }
- else
+ $filterPassThru = '&amp;sfilter=' . $_GET['sfilter'];
+ } else {
unset ($_GET['sfilter']);
+ }
}
if ($_GET['dfilter']) {
if (is_ipaddr($_GET['dfilter'])) {
$dfilter = $_GET['dfilter'];
- $filterPassThru = '&dfilter=' . $_GET['dfilter'];
- }
- else
+ $filterPassThru = '&amp;dfilter=' . $_GET['dfilter'];
+ } else {
unset ($_GET['dfilter']);
+ }
}
}
@@ -129,28 +123,29 @@ $rawdata = array();
// [5] => tcp I 192.168.111.99:61221 192.168.111.150:22 4:4 710 86399 726 242K
// -w 132 sets width of data to 132
// $dataRows defaults to 300 for embedded hardware
-exec("echo q | /usr/local/sbin/pftop -w 132 $dataRows",$rawdata);
+exec("echo q | /usr/local/sbin/pftop -w 132 $dataRows", $rawdata);
-// exporting TERM set to nothing gets you a "dumb" term. echo q to pftop makes it
+// exporting TERM set to nothing gets you a "dumb" term. echo q to pftop makes it
// quit out after displaying the first page of data.
// Get top line with total state data
$topDataLine = $rawdata[2];
//pfTop: Up State 1-5/5, View: default, Order: none
-$slashPos = strpos($topDataLine,'/') + 1;
-$commaPos = strpos($topDataLine,',');
+$slashPos = strpos($topDataLine, '/') + 1;
+$commaPos = strpos($topDataLine, ',');
if (($slashPos > 1) and ($commaPos > 1)) {
- $totalStates = substr($topDataLine,$slashPos,($commaPos - $slashPos));
-} else $totalStates = 0;
+ $totalStates = substr($topDataLine, $slashPos, ($commaPos - $slashPos));
+} else {
+ $totalStates = 0;
+}
// Get rid of the header data
-unset($rawdata[0],$rawdata[1],$rawdata[2],$rawdata[3]);
+unset($rawdata[0], $rawdata[1], $rawdata[2], $rawdata[3]);
if (isset($rawdata)) {
$count = 0;
foreach ($rawdata as $line) {
- if (!strlen(trim($line)) < 70)
- {
+ if (!strlen(trim($line)) < 70) {
//PR DIR SRC DEST STATE AGE EXP PKTS BYTES
//tcp Out 192.168.111.99:62831 66.84.12.81:110 FIN_WAIT_2:FIN_WAIT_2 00:01:20 00:00:11 28 1933
// 0 1 2 3 4 5 6 7 8
@@ -160,23 +155,24 @@ if (isset($rawdata)) {
$data[$count]['dir'] = strtolower($split[1]);
$srcTmp = $split[2];
$data[$count]['srcip'] = stripPort($srcTmp);
- $data[$count]['srcport'] = stripPort($srcTmp,true);
+ $data[$count]['srcport'] = stripPort($srcTmp, true);
$dstTmp = $split[3];
$data[$count]['expire'] = $split[6];
$data[$count]['dstip'] = stripPort($dstTmp);
- $data[$count]['dstport'] = stripPort($dstTmp,true);
+ $data[$count]['dstport'] = stripPort($dstTmp, true);
$data[$count]['packets'] = $split[7];
$data[$count]['bytes'] = $split[8];
$count++;
}
}
// Clear the statistics snapshot files, which track the packets and bytes of connections
- if (isset($_GET['clear']))
- {
- if (file_exists('/tmp/packets'))
+ if (isset($_GET['clear'])) {
+ if (file_exists('/tmp/packets')) {
unlink('/tmp/packets');
- if (file_exists('/tmp/bytes'))
+ }
+ if (file_exists('/tmp/bytes')) {
unlink('/tmp/bytes');
+ }
// Redirect so we don't hit "clear" every time we refresh the screen.
header("Location: diag_new_states.php?".$filterPassThru);
@@ -184,8 +180,7 @@ if (isset($rawdata)) {
}
// Create a new set of stats snapshot files
- if (isset($_GET['new']))
- {
+ if (isset($_GET['new'])) {
$packets = array();
$bytes = array();
@@ -198,36 +193,33 @@ if (isset($rawdata)) {
}
// Write the files out
- writeStats("packets",$packets);
- writeStats("bytes",$bytes);
+ writeStats("packets", $packets);
+ writeStats("bytes", $bytes);
// If we're in view mode, pass that on.
- if (isset($_GET['view']))
- $filterPassThru .= "&view=1";
+ if (isset($_GET['view'])) {
+ $filterPassThru .= "&amp;view=1";
+ }
// Redirect so we don't hit "new" every time we refresh the screen.
- header("Location: diag_new_states.php?&order=bytes&sort=des".$filterPassThru);
+ header("Location: diag_new_states.php?&amp;order=bytes&amp;sort=des".$filterPassThru);
exit;
}
// View the delta from the last snapshot against the current data.
- if (isset($_GET['view']))
- {
+ if (isset($_GET['view'])) {
// Read the stats data files
- readStats("packets",$packets);
- readStats("bytes",$bytes);
+ readStats("packets", $packets);
+ readStats("bytes", $bytes);
if (is_array($data)) {
foreach ($data as $key => $row) {
- if (isset($packets[$row['srcip']][$row['srcport']][$row['dstip']][$row['dstport']][$row['protocol']]))
- {
- if (isset($bytes[$row['srcip']][$row['srcport']][$row['dstip']][$row['dstport']][$row['protocol']]))
- {
+ if (isset($packets[$row['srcip']][$row['srcport']][$row['dstip']][$row['dstport']][$row['protocol']])) {
+ if (isset($bytes[$row['srcip']][$row['srcport']][$row['dstip']][$row['dstport']][$row['protocol']])) {
$tempPackets = $data[$key]['packets'] - $packets[$row['srcip']][$row['srcport']][$row['dstip']][$row['dstport']][$row['protocol']];
$tempBytes = $data[$key]['bytes'] - $bytes[$row['srcip']][$row['srcport']][$row['dstip']][$row['dstport']][$row['protocol']];
- if (($tempPackets > -1) && ($tempBytes > -1))
- {
+ if (($tempPackets > -1) && ($tempBytes > -1)) {
$data[$key]['packets'] = $tempPackets;
$data[$key]['bytes'] = $tempBytes;
}
@@ -237,51 +229,48 @@ if (isset($rawdata)) {
}
}
- $filterPassThru .= "&view=1";
- $viewPassThru = "&view=1";
+ $filterPassThru .= "&amp;view=1";
+ $viewPassThru = "&amp;view=1";
}
// Sort it by the selected order
if ($_GET['order']) {
- natsort2d($data,$_GET['order']);
- if ($_GET['sort'])
- {
- if ($_GET['sort'] == "des")
- $data = array_reverse($data);
+ natsort2d($data, $_GET['order']);
+ if ($_GET['sort']) {
+ if ($_GET['sort'] == "des") {
+ $data = array_reverse($data);
+ }
}
}
}
-function natsort2d( &$arrIn, $index = null )
-{
-
- $arrTemp = array();
- $arrOut = array();
+function natsort2d( &$arrIn, $index = null ) {
- if (is_array($arrIn)) {
- foreach ( $arrIn as $key=>$value ) {
+ $arrTemp = array();
+ $arrOut = array();
- reset($value);
- $arrTemp[$key] = is_null($index)
- ? current($value)
- : $value[$index];
- }
- }
+ if (is_array($arrIn)) {
+ foreach ( $arrIn as $key=>$value ) {
+ reset($value);
+ $arrTemp[$key] = is_null($index) ? current($value) : $value[$index];
+ }
+ }
- natsort($arrTemp);
+ natsort($arrTemp);
- foreach ( $arrTemp as $key=>$value ) {
- $arrOut[$key] = $arrIn[$key];
- }
+ foreach ( $arrTemp as $key=>$value ) {
+ $arrOut[$key] = $arrIn[$key];
+ }
- $arrIn = $arrOut;
+ $arrIn = $arrOut;
}
function writeStats($fname, &$data) {
$fname = "/tmp/" . $fname;
- if (file_exists($fname))
+ if (file_exists($fname)) {
unlink($fname);
+ }
$file = fopen($fname, 'a');
fwrite($file, serialize($data));
fclose($file);
@@ -289,9 +278,8 @@ function writeStats($fname, &$data) {
function readStats($fname, &$data) {
$fname = "/tmp/" . $fname;
- if (file_exists($fname))
- {
- $file = fopen($fname,'r');
+ if (file_exists($fname)) {
+ $file = fopen($fname, 'r');
$data = unserialize(fread($file, filesize($fname)));
fclose($file);
}
@@ -300,11 +288,11 @@ function readStats($fname, &$data) {
// Get timestamp of snapshot file, if it exists, for display later.
if (!(file_exists('/tmp/packets'))) {
$lastSnapshot = "Never";
-}
-else {
+} else {
$lastSnapshot = strftime("%m/%d/%y %H:%M:%S",filectime('/tmp/packets'));
}
// The next include must be here because we use redirection above
+$pgtitle = "Diagnostics: Show States";
include("head.inc");
?>
@@ -315,75 +303,77 @@ include("head.inc");
<?php include("fbegin.inc"); ?>
-<?php
- if ($config['version'] < 6)
- echo '<p class="pgtitle">' . $pgtitle . '</p>';
-?>
-
<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="listhdrr" colspan="9">Statistics snapshot control</td>
- </tr>
- <tr>
- <?php if (($lastSnapshot!='Never') && (!isset($_GET['view']))) :?>
- <td class="listlr"><a href="?view=1&order=bytes&sort=des<?=$filterPassThru;?>">View delta</a></td>
- <td class="listr"><a href="?new=1<?=$filterPassThru;?>">Start new</a></td>
- <td class="listr"><a href="?clear=1">Clear snapshot</a></td>
- <td class="listr" colspan="6" align="right">Last statistics snapshot: <?=$lastSnapshot;?></td>
- <?php endif; ?>
- <?php if (($lastSnapshot!='Never') && (isset($_GET['view']))) :?>
- <td class="listlr"><a href="?new=1<?=$filterPassThru;?>">Start new</a></td>
- <td class="listr"><a href="?clear=1">Clear</a></td>
- <td class="listr" colspan="7" align="right"><span class="red">Viewing delta of statistics snapshot: <?=$lastSnapshot;?></span></td>
- <?php endif; ?>
- <?php if ($lastSnapshot=='Never') :?>
- <td class="listlr"><a href="?new=1<?=$filterPassThru;?>">Start new</a></td>
- <td class="listr" colspan="8" align="right">Last statistics snapshot: <?=$lastSnapshot;?></td>
- <?php endif; ?>
- </tr>
- <tr>
- <td colspan="8">&nbsp;</td>
- </tr>
- <tr>
- <td class="listhdrr"><a href="?order=srcip<?=sortOrder('srcip');echo $filterPassThru;?>">Source</a></td>
- <td class="listhdrr"><a href="?order=srcport<?=sortOrder('srcport');echo $filterPassThru;?>">Port</a></td>
- <td class="listhdrr"><a href="?order=dir<?=sortOrder('dir');echo $filterPassThru;?>">Dir</a></td>
- <td class="listhdrr"><a href="?order=dstip<?=sortOrder('dstip');echo $filterPassThru;?>">Destination</a></td>
- <td class="listhdrr"><a href="?order=dstport<?=sortOrder('dstport');echo $filterPassThru;?>">Port</a></td>
- <td class="listhdrr"><a href="?order=protocol<?=sortOrder('protocol');echo $filterPassThru;?>">Protocol</a></td>
- <td class="listhdrr" align="right"><a href="?order=packets<?=sortOrder('packets');echo $filterPassThru;?>">Packets</a></td>
- <td class="listhdrr" align="right"><a href="?order=bytes<?=sortOrder('bytes');echo $filterPassThru;?>">Bytes</a></td>
- <td class="listhdr" align="right"><a href="?order=expire<?=sortOrder('expire');echo $filterPassThru;?>">Expires</a></td>
- <td class="list"></td>
- </tr>
-<?php $count = 0;
-if (is_array($data)): foreach ($data as $entry):
- if ((!isset($sfilter) and (!isset($dfilter))) or
- ((isset($sfilter)) and ($entry['srcip']==$sfilter)) or
- ((isset($dfilter)) and ($entry['dstip']==$dfilter))):
- ?>
- <tr>
- <td class="listlr"><?=displayIP($entry['srcip'],'srcip');?></td>
- <td class="listr"><?=$entry['srcport'];?></td>
- <td class="listr"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_<?=$entry['dir'];?>.gif" width="11" height="11" style="margin-top: 2px"></td>
- <td class="listr"><?=displayIP($entry['dstip'],'dstip');?></td>
- <td class="listr"><?=$entry['dstport'];?></td>
- <td class="listr"><?=$entry['protocol'];?></td>
- <td class="listr" align="right"><?=$entry['packets'];?></td>
- <td class="listr" align="right"><?=$entry['bytes'];?></td>
- <td class="listr" align="right"><?=$entry['expire'];?></td>
- </tr>
-<?php $count++; endif; endforeach; endif; ?>
+ <tr>
+ <td class="listhdrr" colspan="9">Statistics snapshot control</td>
+ </tr>
+ <tr>
+ <?php if (($lastSnapshot != 'Never') && (!isset($_GET['view']))) :?>
+ <td class="listlr"><a href="?view=1&amp;order=bytes&amp;sort=des<?=$filterPassThru;?>">View delta</a></td>
+ <td class="listr"><a href="?new=1<?=$filterPassThru;?>">Start new</a></td>
+ <td class="listr"><a href="?clear=1">Clear snapshot</a></td>
+ <td class="listr" colspan="6" align="right">Last statistics snapshot: <?=$lastSnapshot;?></td>
+ <?php endif; ?>
+ <?php if (($lastSnapshot != 'Never') && (isset($_GET['view']))) :?>
+ <td class="listlr"><a href="?new=1<?=$filterPassThru;?>">Start new</a></td>
+ <td class="listr"><a href="?clear=1">Clear</a></td>
+ <td class="listr" colspan="7" align="right"><span class="red">Viewing delta of statistics snapshot: <?=$lastSnapshot;?></span></td>
+ <?php endif; ?>
+ <?php if ($lastSnapshot == 'Never') :?>
+ <td class="listlr"><a href="?new=1<?=$filterPassThru;?>">Start new</a></td>
+ <td class="listr" colspan="8" align="right">Last statistics snapshot: <?=$lastSnapshot;?></td>
+ <?php endif; ?>
+ </tr>
+ <tr>
+ <td colspan="8">&nbsp;</td>
+ </tr>
+ <tr>
+ <td class="listhdrr"><a href="?order=srcip<?=sortOrder('srcip');echo $filterPassThru;?>">Source</a></td>
+ <td class="listhdrr"><a href="?order=srcport<?=sortOrder('srcport');echo $filterPassThru;?>">Port</a></td>
+ <td class="listhdrr"><a href="?order=dir<?=sortOrder('dir');echo $filterPassThru;?>">Dir</a></td>
+ <td class="listhdrr"><a href="?order=dstip<?=sortOrder('dstip');echo $filterPassThru;?>">Destination</a></td>
+ <td class="listhdrr"><a href="?order=dstport<?=sortOrder('dstport');echo $filterPassThru;?>">Port</a></td>
+ <td class="listhdrr"><a href="?order=protocol<?=sortOrder('protocol');echo $filterPassThru;?>">Protocol</a></td>
+ <td class="listhdrr" align="right"><a href="?order=packets<?=sortOrder('packets');echo $filterPassThru;?>">Packets</a></td>
+ <td class="listhdrr" align="right"><a href="?order=bytes<?=sortOrder('bytes');echo $filterPassThru;?>">Bytes</a></td>
+ <td class="listhdr" align="right"><a href="?order=expire<?=sortOrder('expire');echo $filterPassThru;?>">Expires</a></td>
+ <td class="list"></td>
+ </tr>
+ <?php
+ $count = 0;
+ if (is_array($data)) {
+ foreach ($data as $entry) {
+ if ((!isset($sfilter) && (!isset($dfilter))) ||
+ ((isset($sfilter)) && ($entry['srcip'] == $sfilter)) ||
+ ((isset($dfilter)) && ($entry['dstip'] == $dfilter))) {
+ ?>
+ <tr>
+ <td class="listlr"><?=displayIP($entry['srcip'], 'srcip');?></td>
+ <td class="listr"><?=$entry['srcport'];?></td>
+ <td class="listr"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_<?=$entry['dir'];?>.gif" width="11" height="11" style="margin-top: 2px" alt="" /></td>
+ <td class="listr"><?=displayIP($entry['dstip'], 'dstip');?></td>
+ <td class="listr"><?=$entry['dstport'];?></td>
+ <td class="listr"><?=$entry['protocol'];?></td>
+ <td class="listr" align="right"><?=$entry['packets'];?></td>
+ <td class="listr" align="right"><?=$entry['bytes'];?></td>
+ <td class="listr" align="right"><?=$entry['expire'];?></td>
+ </tr>
+ <?php
+ $count++;
+ }
+ }
+ }
+ ?>
</table>
-<br><strong>Firewall connection states displayed: <?=$count;?>/<?=$totalStates;?></strong>
+<br /><strong>Firewall connection states displayed: <?=$count;?>/<?=$totalStates;?></strong>
<?php if ($filterPassThru): ?>
-<p>
-<form action="diag_new_states.php" method="GET">
-<input type="hidden" name="order" value="bytes">
-<input type="hidden" name="sort" value="des">
-<input type="submit" class="formbtn" value="Unfilter View">
-</form>
-</p>
+<div>
+ <form action="diag_new_states.php" method="get">
+ <input type="hidden" name="order" value="bytes" />
+ <input type="hidden" name="sort" value="des" /><br />
+ <input type="submit" class="formbtn" value="Unfilter View" />
+ </form>
+</div>
<?php endif; ?>
<?php include("fend.inc"); ?>
</body>
diff --git a/config/diag_states_pt/diag_new_states.xml b/config/diag_states_pt/diag_new_states.xml
index 0e4e6c7d..849c4b55 100644
--- a/config/diag_states_pt/diag_new_states.xml
+++ b/config/diag_states_pt/diag_new_states.xml
@@ -2,51 +2,47 @@
<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
<packagegui>
- <copyright>
- <![CDATA[
+ <copyright>
+<![CDATA[
/* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
/*
- authng.xml
- part of pfSense (http://www.pfSense.com)
- Copyright (C) 2007 to whom it may belong
- All rights reserved.
-
- Based on m0n0wall (http://m0n0.ch/wall)
- Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
- All rights reserved.
- */
-/* ========================================================================== */
+ diag_new_states.xml
+ part of pfSense (https://www.pfSense.org/)
+ Copyright (C) 2002 Paul Taylor
+ Copyright (C) 2015 ESF, LLC
+ All rights reserved.
+*/
+/* ====================================================================================== */
/*
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+ 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.
- 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.
- 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.
- */
-/* ========================================================================== */
- ]]>
- </copyright>
- <description>Describe your package here</description>
- <requirements>Describe your package requirements here</requirements>
- <faq>Currently there are no FAQ items provided.</faq>
+ 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.
+*/
+/* ====================================================================================== */
+ ]]>
+ </copyright>
<name>diag_new_states</name>
- <version>0.2</version>
+ <version>0.3</version>
<title>Diagnostics: States New</title>
<menu>
<name>States New</name>
@@ -55,11 +51,7 @@
<url>diag_new_states.php</url>
</menu>
<additional_files_needed>
- <prefix>/usr/local/www/</prefix>
- <chmod>0755</chmod>
+ <prefix>/usr/local/www/</prefix>
<item>https://packages.pfsense.org/packages/config/diag_states_pt/diag_new_states.php</item>
</additional_files_needed>
- <custom_php_deinstall_command>
- mwexec("rm /usr/local/www/diag_new_states.php");
- </custom_php_deinstall_command>
</packagegui>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 7a480de7..e4b9acd0 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -832,7 +832,7 @@
<name>diag_new_states</name>
<descr>Paul Taylor's version of Diagnostics States which utilizes pftop.</descr>
<category>Network Management</category>
- <version>0.2</version>
+ <version>0.3</version>
<maintainer>ptaylor@addressplus.net</maintainer>
<required_version>2.2</required_version>
<status>BETA</status>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 18:17:39 +0000