summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/diag_packet_capture.php
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2016-01-25 11:27:37 -0500
committerjim-p <jimp@pfsense.org>2016-01-25 11:27:37 -0500
commit2127e42cc94b8bf0c16f40b8efef2f65acde6204 (patch)
tree22098f1eb3b4f084ce13410564d4f28469ee65f1 /src/usr/local/www/diag_packet_capture.php
parent306a56c260f82aa50bce4c50e1779867d670bbd2 (diff)
downloadpfsense-2127e42cc94b8bf0c16f40b8efef2f65acde6204.zip
pfsense-2127e42cc94b8bf0c16f40b8efef2f65acde6204.tar.gz
When the protocol is set for CARP, tell tcpdump to interpret it as CARP for more accurate output.
Diffstat (limited to 'src/usr/local/www/diag_packet_capture.php')
-rw-r--r--src/usr/local/www/diag_packet_capture.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/usr/local/www/diag_packet_capture.php b/src/usr/local/www/diag_packet_capture.php
index be6f5d5..f488f75 100644
--- a/src/usr/local/www/diag_packet_capture.php
+++ b/src/usr/local/www/diag_packet_capture.php
@@ -277,8 +277,8 @@ $protocollist = array(
'!udp' => $excl . ' UDP',
'arp' => 'ARP',
'!arp' => $excl . ' ARP',
- 'carp' => 'CARP (VRRP)',
- '!carp' => $excl . ' CARP (VRRP)',
+ 'carp' => 'CARP',
+ '!carp' => $excl . ' CARP',
'esp' => 'ESP'
);
@@ -474,6 +474,11 @@ if ($do_tcpdump) :
<div class="panel-body">
<div class="form-group">
<?php
+ if ($proto == "carp") {
+ $iscarp = "-T carp";
+ } else {
+ $iscarp = "";
+ }
$detail_args = "";
switch ($detail) {
case "full":
@@ -492,7 +497,7 @@ if ($do_tcpdump) :
}
print('<textarea class="form-control" rows="20" style="font-size: 13px; font-family: consolas,monaco,roboto mono,liberation mono,courier;">');
- system("/usr/sbin/tcpdump {$disabledns} {$detail_args} -r {$fp}{$fn}");
+ system("/usr/sbin/tcpdump {$disabledns} {$detail_args} {$iscarp} -r {$fp}{$fn}");
print('</textarea>');
conf_mount_ro();
OpenPOWER on IntegriCloud