[everflow]: Do not tag outer packet when DST port is route port or LA…

…G. (sonic-net#169)
madhanmellanox · Mar 15, 2017 · d5d6318 · d5d6318
1 parent 6f06b59
commit d5d6318
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/orchagent/mirrororch.cpp b/orchagent/mirrororch.cpp
@@ -367,7 +367,7 @@ bool MirrorOrch::getNeighborInfo(const string& name, MirrorEntry& session, const
     }
     else if (session.neighborInfo.port.m_type == Port::LAG)
     {
-        session.neighborInfo.vlanId = session.neighborInfo.port.m_port_vlan_id;
+        session.neighborInfo.vlanId = session.addVLanTag ? session.neighborInfo.port.m_port_vlan_id : 0;
 
         if (session.neighborInfo.port.m_members.empty())
         {
@@ -387,7 +387,7 @@ bool MirrorOrch::getNeighborInfo(const string& name, MirrorEntry& session, const
     else
     {
         session.neighborInfo.portId = session.neighborInfo.port.m_port_id;
-        session.neighborInfo.vlanId = session.neighborInfo.port.m_port_vlan_id;
+        session.neighborInfo.vlanId = session.addVLanTag ? session.neighborInfo.port.m_port_vlan_id : 0;
         session.neighborInfo.resolved = true;
     }
 

diff --git a/orchagent/mirrororch.h b/orchagent/mirrororch.h
@@ -30,6 +30,7 @@ struct MirrorEntry
     uint8_t dscp;
     uint8_t ttl;
     uint8_t queue;
+    bool addVLanTag;
 
     struct
     {
@@ -57,6 +58,7 @@ struct MirrorEntry
         dscp(0),
         ttl(0),
         queue(0),
+        addVLanTag(false),
         sessionId(0),
         refCount(0)
     {