Merge "Pull the SCTP header in the ICMP error headers to Head SKB"

Juniper · Jun 22, 2016 · da6fea3 · da6fea3
2 parents e5948e1 + b75400b
commit da6fea3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/dp-core/vr_packet.c b/dp-core/vr_packet.c
@@ -42,9 +42,8 @@ vr_ip_proto_pull(struct vr_ip *iph)
 {
     unsigned char proto = iph->ip_proto;
 
-    if ((proto == VR_IP_PROTO_TCP) ||
-            (proto == VR_IP_PROTO_UDP) ||
-            (proto == VR_IP_PROTO_ICMP)) {
+    if ((proto == VR_IP_PROTO_TCP) || (proto == VR_IP_PROTO_UDP) ||
+        (proto == VR_IP_PROTO_ICMP) || (proto == VR_IP_PROTO_SCTP)) {
         return true;
     }
 
@@ -56,9 +55,8 @@ vr_ip6_proto_pull(struct vr_ip6 *ip6h)
 {
     unsigned char proto = ip6h->ip6_nxt;
 
-   if ((proto == VR_IP_PROTO_TCP) ||
-            (proto == VR_IP_PROTO_UDP) ||
-            (proto == VR_IP_PROTO_ICMP6)) {
+   if ((proto == VR_IP_PROTO_TCP) || (proto == VR_IP_PROTO_UDP) ||
+       (proto == VR_IP_PROTO_ICMP6) || (proto == VR_IP_PROTO_SCTP)) {
         return true;
     }
 
@@ -177,6 +175,8 @@ vr_ip_transport_parse(struct vr_ip *iph, struct vr_ip6 *ip6h,
                             pull_len += sizeof(struct vr_tcp);
                         else if (icmp_pl_iph->ip_proto == VR_IP_PROTO_UDP)
                             pull_len += sizeof(struct vr_udp);
+                        else if (icmp_pl_iph->ip_proto == VR_IP_PROTO_SCTP)
+                            pull_len += sizeof(struct vr_sctp);
                         else
                             pull_len += sizeof(struct vr_icmp);
 
@@ -218,6 +218,8 @@ vr_ip_transport_parse(struct vr_ip *iph, struct vr_ip6 *ip6h,
                             pull_len += sizeof(struct vr_tcp);
                         else if (icmp_pl_ip6h->ip6_nxt == VR_IP_PROTO_UDP)
                             pull_len += sizeof(struct vr_udp);
+                        else if (icmp_pl_ip6h->ip6_nxt == VR_IP_PROTO_SCTP)
+                            pull_len += sizeof(struct vr_sctp);
                         else
                             pull_len += sizeof(struct vr_icmp);
 

diff --git a/linux/vrouter_mod.c b/linux/vrouter_mod.c
@@ -1799,6 +1799,8 @@ lh_pull_inner_headers(struct vr_packet *pkt,
                         pull_len += sizeof(struct vr_tcp);
                     else if (icmp_pl_ip_proto == VR_IP_PROTO_UDP)
                         pull_len += sizeof(struct vr_udp);
+                    else if (icmp_pl_ip_proto == VR_IP_PROTO_SCTP)
+                         pull_len += sizeof(struct vr_sctp);
                     else
                         pull_len += sizeof(struct vr_icmp);
 
@@ -1862,6 +1864,8 @@ lh_pull_inner_headers(struct vr_packet *pkt,
                         pull_len += sizeof(struct vr_tcp);
                     else if (icmp_pl_ip_proto == VR_IP_PROTO_UDP)
                         pull_len += sizeof(struct vr_udp);
+                    else if (icmp_pl_ip_proto == VR_IP_PROTO_SCTP)
+                        pull_len += sizeof(struct vr_sctp);
                     else
                         pull_len += sizeof(struct vr_icmp);