pfSense

https://gitlab.netgate.com/pfSense/pfSense/-/merge_requests/741

• No filter specified: vlan packets included.
• Filter specified: no vlan packets included.

• No filter specified: vlan packets included.
• Filter specified: vlan packets included.
• Filter specified or not, with exclude vlan checked: no vlan packets included.

I'm closing this in favor of a new Packet Capture page; see #13382

For reference, the old patch is below:

diff --git a/src/usr/local/www/diag_packet_capture.php b/src/usr/local/www/diag_packet_capture.php
index b6d2fecc97508aff4dd8f1f39f073693a23ff607..d115c3e0f89886e56407d1708200124009f954d4 100755
--- a/src/usr/local/www/diag_packet_capture.php
+++ b/src/usr/local/www/diag_packet_capture.php
@@ -367,6 +367,13 @@ $section->addInput(new Form_Checkbox(
     '</span></p>'
 );

+$section->addInput(new Form_Checkbox(
+    'excludevlan',
+    'Exclude VLAN',
+    'Exclude VLAN when filtering packets',
+    $_POST['excludevlan']
+))->setHelp('Only filter on untagged packets, otherwise filter on both untagged and tagged packets (including QinQ).');
+
 $section->addInput(new Form_Select(
     'fam',
     '*Address Family',
@@ -554,8 +561,21 @@ if ($do_tcpdump) :
     $selectedif = convert_friendly_interface_to_real_interface_name($selectedif);

     if ($action == gettext("Start")) {
-        $matchstr = implode(" and ", $matches);
-        $cmd = "/usr/sbin/tcpdump -i {$selectedif} {$disablepromiscuous} {$searchcount} -s {$snaplen} -w {$fp}{$fn} " . escapeshellarg($matchstr);
+        if (empty($matches)) {
+            if ($_POST['excludevlan']) {
+                $filterstr = "'not vlan'";
+            } else {
+                $filterstr = null;
+            }
+        } else {
+            $matchstr = implode(" and ", $matches);
+            if ($_POST['excludevlan']) {
+                $filterstr = escapeshellarg("{$matchstr} and not vlan");
+            } else {
+                $filterstr = escapeshellarg("{$matchstr} or (vlan and ({$matchstr})) or (vlan and ({$matchstr}))");
+            }
+        }
+        $cmd = "/usr/sbin/tcpdump -i {$selectedif} {$disablepromiscuous} {$searchcount} -s {$snaplen} -w {$fp}{$fn} " . $filterstr;
         print_info_box(gettext('Packet capture is running'), 'info');
         ?>
         <div class="infoblock">