Merge "Mirroring the GARP packes rather trapping" into R2.20

Juniper · Nov 23, 2015 · a5e9411 · a5e9411
2 parents 50c488c + c2e31f8
commit a5e9411
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/dp-core/vr_datapath.c b/dp-core/vr_datapath.c
@@ -250,8 +250,13 @@ vr_handle_arp_request(struct vr_arp *sarp, struct vr_packet *pkt,
         vr_trap(pkt, fmd->fmd_dvrf, AGENT_TRAP_ARP, NULL);
         break;
 
-    case MR_TRAP:
-        vr_trap(pkt, fmd->fmd_dvrf, AGENT_TRAP_ARP, NULL);
+    case MR_MIRROR:
+        pkt_c = vr_pclone(pkt);
+        if (pkt_c)
+            vr_trap(pkt_c, fmd->fmd_dvrf, AGENT_TRAP_ARP, NULL);
+
+        /* Flood the original packet*/
+        handled = false;
         break;
 
     case MR_DROP:

diff --git a/dp-core/vr_proto_ip.c b/dp-core/vr_proto_ip.c
@@ -1050,7 +1050,7 @@ vm_arp_request(struct vr_interface *vif, struct vr_packet *pkt,
 
     if (vr_grat_arp(sarp)) {
         if (rt.rtr_req.rtr_label_flags & VR_RT_ARP_TRAP_FLAG)
-            return MR_TRAP;
+            return MR_MIRROR;
         return MR_FLOOD;
     }
 

diff --git a/dp-core/vr_proto_ip6.c b/dp-core/vr_proto_ip6.c
@@ -316,8 +316,12 @@ vr_neighbor_input(struct vr_packet *pkt, struct vr_forwarding_md *fmd)
         vr_trap(pkt, fmd->fmd_dvrf, AGENT_TRAP_ARP, NULL);
         break;
 
-    case MR_TRAP:
-        vr_trap(pkt, fmd->fmd_dvrf, AGENT_TRAP_ARP, NULL);
+    case MR_MIRROR:
+        pkt_c = vr_pclone(pkt);
+        if (pkt_c)
+            vr_trap(pkt_c, fmd->fmd_dvrf, AGENT_TRAP_ARP, NULL);
+
+        handled = false;
         break;
 
     case MR_DROP:

diff --git a/include/vr_interface.h b/include/vr_interface.h
@@ -96,7 +96,7 @@ typedef enum {
     MR_FLOOD,
     MR_PROXY,
     MR_NOT_ME,
-    MR_TRAP,
+    MR_MIRROR,
     MR_TRAP_X,
     MR_XCONNECT,
 } mac_response_t;