Merge "Do not swap ports for an ICMP packet inside an ICMP error" int…

…o R2.22.x
Juniper · Mar 16, 2016 · d219980 · d219980
2 parents 869bd5e + a0c2b74
commit d219980
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/dp-core/vr_proto_ip.c b/dp-core/vr_proto_ip.c
@@ -757,9 +757,11 @@ vr_inet_flow_swap(struct vr_flow *key_p)
     unsigned short port;
     unsigned int ipaddr;
 
-    port = key_p->flow4_sport;
-    key_p->flow4_sport = key_p->flow4_dport;
-    key_p->flow4_dport = port;
+    if (key_p->flow4_proto != VR_IP_PROTO_ICMP) {
+        port = key_p->flow4_sport;
+        key_p->flow4_sport = key_p->flow4_dport;
+        key_p->flow4_dport = port;
+    }
 
     ipaddr = key_p->flow4_sip;
     key_p->flow4_sip = key_p->flow4_dip;