Merge "Fix inconsistent state in flow handling from pkt"

Juniper · Sep 6, 2016 · 9c975a0 · 9c975a0
2 parents f98ec61 + d32524d
commit 9c975a0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/src/vnsw/agent/pkt/flow_proto.cc b/src/vnsw/agent/pkt/flow_proto.cc
@@ -217,6 +217,8 @@ bool FlowProto::Enqueue(PktInfoPtr msg) {
     if (Validate(msg.get()) == false) {
         return true;
     }
+
+    FreeBuffer(msg.get());
     EnqueueFlowEvent(new FlowEvent(FlowEvent::VROUTER_FLOW_MSG, msg, NULL, 0));
     return true;
 }
@@ -392,17 +394,6 @@ bool FlowProto::FlowEventHandler(FlowEvent *req, FlowTable *table) {
 
     switch (req->event()) {
     case FlowEvent::VROUTER_FLOW_MSG: {
-        // packet parsing is not done, invoke the same here
-        uint8_t *pkt = req->pkt_info()->packet_buffer()->data();
-        PktInfoPtr info = req->pkt_info();
-        PktHandler::PktModuleName mod =
-            agent()->pkt()->pkt_handler()->ParseFlowPacket(info, pkt);
-        // if packet wasnt for flow module, it would've got enqueued to the
-        // correct module in the above call. Nothing else to do.
-        if (mod != PktHandler::FLOW) {
-            break;
-        }
-        FreeBuffer(info.get());
         ProcessProto(req->pkt_info());
         break;
     }
@@ -418,7 +409,6 @@ bool FlowProto::FlowEventHandler(FlowEvent *req, FlowTable *table) {
         FlowEntry *flow = req->flow();
         FlowTaskMsg *flow_msg = new FlowTaskMsg(flow);
         PktInfoPtr pkt_info(new PktInfo(PktHandler::FLOW, flow_msg));
-        FreeBuffer(pkt_info.get());
         FlowHandler *handler = new FlowHandler(agent(), pkt_info, io_,
                                                this, table->table_index());
         RunProtoHandler(handler);

diff --git a/src/vnsw/agent/pkt/pkt_handler.cc b/src/vnsw/agent/pkt/pkt_handler.cc
@@ -294,16 +294,6 @@ void PktHandler::PktModuleEnqueue(PktModuleName mod, const AgentHdr &hdr,
     Enqueue(mod, pkt_info);
 }
 
-PktHandler::PktModuleName PktHandler::ParseFlowPacket(
-                          boost::shared_ptr<PktInfo> pkt_info, uint8_t *pkt) {
-    PktModuleName mod = ParsePacket(pkt_info->agent_hdr, pkt_info.get(), pkt);
-    // In case it is not a flow packet, enqueue it back to the right module
-    if (mod != FLOW) {
-        PktModuleEnqueue(mod, pkt_info->agent_hdr, pkt_info, pkt);
-    }
-    return mod;
-}
-
 // Compute L2/L3 forwarding mode for pacekt.
 // Forwarding mode is L3 if,
 // - Packet uses L3 label

diff --git a/src/vnsw/agent/pkt/pkt_handler.h b/src/vnsw/agent/pkt/pkt_handler.h
@@ -254,8 +254,6 @@ class PktHandler {
 
     PktModuleName ParsePacket(const AgentHdr &hdr, PktInfo *pkt_info,
                               uint8_t *pkt);
-    PktModuleName ParseFlowPacket(boost::shared_ptr<PktInfo> pkt_info,
-                                  uint8_t *pkt);
     int ParseUserPkt(PktInfo *pkt_info, Interface *intf,
                      PktType::Type &pkt_type, uint8_t *pkt);
     bool ProcessPacket(boost::shared_ptr<PacketBufferEnqueueItem> item);