ongrep

commit 70eafcdcd0531abc07b006597bd23b93695d2e37
parent 110f13a828cc04484d8d43da3fb40085c1ec5538
Author: Jordan Ritter <jpr5@darkridge.com>
Date:   Tue, 30 Mar 2004 22:38:46 +0000

fix for bug #926318, correct ``-n'' bug whereby ngrep would not actually exit until n+1 matches were achieved.

Diffstat:
M
ngrep.c
 | 
15
+++++++++------

1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/ngrep.c b/ngrep.c
@@ -683,6 +683,9 @@ void process(u_char *data1, struct pcap_pkthdr* h, u_char *p) {
 
     }
 
+    if (max_matches && matches >= max_matches)
+        clean_exit(0);
+
     if (match_after && keep_matching)
         keep_matching--;
 }
@@ -713,8 +716,8 @@ int re_match_func(char *data, int len) {
     }
 #endif
 
-    if (max_matches && ++matches > max_matches)
-        clean_exit(0);
+    if (max_matches)
+        matches++;
 
     if (match_after && keep_matching != match_after)
         keep_matching = match_after;
@@ -732,8 +735,8 @@ int bin_match_func(char *data, int len) {
 
     while (i <= stop)
         if (!memcmp(data+(i++), bin_data, match_len)) {
-            if (max_matches && ++matches > max_matches)
-                clean_exit(0);
+            if (max_matches)
+                matches++;
 
             if (match_after && keep_matching != match_after)
                 keep_matching = match_after;
@@ -746,8 +749,8 @@ int bin_match_func(char *data, int len) {
 
 
 int blank_match_func(char *data, int len) {
-    if (max_matches && ++matches > max_matches)
-        clean_exit(0);
+    if (max_matches)
+        matches++;
 
     return 1;
 }