summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-06-24 22:18:04 -0500
committerChris Buechler <cmb@pfsense.org>2016-06-24 22:19:04 -0500
commite565e9498148de56552b46a1f124abfdf4d105fc (patch)
treeb119912dc180891d313fa45a4e3c38c6c1da3ea7
parent84c7a8f3c371250a4356f0f49cb997ae2c3768ec (diff)
downloadpfsense-e565e9498148de56552b46a1f124abfdf4d105fc.zip
pfsense-e565e9498148de56552b46a1f124abfdf4d105fc.tar.gz
pfSense_get_pf_states always returns source as src and dest as dst, this flipping based on direction is wrong. Ticket #6530
-rwxr-xr-xsrc/usr/local/www/diag_dump_states.php30
1 files changed, 10 insertions, 20 deletions
diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php
index 4b6316a..a1c68e3 100755
--- a/src/usr/local/www/diag_dump_states.php
+++ b/src/usr/local/www/diag_dump_states.php
@@ -255,27 +255,17 @@ print $form;
}
for ($i = 0; $i < $states; $i++) {
- if ($res[$i]['direction'] === "out") {
- $info = $res[$i]['src'];
- if ($res[$i]['src-orig'])
- $info .= " (" . $res[$i]['src-orig'] . ")";
- $info .= " -> ";
- $info .= $res[$i]['dst'];
- if ($res[$i]['dst-orig'])
- $info .= " (" . $res[$i]['dst-orig'] . ")";
- $srcip = get_ip($res[$i]['src']);
- $dstip = get_ip($res[$i]['dst']);
- } else {
- $info = $res[$i]['dst'];
- if ($res[$i]['dst-orig'])
- $info .= " (" . $res[$i]['dst-orig'] . ")";
- $info .= " &lt;- ";
- $info .= $res[$i]['src'];
- if ($res[$i]['src-orig'])
- $info .= " (" . $res[$i]['src-orig'] . ")";
- $srcip = get_ip($res[$i]['dst']);
- $dstip = get_ip($res[$i]['src']);
+ $info = $res[$i]['src'];
+ if ($res[$i]['src-orig']) {
+ $info .= " (" . $res[$i]['src-orig'] . ")";
}
+ $info .= " -> ";
+ $info .= $res[$i]['dst'];
+ if ($res[$i]['dst-orig']) {
+ $info .= " (" . $res[$i]['dst-orig'] . ")";
+ }
+ $srcip = get_ip($res[$i]['src']);
+ $dstip = get_ip($res[$i]['dst']);
?>
<tr>
OpenPOWER on IntegriCloud