lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

packet capture, add "any" interface option.

Browse Source
This commit is contained in:
Ad Schellevis 2019-07-05 13:38:22 +02:00
parent 8a51c13787
commit fea37f42ef
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/www/diag_packet_capture.php
View File

@ -48,8 +48,10 @@ function start_capture($options)
{
$cmd_opts = array();
$filter_opts = array();
$intf = get_real_interface($options['interface']);
$cmd_opts[] = '-i ' . $intf;
if (!empty($options['interface'])) {
$intf = get_real_interface($options['interface']);
$cmd_opts[] = '-i ' . $intf;
}
if (empty($options['promiscuous'])) {
// disable promiscuous mode
@ -104,15 +106,13 @@ function start_capture($options)
$filter_opts[] = "port " . str_replace("!", "not ", $options['port']);
}
if (!empty($intf)) {
$cmd = '/usr/sbin/tcpdump ';
$cmd .= implode(' ', $cmd_opts);
$cmd .= ' -w /tmp/packetcapture.cap ';
$cmd .= " ".escapeshellarg(implode(' and ', $filter_opts));
//delete previous packet capture if it exists
@unlink('/tmp/packetcapture.cap');
mwexec_bg($cmd);
}
$cmd = '/usr/sbin/tcpdump ';
$cmd .= implode(' ', $cmd_opts);
$cmd .= ' -w /tmp/packetcapture.cap ';
$cmd .= " ".escapeshellarg(implode(' and ', $filter_opts));
//delete previous packet capture if it exists
@unlink('/tmp/packetcapture.cap');
mwexec_bg($cmd);
}
/**
@ -201,7 +201,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} else {
// set form defaults
$pconfig = array();
$pconfig['interface'] = "WAN";
$pconfig['interface'] = "wan";
$pconfig['promiscuous'] = null;
$pconfig['fam'] = null;
$pconfig['proto'] = null;
@ -215,7 +215,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig = $_POST;
if (!empty($_POST['start'])) {
if (!array_key_exists($pconfig['interface'], $interfaces)) {
if (!empty($pconfig['interface']) && !array_key_exists($pconfig['interface'], $interfaces)) {
$input_errors[] = gettext("Invalid interface.");
}
if ($pconfig['fam'] !== "" && $pconfig['fam'] !== "ip" && $pconfig['fam'] !== "ip6") {
@ -312,6 +312,9 @@ include("fbegin.inc");
<td><a id="help_for_if" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Interface");?></td>
<td>
<select name="interface" class="selectpicker">
<option value="" <?=empty($pconfig['interface']) ? "selected=\"selected\"" : ""; ?>>
<?=gettext("Any");?>
</option>
<?php
foreach ($interfaces as $iface => $ifacename): ?>
<option value="<?=$iface;?>" <?=$pconfig['interface'] == $iface ? "selected=\"selected\"" : ""; ?>>