diff options
Diffstat (limited to 'common/src/tfe_scan.cpp')
| -rw-r--r-- | common/src/tfe_scan.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/common/src/tfe_scan.cpp b/common/src/tfe_scan.cpp index 7c2d08c..8bc8c97 100644 --- a/common/src/tfe_scan.cpp +++ b/common/src/tfe_scan.cpp @@ -115,9 +115,6 @@ int tfe_scan_internal_exteral_by_last_group(const struct tfe_stream *stream, lon } /**for Provisional compilation definitions**/ -#define TFE_CMSG_FQDN_TAGS_ID_STR 60 /*1,2,3,4,5*/ -#define TFE_CMSG_SRC_TAGS_ID_STR 61 /*11,12,13,14*/ -#define TFE_CMSG_DST_TAGS_ID_STR 62 /*6,7,8,9,10*/ #define TFE_CMSG_FQDN_TAGS_LOG_STR 63 /*"Category Name:Search Engines, Cloude Provider:aws, CDN Provider:aws, category_name: ab"*/ #define TFE_CMSG_SRC_TAGS_LOG_STR 64 /*"administrative_area:Singapore, country:Singapore", CDN Provider:Light CDN*/ #define TFE_CMSG_DST_TAGS_LOG_STR 65 /*"ASN:55967, CDN Provider:Light CDN, country:Hong Kong"*/ @@ -135,7 +132,7 @@ int tfe_scan_ip_tags(const struct tfe_stream *stream, long long *result, struct } char opt_val[128]={0}; uint16_t opt_out_size = 0; - int ret = tfe_cmsg_get_value(cmsg, (enum tfe_cmsg_tlv_type)TFE_CMSG_SRC_TAGS_ID_STR, (unsigned char *)opt_val, sizeof(opt_val), &opt_out_size); + int ret = tfe_cmsg_get_value(cmsg, (enum tfe_cmsg_tlv_type)TFE_CMSG_SRC_IP_TAGS_IDS_STR, (unsigned char *)opt_val, sizeof(opt_val), &opt_out_size); if(ret == 0) { n_tag_ids = tfe_get_tags_id_array(opt_val, tag_id_array); @@ -171,7 +168,7 @@ int tfe_scan_ip_tags(const struct tfe_stream *stream, long long *result, struct n_tag_ids=0; memset(tag_id_array, 0, sizeof(tag_id_array)); - ret = tfe_cmsg_get_value(cmsg, (enum tfe_cmsg_tlv_type)TFE_CMSG_DST_TAGS_ID_STR, (unsigned char *)opt_val, sizeof(opt_val), &opt_out_size); + ret = tfe_cmsg_get_value(cmsg, (enum tfe_cmsg_tlv_type)TFE_CMSG_DST_IP_TAGS_IDS_STR, (unsigned char *)opt_val, sizeof(opt_val), &opt_out_size); if(ret == 0) { n_tag_ids = tfe_get_tags_id_array(opt_val, tag_id_array); @@ -217,7 +214,7 @@ int tfe_scan_fqdn_tags(const struct tfe_stream *stream, long long *result, struc } char opt_val[128]={0}; uint16_t opt_out_size = 0; - int ret = tfe_cmsg_get_value(cmsg, (enum tfe_cmsg_tlv_type)TFE_CMSG_FQDN_TAGS_ID_STR, (unsigned char *)opt_val, sizeof(opt_val), &opt_out_size); + int ret = tfe_cmsg_get_value(cmsg, (enum tfe_cmsg_tlv_type)TFE_CMSG_FQDN_TAGS_IDS_STR, (unsigned char *)opt_val, sizeof(opt_val), &opt_out_size); if(ret == 0) { n_tag_ids = tfe_get_tags_id_array(opt_val, tag_id_array); @@ -460,11 +457,11 @@ int tfe_scan_subscribe_id(const struct tfe_stream *stream, long long *result, st { TFE_LOG_ERROR(logger, "fetch src sub id from cmsg failed, ret: %d addr: %s", scan_ret, stream->str_stream_info); } - scan_ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_DST_SUB_ID, (unsigned char *)dest_subscribe_id, sizeof(dest_subscribe_id), &opt_out_size); - if (scan_ret != 0) - { - TFE_LOG_ERROR(logger, "fetch dst sub id from cmsg failed, ret: %d addr: %s", scan_ret, stream->str_stream_info); - } + // scan_ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_DST_SUB_ID, (unsigned char *)dest_subscribe_id, sizeof(dest_subscribe_id), &opt_out_size); + // if (scan_ret != 0) + // { + // TFE_LOG_ERROR(logger, "fetch dst sub id from cmsg failed, ret: %d addr: %s", scan_ret, stream->str_stream_info); + // } } TFE_LOG_DEBUG(logger, "fetch src sub id:%s dst sub id:%s addr: %s", source_subscribe_id, dest_subscribe_id, stream->str_stream_info); |