summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryangwei <[email protected]>2024-04-27 21:20:30 +0800
committeryangwei <[email protected]>2024-04-27 21:29:58 +0800
commit554679788075b944e5e1ced53fcc0ab394e92f58 (patch)
treeeff5d249e62fd6158392ff6165bd994fc114dafa
parent446044e5d97f84d6f0d3c78b6322ba4d1f626767 (diff)
🐞 fix(detain packet timeout metric): per session counterv3.1.2
-rw-r--r--src/SSL_Analyze.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/SSL_Analyze.c b/src/SSL_Analyze.c
index 266e87f..03ed39f 100644
--- a/src/SSL_Analyze.c
+++ b/src/SSL_Analyze.c
@@ -241,15 +241,19 @@ static void ssl_retain_packet_bridge_free(const struct streaminfo *stream, int b
struct detain_pkt *p=NULL;
if (pkts)
{
+ if(pkts->p_sz > 0)
+ {
+ if(g_ssl_runtime_para.fs)fieldstat_value_incrby(g_ssl_runtime_para.fs,
+ g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_TIMEOUT],
+ 1);
+ }
for(unsigned int i = 0; i < pkts->p_sz; i++)
{
if (p)MESA_detain_pkt_free(p);
if(g_ssl_runtime_para.fs)fieldstat_value_incrby(g_ssl_runtime_para.fs,
g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_FREE],
1);
- if(g_ssl_runtime_para.fs)fieldstat_value_incrby(g_ssl_runtime_para.fs,
- g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_TIMEOUT],
- 1);
+
}
free(pkts);
}
@@ -281,12 +285,12 @@ extern "C" int SSL_INIT(void)
fieldstat_set_local_output(g_ssl_runtime_para.fs, "./log/ssl.status", "default");
fieldstat_enable_prometheus_output(g_ssl_runtime_para.fs);
fieldstat_instance_start(g_ssl_runtime_para.fs);
- g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_NUM]=fieldstat_register(g_ssl_runtime_para.fs, FIELD_TYPE_COUNTER, "FRAG_CH_NUM",NULL, 0);
- g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_FORWARD]=fieldstat_register(g_ssl_runtime_para.fs, FIELD_TYPE_COUNTER, "FRAG_CH_FORWARD",NULL, 0);
- g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_FREE]=fieldstat_register(g_ssl_runtime_para.fs, FIELD_TYPE_COUNTER, "FRAG_CH_FREE",NULL, 0);
g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_SESSION]=fieldstat_register(g_ssl_runtime_para.fs, FIELD_TYPE_COUNTER, "FRAG_CH_SESS",NULL, 0);
g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_FINISH]=fieldstat_register(g_ssl_runtime_para.fs, FIELD_TYPE_COUNTER, "FRAG_CH_FIN",NULL, 0);
g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_TIMEOUT]=fieldstat_register(g_ssl_runtime_para.fs, FIELD_TYPE_COUNTER, "FRAG_CH_TOT",NULL, 0);
+ g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_NUM]=fieldstat_register(g_ssl_runtime_para.fs, FIELD_TYPE_COUNTER, "FRAG_CH_NUM",NULL, 0);
+ g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_FORWARD]=fieldstat_register(g_ssl_runtime_para.fs, FIELD_TYPE_COUNTER, "FRAG_CH_FORWARD",NULL, 0);
+ g_ssl_runtime_para.fs_metric_id[FS_METRIC_DETAIN_FRAG_CHELLO_FREE]=fieldstat_register(g_ssl_runtime_para.fs, FIELD_TYPE_COUNTER, "FRAG_CH_FREE",NULL, 0);
}