diff -Naur plugins/ngrep.ph plugins.new/ngrep.ph --- plugins/ngrep.ph 2003-07-01 10:44:36.000000000 -0400 +++ plugins.new/ngrep.ph 2004-04-22 16:13:44.760301088 -0400 @@ -23,7 +23,7 @@ close NGRULES; my ($regexp, $pcap, $switches) = @rule[0,1,2]; if ($switches){ - $switches =~ s/[^XwixvA0-9]//g; # Only allow through sensible + $switches =~ s/[^XRwixvA0-9]//g; # Only allow through sensible $switches = "-" . "$switches"; # switches } unless ( -x $IDABENCH::NGREP_PLGBIN){ @@ -35,8 +35,8 @@ print STDERR "$err"; return ("$retcmd") if ($fail); } - print STDERR "returning: \"$IDABENCH::NGREP_PLGBIN $switches -qtI - \'$regexp\' \'$pcap\' >$outputfile\"\n"; - return ("$IDABENCH::NGREP_PLGBIN $switches -qtI - \'$regexp\' \'$pcap\' >$outputfile"); + print STDERR "returning: \"$IDABENCH::NGREP_PLGBIN $switches -qRtI - \'$regexp\' \'$pcap\' >$outputfile\"\n"; + return ("$IDABENCH::NGREP_PLGBIN $switches -qRtI - \'$regexp\' \'$pcap\' >$outputfile"); }; # diff -Naur plugins/ngrep.se plugins.new/ngrep.se --- plugins/ngrep.se 2003-07-01 10:44:36.000000000 -0400 +++ plugins.new/ngrep.se 2004-04-22 15:49:16.388542329 -0400 @@ -168,7 +168,7 @@ # our $pattern_error; if ( -x $NGREP_PLGBIN){ - my @testcmd = ($NGREP_PLGBIN, "$cntarg", "-q${time}${hexpat}${hexad}I$PCAPTESTF", "$regexpat", "$bpfpat"); + my @testcmd = ($NGREP_PLGBIN, "$cntarg", "-qR${time}${hexpat}${hexad}I$PCAPTESTF", "$regexpat", "$bpfpat"); system ("@testcmd") == 0 or $pattern_error = "Pattern input error. \nCheck syntax:\t$pattern\n"; } else { @@ -176,7 +176,7 @@ . qq( ngrep) . qq( to access this capability.\n); } - return "$NGREP_PLGBIN $cntarg -q${time}${hexpat}${hexad}I - $pattern"; + return "$NGREP_PLGBIN $cntarg -qR${time}${hexpat}${hexad}I - $pattern"; } # No arguments.