Accept both destination ports for MPLSoverUDP encapsulation.

The old destination port (51234) and the new IANA assigned destination port (6635) should be accepted by the agent. Change-Id: I2894deb5dfafdfe107ae3e6b2d8bce68969a2d46 related-bug: 1420900
Juniper · Dec 3, 2015 · 820adf4 · 820adf4
1 parent a26b119
commit 820adf4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/vnsw/agent/pkt/pkt_handler.cc b/src/vnsw/agent/pkt/pkt_handler.cc
@@ -501,7 +501,8 @@ int PktHandler::ParseUDPTunnels(PktInfo *pkt_info, uint8_t *pkt) {
     int len = 0;
     if (pkt_info->dport == VXLAN_UDP_DEST_PORT)
         len = ParseVxlan(pkt_info, (pkt + len));
-    else if (pkt_info->dport == MPLS_OVER_UDP_DEST_PORT)
+    else if (pkt_info->dport == MPLS_OVER_UDP_DEST_PORT ||
+             pkt_info->dport == IANA_MPLS_OVER_UDP_DEST_PORT)
         len = ParseMPLSoUDP(pkt_info, (pkt + len));
 
     return len;

diff --git a/src/vnsw/agent/pkt/pkt_handler.h b/src/vnsw/agent/pkt/pkt_handler.h
@@ -31,6 +31,7 @@
 #define DNS_SERVER_PORT 53
 #define VXLAN_UDP_DEST_PORT 4789
 #define MPLS_OVER_UDP_DEST_PORT 51234
+#define IANA_MPLS_OVER_UDP_DEST_PORT 6635
 
 #define IPv4_ALEN           4
 #define ARP_TX_BUFF_LEN     128