🎈 perf(DPISDN-5): 修改Classifier表结构

修改Classifier表结构

1 files changed, 18 insertions, 18 deletions

diff --git a/tools/tcpdump/pdump.c b/tools/tcpdump/pdump.c
index a754aee..b3aad7d 100644
--- a/tools/tcpdump/pdump.c
+++ b/tools/tcpdump/pdump.c
@@ -548,28 +548,28 @@ int mr_pcapng_set_opt(struct rte_mbuf * mbuf, uint16_t port_id, uint32_t flags)
     if (flags == RTE_PDUMP_FLAG_RX)
         len = snprintf(str_rx_tx, METADATA_MAX_SIZE, "rx");
     else
-        len = sprintf(str_rx_tx, "tx");
-
-    len += sprintf(str_rx_tx + len, ", port_ingress:%u", mrb_metadata->port_ingress);
-    len += sprintf(str_rx_tx + len, ", port_egress:%u", mrb_metadata->port_egress);
-    len += sprintf(str_rx_tx + len, ", is_nf_create:%u", mrb_metadata->packet_create_from_nf);
-    len += sprintf(str_rx_tx + len, ", is_ctrlbuf:%u", mrb_metadata->is_ctrlbuf);
-    len += sprintf(str_rx_tx + len, ", payload_offset:%u", mrb_metadata->payload_offset);
-    len += sprintf(str_rx_tx + len, ", session_id:%lu", mrb_metadata->session_id);
-    len += sprintf(str_rx_tx + len, ", hash_usr:%u", mbuf->hash.usr);
-
-    len = sprintf(str_sid, "start_sid:%u", mrb_metadata->start_sid);
-    len += sprintf(str_sid + len, ", nr_sid:%u", mrb_metadata->nr_sid);
-    len += sprintf(str_sid + len, ", cur_sid:%u", mrb_metadata->cur_sid);
-    len += sprintf(str_sid + len, ", sids:");
+        len = snprintf(str_rx_tx, METADATA_MAX_SIZE, "tx");
+
+    len += snprintf(str_rx_tx + len, METADATA_MAX_SIZE - len, ", port_ingress:%u", mrb_metadata->port_ingress);
+    len += snprintf(str_rx_tx + len, METADATA_MAX_SIZE - len, ", port_egress:%u", mrb_metadata->port_egress);
+    len += snprintf(str_rx_tx + len, METADATA_MAX_SIZE - len, ", is_nf_create:%u", mrb_metadata->packet_create_from_nf);
+    len += snprintf(str_rx_tx + len, METADATA_MAX_SIZE - len, ", is_ctrlbuf:%u", mrb_metadata->is_ctrlbuf);
+    len += snprintf(str_rx_tx + len, METADATA_MAX_SIZE - len, ", payload_offset:%u", mrb_metadata->payload_offset);
+    len += snprintf(str_rx_tx + len, METADATA_MAX_SIZE - len, ", session_id:%lu", mrb_metadata->session_id);
+    len += snprintf(str_rx_tx + len, METADATA_MAX_SIZE - len, ", hash_usr:%u", mbuf->hash.usr);
+
+    len = snprintf(str_sid, METADATA_MAX_SIZE - len, "start_sid:%u", mrb_metadata->start_sid);
+    len += snprintf(str_sid, METADATA_MAX_SIZE - len, ", nr_sid:%u", mrb_metadata->nr_sid);
+    len += snprintf(str_sid, METADATA_MAX_SIZE - len, ", cur_sid:%u", mrb_metadata->cur_sid);
+    len += snprintf(str_sid, METADATA_MAX_SIZE - len, ", sids:");
     for (int i = 0; i < RTE_DIM(mrb_metadata->sids); i++)
     {
-        len += sprintf(str_sid + len, "[%u],", mrb_metadata->sids[i]);
+        len += snprintf(str_sid, METADATA_MAX_SIZE - len, "[%u],", mrb_metadata->sids[i]);
     }
 
-    len = sprintf(str_dir, "dir:%u", mrb_metadata->dir);
-    len += sprintf(str_dir + len, ", ef_link_id:%u", mrb_metadata->link_id);
-    len += sprintf(str_dir + len, ", ef_peer_id:%u", mrb_metadata->link_db_index);
+    len = snprintf(str_dir, METADATA_MAX_SIZE, "dir:%u", mrb_metadata->dir);
+    len += snprintf(str_dir + len, METADATA_MAX_SIZE - len, ", ef_link_id:%u", mrb_metadata->link_id);
+    len += snprintf(str_dir + len, METADATA_MAX_SIZE - len, ", ef_peer_id:%u", mrb_metadata->link_db_index);
 
     uint16_t optlen = pcapng_optlen(strlen(str_rx_tx));
     optlen += pcapng_optlen(strlen(str_sid));