diff options
| -rw-r--r-- | entry/include/kni_entry.h | 1 | ||||
| -rw-r--r-- | entry/include/kni_fieldstat.h | 1 | ||||
| -rw-r--r-- | entry/src/kni_entry.cpp | 5 | ||||
| -rw-r--r-- | entry/src/kni_fieldstat.cpp | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/entry/include/kni_entry.h b/entry/include/kni_entry.h index 7ac1282..68cdd7d 100644 --- a/entry/include/kni_entry.h +++ b/entry/include/kni_entry.h @@ -135,6 +135,7 @@ struct pme_info{ //from tfe, kafka log uint8_t ssl_intercept_state; uint8_t ssl_pinningst; //defalut 0 + uint8_t ssl_pinningst_active; uint64_t ssl_server_side_latency; uint64_t ssl_client_side_latency; char ssl_server_side_version[KNI_SYMBOL_MAX]; diff --git a/entry/include/kni_fieldstat.h b/entry/include/kni_fieldstat.h index cead1ed..db76ed4 100644 --- a/entry/include/kni_fieldstat.h +++ b/entry/include/kni_fieldstat.h @@ -34,6 +34,7 @@ struct proxy_metric_tag unsigned long long rule_id; unsigned char action; unsigned char pinning_status; + unsigned char pinning_status_active; }; diff --git a/entry/src/kni_entry.cpp b/entry/src/kni_entry.cpp index a5f2484..2073fc1 100644 --- a/entry/src/kni_entry.cpp +++ b/entry/src/kni_entry.cpp @@ -326,7 +326,8 @@ static void set_proxy_rule_hits_metric(struct pme_info *pmeinfo, int thread_id) metric_tag.action = pmeinfo->maat_rule.action; metric_tag.rule_id = pmeinfo->maat_rule.rule_id; metric_tag.vsys_id = pmeinfo->maat_rule.vsys_id; - metric_tag.pinning_status = pmeinfo->ssl_intercept_state; + metric_tag.pinning_status = pmeinfo->ssl_pinningst; + metric_tag.pinning_status_active = pmeinfo->ssl_pinningst_active; proxy_set_metric_value(g_kni_handle->proxy_fieldstat, &metric_tag, metric_value, thread_id); @@ -2536,6 +2537,7 @@ static int wrapped_kni_cmsg_get(struct pme_info *pmeinfo, struct kni_cmsg *cmsg, break; case TFE_CMSG_SSL_PINNING_STATE: memcpy((char*)&(pmeinfo->ssl_pinningst), value, value_size); + pmeinfo->ssl_pinningst_active = 1; break; case TFE_CMSG_SSL_CERT_VERIFY: memcpy((char*)&(pmeinfo->ssl_cert_verify), value, value_size); @@ -2579,6 +2581,7 @@ static long traceid2pme_htable_search_cb(void *data, const uchar *key, uint size can_destroy = judge_stream_can_destroy(pmeinfo, CALLER_TFE); if(can_destroy == 1){ traceid2pme_htable_del(pmeinfo); + set_proxy_rule_hits_metric(pmeinfo, g_kni_handle->thread_count); stream_destroy(pmeinfo); } } diff --git a/entry/src/kni_fieldstat.cpp b/entry/src/kni_fieldstat.cpp index a72764f..51eeecc 100644 --- a/entry/src/kni_fieldstat.cpp +++ b/entry/src/kni_fieldstat.cpp @@ -17,7 +17,7 @@ static int read_fieldstat_tags(struct proxy_metric_tag *metric_tags, tags[n_tags].value_int = metric_tags->rule_id; n_tags++; - if(metric_tags->pinning_status == 1) + if(metric_tags->pinning_status_active == 1) { tags[n_tags].key = "pinning_status"; tags[n_tags].value_type = 0; |