Merge "Add flow gen id info to agent header" into R3.0

Juniper · Mar 24, 2016 · 93dc4f6 · 93dc4f6
2 parents aa66037 + 712de81
commit 93dc4f6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/dp-core/vr_flow.c b/dp-core/vr_flow.c
@@ -868,6 +868,8 @@ vr_trap_flow(struct vrouter *router, struct vr_flow_entry *fe,
             ta.vfta_stats = fe->fe_stats;
         }
 
+        ta.vfta_gen_id = fe->fe_gen_id;
+
         break;
     }
 

diff --git a/dp-core/vr_interface.c b/dp-core/vr_interface.c
@@ -487,6 +487,7 @@ agent_send(struct vr_interface *vif, struct vr_packet *pkt,
             hdr->hdr_cmd_param_3 = htonl(fta->vfta_stats.flow_packets);
             hdr->hdr_cmd_param_4 = htonl((fta->vfta_stats.flow_bytes_oflow |
                         (fta->vfta_stats.flow_packets_oflow << 16)));
+            hdr->hdr_cmd_param_5 = fta->vfta_gen_id;
         }
         break;
 

diff --git a/include/vr_defs.h b/include/vr_defs.h
@@ -64,6 +64,8 @@ struct agent_hdr {
     unsigned int hdr_cmd_param_2;
     unsigned int hdr_cmd_param_3;
     unsigned int hdr_cmd_param_4;
+    uint8_t hdr_cmd_param_5;
+    uint8_t hdr_cmd_param_5_pack[3];
 } __attribute__((packed));
 
 #define CMD_PARAM_PACKET_CTRL       0x1

diff --git a/include/vr_flow.h b/include/vr_flow.h
@@ -369,6 +369,7 @@ struct vr_flow_trap_arg {
     unsigned int vfta_index;
     unsigned int vfta_nh_index;
     struct vr_flow_stats vfta_stats;
+    uint8_t vfta_gen_id;
 };
 
 typedef enum {