From 551bb0659021d3b90f685424b56173949252aa09 Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Wed, 6 Mar 2024 11:56:07 +0800 Subject: [PATCH] =?UTF-8?q?SCE=E5=A2=9E=E5=8A=A0raw=20&=20decrypted=20traf?= =?UTF-8?q?fic=E7=9A=84=E7=9B=91=E6=8E=A7=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/include/global_metrics.h | 6 +++ platform/src/global_metrics.cpp | 54 ++++++++++++++++++- platform/src/packet_io.cpp | 25 +++++++++ test/test_data/log/test_ctr_pkt_active_ok.fs2 | 7 ++- .../test_data/log/test_ctr_pkt_opening_ok.fs2 | 7 ++- .../log/test_data_pkt_error_bypass_ok.fs2 | 7 ++- .../log/test_data_pkt_mirr_block_ok.fs2 | 7 ++- .../log/test_data_pkt_mirr_bypass_ok.fs2 | 7 ++- .../log/test_data_pkt_mirr_forward_ok.fs2 | 7 ++- .../log/test_data_pkt_mirr_rx_drop_ok.fs2 | 7 ++- .../log/test_data_pkt_stee_block_ok.fs2 | 7 ++- .../log/test_data_pkt_stee_bypass_ok.fs2 | 7 ++- .../log/test_data_pkt_stee_forward_ok.fs2 | 7 ++- .../log/test_data_pkt_stee_rx_egress_ok.fs2 | 7 ++- .../log/test_mix_pkt_stee_forward_ok.fs2 | 7 ++- 15 files changed, 143 insertions(+), 26 deletions(-) diff --git a/platform/include/global_metrics.h b/platform/include/global_metrics.h index 8389473..2023e97 100644 --- a/platform/include/global_metrics.h +++ b/platform/include/global_metrics.h @@ -35,6 +35,12 @@ struct thread_metrics struct throughput_metrics nf_rx; // 累计值 struct throughput_metrics nf_tx; // 累计值 + struct throughput_metrics raw_rx; // 累计值 + struct throughput_metrics raw_tx; // 累计值 + + struct throughput_metrics dec_rx; // 累计值 + struct throughput_metrics dec_tx; // 累计值 + struct throughput_metrics endpoint_vxlan_rx; // 累计值 struct throughput_metrics endpoint_vxlan_tx; // 累计值 struct throughput_metrics endpoint_vxlan_drop; // 累计值 diff --git a/platform/src/global_metrics.cpp b/platform/src/global_metrics.cpp index d238213..f4ed3d8 100644 --- a/platform/src/global_metrics.cpp +++ b/platform/src/global_metrics.cpp @@ -21,6 +21,20 @@ enum SCE_STAT_FIELD STAT_KEE_PKT_DOWN_TX_PKT, STAT_KEE_PKT_DOWN_TX_B, + // raw traffic + STAT_RAW_TRAFFIC_RX_PKT, + STAT_RAW_TRAFFIC_RX_B, + + STAT_RAW_TRAFFIC_TX_PKT, + STAT_RAW_TRAFFIC_TX_B, + + // decrypted traffic + STAT_DECRYPTED_TRAFFIC_RX_PKT, + STAT_DECRYPTED_TRAFFIC_RX_B, + + STAT_DECRYPTED_TRAFFIC_TX_PKT, + STAT_DECRYPTED_TRAFFIC_TX_B, + // device_endpoint_vxlan STAT_DEVICE_ENDPOINT_VXLAN_RX_PKT, STAT_DEVICE_ENDPOINT_VXLAN_RX_B, @@ -121,6 +135,20 @@ static const char *stat_map[] = [STAT_KEE_PKT_DOWN_TX_PKT] = "kee_d_tx_P", [STAT_KEE_PKT_DOWN_TX_B] = "kee_d_tx_B", + // raw traffic + [STAT_RAW_TRAFFIC_RX_PKT] = "raw_rx_P", + [STAT_RAW_TRAFFIC_RX_B] = "raw_rx_B", + + [STAT_RAW_TRAFFIC_TX_PKT] = "raw_tx_P", + [STAT_RAW_TRAFFIC_TX_B] = "raw_tx_B", + + // decypted traffic + [STAT_DECRYPTED_TRAFFIC_RX_PKT] = "dec_rx_P", + [STAT_DECRYPTED_TRAFFIC_RX_B] = "dec_rx_B", + + [STAT_DECRYPTED_TRAFFIC_TX_PKT] = "dec_tx_P", + [STAT_DECRYPTED_TRAFFIC_TX_B] = "dec_tx_B", + // device_endpoint_vxlan [STAT_DEVICE_ENDPOINT_VXLAN_RX_PKT] = "dev_l3_rx_P", [STAT_DEVICE_ENDPOINT_VXLAN_RX_B] = "dev_l3_rx_B", @@ -157,8 +185,8 @@ static const char *stat_map[] = [STAT_DATA_PKT_MIRR_RX_DROP_PKT] = "mirr_rxdop_P", [STAT_DATA_PKT_MIRR_RX_DROP_B] = "mirr_rxdop_B", - [STAT_DATA_PKT_MIRR_TX_PKT] = "mirro_tx_P", - [STAT_DATA_PKT_MIRR_TX_B] = "mirro_tx_B", + [STAT_DATA_PKT_MIRR_TX_PKT] = "mirr_tx_P", + [STAT_DATA_PKT_MIRR_TX_B] = "mirr_tx_B", [STAT_DATA_PKT_STEE_BYPASS_PKT] = "stee_bypass_P", [STAT_DATA_PKT_STEE_BYPASS_B] = "stee_bypass_B", @@ -331,6 +359,16 @@ void global_metrics_dump(struct global_metrics *global_metrics) sum->nf_tx.n_pkts += thread->nf_tx.n_pkts; sum->nf_tx.n_bytes += thread->nf_tx.n_bytes; + sum->raw_rx.n_pkts += thread->raw_rx.n_pkts; + sum->raw_rx.n_bytes += thread->raw_rx.n_bytes; + sum->raw_tx.n_pkts += thread->raw_tx.n_pkts; + sum->raw_tx.n_bytes += thread->raw_tx.n_bytes; + + sum->dec_rx.n_pkts += thread->dec_rx.n_pkts; + sum->dec_rx.n_bytes += thread->dec_rx.n_bytes; + sum->dec_tx.n_pkts += thread->dec_tx.n_pkts; + sum->dec_tx.n_bytes += thread->dec_tx.n_bytes; + sum->endpoint_vxlan_rx.n_pkts += thread->endpoint_vxlan_rx.n_pkts; sum->endpoint_vxlan_rx.n_bytes += thread->endpoint_vxlan_rx.n_bytes; sum->endpoint_vxlan_tx.n_pkts += thread->endpoint_vxlan_tx.n_pkts; @@ -401,6 +439,18 @@ void global_metrics_dump(struct global_metrics *global_metrics) FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_DEVICE_NF_TX_PKT], 0, FS_OP_SET, sum->nf_tx.n_pkts); FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_DEVICE_NF_TX_B], 0, FS_OP_SET, sum->nf_tx.n_bytes); + FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_RAW_TRAFFIC_RX_PKT], 0, FS_OP_SET, sum->raw_rx.n_pkts); + FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_RAW_TRAFFIC_RX_B], 0, FS_OP_SET, sum->raw_rx.n_bytes); + + FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_RAW_TRAFFIC_TX_PKT], 0, FS_OP_SET, sum->raw_tx.n_pkts); + FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_RAW_TRAFFIC_TX_B], 0, FS_OP_SET, sum->raw_tx.n_bytes); + + FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_DECRYPTED_TRAFFIC_RX_PKT], 0, FS_OP_SET, sum->dec_rx.n_pkts); + FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_DECRYPTED_TRAFFIC_RX_B], 0, FS_OP_SET, sum->dec_rx.n_bytes); + + FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_DECRYPTED_TRAFFIC_TX_PKT], 0, FS_OP_SET, sum->dec_tx.n_pkts); + FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_DECRYPTED_TRAFFIC_TX_B], 0, FS_OP_SET, sum->dec_tx.n_bytes); + FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_DEVICE_ENDPOINT_VXLAN_RX_PKT], 0, FS_OP_SET, sum->endpoint_vxlan_rx.n_pkts); FS_operate(global_metrics->fs_handle, global_metrics->fs_id[STAT_DEVICE_ENDPOINT_VXLAN_RX_B], 0, FS_OP_SET, sum->endpoint_vxlan_rx.n_bytes); diff --git a/platform/src/packet_io.cpp b/platform/src/packet_io.cpp index c27f512..cd40cc9 100644 --- a/platform/src/packet_io.cpp +++ b/platform/src/packet_io.cpp @@ -591,6 +591,15 @@ static inline int action_nf_inject(marsio_buff_t *rx_buff, struct metadata *meta return 0; } + if (meta->is_decrypted) + { + THROUGHPUT_METRICS_INC(&(thread_metrics->dec_tx), 1, meta->raw_len); + } + else + { + THROUGHPUT_METRICS_INC(&(thread_metrics->raw_tx), 1, meta->raw_len); + } + marsio_send_burst(packet_io->dev_nf.mr_path, thread_index, &rx_buff, 1); THROUGHPUT_METRICS_INC(&(thread_metrics->nf_tx), 1, meta->raw_len); return meta->raw_len; @@ -1172,11 +1181,27 @@ static void handle_data_packet(marsio_buff_t *rx_buff, struct thread_ctx *thread goto error_bypass; } + if (meta.is_decrypted == 1) + { + THROUGHPUT_METRICS_INC(&(thread_metrics->dec_rx), 1, meta.raw_len); + } + else + { + THROUGHPUT_METRICS_INC(&(thread_metrics->raw_rx), 1, meta.raw_len); + } PACKET_TRACE_ON_POLICY(thread_ctx->ref_io->instance, rx_buff, &session_ctx->rule_ids, chaining); action_sf_chaining(thread_ctx, session_ctx, chaining, rx_buff, &meta, 0); return; error_bypass: + if (meta.is_decrypted == 1) + { + THROUGHPUT_METRICS_INC(&(thread_metrics->dec_rx), 1, meta.raw_len); + } + else + { + THROUGHPUT_METRICS_INC(&(thread_metrics->raw_rx), 1, meta.raw_len); + } action_err_bypass(rx_buff, &meta, NULL, thread_ctx); } diff --git a/test/test_data/log/test_ctr_pkt_active_ok.fs2 b/test/test_data/log/test_ctr_pkt_active_ok.fs2 index eab075c..9dc9e8b 100644 --- a/test/test_data/log/test_ctr_pkt_active_ok.fs2 +++ b/test/test_data/log/test_ctr_pkt_active_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 08:51:32 2023============================================================ +============================================================Fri Mar 1 18:19:18 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 1 147 1 147 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 0 0 0 0 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_ctr_pkt_opening_ok.fs2 b/test/test_data/log/test_ctr_pkt_opening_ok.fs2 index 97b5cc7..ff4d260 100644 --- a/test/test_data/log/test_ctr_pkt_opening_ok.fs2 +++ b/test/test_data/log/test_ctr_pkt_opening_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 08:46:49 2023============================================================ +============================================================Fri Mar 1 18:17:04 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 1 99 1 99 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 0 0 0 0 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_data_pkt_error_bypass_ok.fs2 b/test/test_data/log/test_data_pkt_error_bypass_ok.fs2 index d7eb902..50607e2 100644 --- a/test/test_data/log/test_data_pkt_error_bypass_ok.fs2 +++ b/test/test_data/log/test_data_pkt_error_bypass_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 08:56:42 2023============================================================ +============================================================Fri Mar 1 18:43:15 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 1 145 1 145 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 1 145 1 145 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 0 0 0 0 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_data_pkt_mirr_block_ok.fs2 b/test/test_data/log/test_data_pkt_mirr_block_ok.fs2 index 1329b0b..3426306 100644 --- a/test/test_data/log/test_data_pkt_mirr_block_ok.fs2 +++ b/test/test_data/log/test_data_pkt_mirr_block_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 08:57:52 2023============================================================ +============================================================Fri Mar 1 18:24:49 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 2 292 2 292 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 1 145 1 145 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 0 0 0 0 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 1 145 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_data_pkt_mirr_bypass_ok.fs2 b/test/test_data/log/test_data_pkt_mirr_bypass_ok.fs2 index 44f59a9..651e4e6 100644 --- a/test/test_data/log/test_data_pkt_mirr_bypass_ok.fs2 +++ b/test/test_data/log/test_data_pkt_mirr_bypass_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 08:59:09 2023============================================================ +============================================================Fri Mar 1 18:24:32 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 2 292 2 292 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 1 145 1 145 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 0 0 0 0 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 1 145 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_data_pkt_mirr_forward_ok.fs2 b/test/test_data/log/test_data_pkt_mirr_forward_ok.fs2 index 774a7df..7c42fd8 100644 --- a/test/test_data/log/test_data_pkt_mirr_forward_ok.fs2 +++ b/test/test_data/log/test_data_pkt_mirr_forward_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 09:00:21 2023============================================================ +============================================================Fri Mar 1 18:25:01 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 2 292 2 292 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 1 145 1 145 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 0 0 1 195 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 0 0 0 0 1 145 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_data_pkt_mirr_rx_drop_ok.fs2 b/test/test_data/log/test_data_pkt_mirr_rx_drop_ok.fs2 index 5f2254c..03ca5c1 100644 --- a/test/test_data/log/test_data_pkt_mirr_rx_drop_ok.fs2 +++ b/test/test_data/log/test_data_pkt_mirr_rx_drop_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 09:05:25 2023============================================================ +============================================================Fri Mar 1 18:25:13 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 2 292 2 292 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 1 145 1 145 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 1 195 1 195 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 1 195 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 0 0 1 145 1 145 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_data_pkt_stee_block_ok.fs2 b/test/test_data/log/test_data_pkt_stee_block_ok.fs2 index bfb9ac8..14af27d 100644 --- a/test/test_data/log/test_data_pkt_stee_block_ok.fs2 +++ b/test/test_data/log/test_data_pkt_stee_block_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 09:07:22 2023============================================================ +============================================================Fri Mar 1 18:22:03 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 2 292 1 147 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 1 145 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 0 0 0 0 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_data_pkt_stee_bypass_ok.fs2 b/test/test_data/log/test_data_pkt_stee_bypass_ok.fs2 index 72df51f..06c389b 100644 --- a/test/test_data/log/test_data_pkt_stee_bypass_ok.fs2 +++ b/test/test_data/log/test_data_pkt_stee_bypass_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 09:09:00 2023============================================================ +============================================================Fri Mar 1 18:20:58 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 2 292 2 292 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 1 145 1 145 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 0 0 0 0 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_data_pkt_stee_forward_ok.fs2 b/test/test_data/log/test_data_pkt_stee_forward_ok.fs2 index f0acbeb..93762e9 100644 --- a/test/test_data/log/test_data_pkt_stee_forward_ok.fs2 +++ b/test/test_data/log/test_data_pkt_stee_forward_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 09:10:46 2023============================================================ +============================================================Fri Mar 1 18:22:45 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 2 292 1 147 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 1 145 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 0 0 1 195 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_data_pkt_stee_rx_egress_ok.fs2 b/test/test_data/log/test_data_pkt_stee_rx_egress_ok.fs2 index e58d7e4..d6b0a20 100644 --- a/test/test_data/log/test_data_pkt_stee_rx_egress_ok.fs2 +++ b/test/test_data/log/test_data_pkt_stee_rx_egress_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 09:12:31 2023============================================================ +============================================================Fri Mar 1 18:23:40 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 2 292 2 292 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 1 145 1 145 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 1 195 1 195 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B diff --git a/test/test_data/log/test_mix_pkt_stee_forward_ok.fs2 b/test/test_data/log/test_mix_pkt_stee_forward_ok.fs2 index 0f1dad3..e837429 100644 --- a/test/test_data/log/test_mix_pkt_stee_forward_ok.fs2 +++ b/test/test_data/log/test_mix_pkt_stee_forward_ok.fs2 @@ -1,6 +1,9 @@ -============================================================Wed Oct 18 08:53:58 2023============================================================ +============================================================Fri Mar 1 18:25:43 2024============================================================ dev_nf_rx_P dev_nf_rx_B dev_nf_tx_P dev_nf_tx_B kee_d_rx_P kee_d_rx_B kee_d_tx_P kee_d_tx_B sum 4 584 2 294 0 0 0 0 +speed/s 0 0 0 0 0 0 0 0 + raw_rx_P raw_rx_B raw_tx_P raw_tx_B dec_rx_P dec_rx_B dec_tx_P dec_tx_B +sum 1 145 0 0 1 145 0 0 speed/s 0 0 0 0 0 0 0 0 dev_l3_rx_P dev_l3_rx_B dev_l3_tx_P dev_l3_tx_B kee_u_rx_P kee_u_rx_B kee_u_rxdop_P kee_u_rxdop_B sum 0 0 2 390 0 0 0 0 @@ -8,7 +11,7 @@ speed/s 0 0 0 0 0 0 dev_l2_rx_P dev_l2_rx_B dev_l2_tx_P dev_l2_tx_B dev_l3_dop_P dev_l3_dop_B dev_l2_dop_P dev_l2_dop_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 - mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirro_tx_P mirro_tx_B + mirr_bypass_P mirr_bypass_B mirr_block_P mirr_block_B mirr_rxdop_P mirr_rxdop_B mirr_tx_P mirr_tx_B sum 0 0 0 0 0 0 0 0 speed/s 0 0 0 0 0 0 0 0 stee_bypass_P stee_bypass_B stee_block_P stee_block_B stee_rx_P stee_rx_B stee_tx_P stee_tx_B