From febc93fc3d237fc0b2e93dcc6fdae5da2ed90313 Mon Sep 17 00:00:00 2001 From: Joongi Kim Date: Thu, 17 Sep 2015 01:39:56 +0900 Subject: [PATCH] refs #17: Apply API changes to more elements. --- elements/standards/Classifier.cc | 6 ++++-- elements/standards/None.cc | 1 + elements/standards/PacketSizeClassifier.hh | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/elements/standards/Classifier.cc b/elements/standards/Classifier.cc index 0a4cac8..27cfbc2 100644 --- a/elements/standards/Classifier.cc +++ b/elements/standards/Classifier.cc @@ -130,12 +130,14 @@ int Classifier::process(int input_port, Packet *pkt) cur_condition = cur_condition->next; } if (is_match) { - return output_port; + output(output_port).push(pkt); + return 0; } output_port++; } - return DROP; + pkt->kill(); + return 0; } // vim: ts=8 sts=4 sw=4 et diff --git a/elements/standards/None.cc b/elements/standards/None.cc index 7a0dc85..9ab3c00 100644 --- a/elements/standards/None.cc +++ b/elements/standards/None.cc @@ -16,6 +16,7 @@ int None::configure(comp_thread_context *ctx, std::vector &args) int None::process(int input_port, Packet *pkt) { + output(0).push(pkt); return 0; } diff --git a/elements/standards/PacketSizeClassifier.hh b/elements/standards/PacketSizeClassifier.hh index 93fde3d..4460d46 100644 --- a/elements/standards/PacketSizeClassifier.hh +++ b/elements/standards/PacketSizeClassifier.hh @@ -46,7 +46,8 @@ public: int process(int input_port, Packet *pkt) { unsigned pkt_len = pkt->length(); - return buckets[pkt_len >> 4]; + output(buckets[pkt_len >> 4]).push(pkt); + return 0; } private: