Fix last commit

tbarbette · Jan 22, 2021 · d52d472 · d52d472
1 parent 928e8e8
commit d52d472
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/elements/standard/search.cc b/elements/standard/search.cc
@@ -55,13 +55,12 @@ Search::configure(Vector<String> &conf, ErrorHandler *errh)
     return 0;
 }
 
-void
-Search::push(int, Packet *p) {
 
+int
+Search::action(Packet* p) {
 	const char* f = String::make_stable((const char*)p->data(), p->length()).search(_pattern);
 	if (f == 0) {
-		output(1).push(p);
-		return;
+		return 1;
 	}
 
 	unsigned n = (f - (const char*)p->data());
@@ -70,16 +69,20 @@ Search::push(int, Packet *p) {
 	p->pull(n);
 	if (_set_anno)
 		p->set_anno_u16(_anno, p->anno_u16(_anno) + n);
-	output(0).push(p);
+    return 0;
+}
+
+void
+Search::push(int, Packet *p) {
+
+    int o = action(p);
+	output(o).push(p);
 }
 
 #if HAVE_BATCH
 void
 Search::push_batch(int port, PacketBatch *batch) {
-   FOR_EACH_PACKET(batch, p) {
-       Search::push(port,p);
-   }
-   output(0).push_batch(batch);
+    CLASSIFY_EACH_PACKET(2, action, batch, checked_output_push_batch);
 }
 #endif
 

diff --git a/elements/standard/search.hh b/elements/standard/search.hh
@@ -55,6 +55,8 @@ class Search : public BatchElement { public:
     void push_batch(int, PacketBatch *) override;
 #endif
 
+    int action(Packet* p);
+
   private:
 
     int _anno;