Dp trace save quadruple 2

1 files changed, 6 insertions, 21 deletions

diff --git a/include/external/marsio.h b/include/external/marsio.h
index 3eb68dd..3925647 100644
--- a/include/external/marsio.h
+++ b/include/external/marsio.h
@@ -118,25 +118,6 @@ enum mr_buff_metadata_type
     MR_BUFF_USER_0 = 254
 };
 
-enum complex_layer_type_id
-{
-    LAYER_TYPE_ID_ETHER,
-    LAYER_TYPE_ID_PPP,
-    LAYER_TYPE_ID_HDLC,
-    LAYER_TYPE_ID_VLAN,
-    LAYER_TYPE_ID_PPPOE,
-    LAYER_TYPE_ID_MPLS,
-    LAYER_TYPE_ID_IPV4,
-    LAYER_TYPE_ID_IPV6,
-    LAYER_TYPE_ID_UDP,
-    LAYER_TYPE_ID_TCP,
-    LAYER_TYPE_ID_ICMP,
-    LAYER_TYPE_ID_ICMP6,
-    LAYER_TYPE_ID_GRE,
-    LAYER_TYPE_ID_G_VXLAN,
-    LAYER_TYPE_ID_GTPV1_U,
-};
-
 #ifdef __cplusplus
 extern "C"
 {
@@ -364,6 +345,12 @@ struct dp_trace_buffer_telemetry
     char * buffer;
     uint16_t buffer_len;
     uint16_t buffer_used;
+
+    uint16_t traffic_link_id;
+    char inner_src_addr_str[INET6_ADDRSTRLEN];
+    char inner_dst_addr_str[INET6_ADDRSTRLEN];
+    int32_t inner_src_port;
+    int32_t inner_dst_port;
 };
 
 struct dp_trace_record_header
@@ -388,8 +375,6 @@ struct dp_trace_job_desc
     uint16_t traffic_link_ids[DP_TRACE_TRAFFIC_LINK_ID_ARRAY_SIZE_MAX];
 };
 
-void * marsio_pkt_jump_to_innermost_layer(const marsio_buff_t * mbuf, enum complex_layer_type_id layer_id);
-
 int marsio_dp_trace_job_id_uesd_get(struct mr_instance * instance, job_bitmap_t * jobs_id);
 
 job_bitmap_t marsio_dp_trace_job_add(struct mr_instance * instance, const struct dp_trace_job_desc * desc);