summaryrefslogtreecommitdiff
path: root/plugin/business/doh/src/doh.cpp
diff options
context:
space:
mode:
authorluwenpeng <[email protected]>2020-10-12 15:43:27 +0800
committerluwenpeng <[email protected]>2020-10-14 11:45:49 +0800
commit90ac86a10c1c82c231d8dd1f44f544e9ee9d498a (patch)
tree1e50c00b94d911f1715383e8373a3ecaf6652022 /plugin/business/doh/src/doh.cpp
parent40aab0a2984a6b74a9c2aed9c0c59e2c33c54e2e (diff)
TSG-3417 TFE 适配 FQDNv4.3.11-202011
* 修改 cmsg 接口 * DOH 不支持扫描 fqdn cat id
Diffstat (limited to 'plugin/business/doh/src/doh.cpp')
-rw-r--r--plugin/business/doh/src/doh.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/plugin/business/doh/src/doh.cpp b/plugin/business/doh/src/doh.cpp
index f53f5a7..aa0af29 100644
--- a/plugin/business/doh/src/doh.cpp
+++ b/plugin/business/doh/src/doh.cpp
@@ -244,8 +244,8 @@ static void doh_maat_scan(const struct tfe_stream *stream, const struct tfe_http
g_doh_conf->tables[TYPE_HOST].name, host, scan_ret, ctx->addr_string);
}
- scan_ret = tfe_scan_fqdn_cat(stream, result, &(ctx->scan_mid), hit_cnt, ctx->thread_id, g_doh_conf->local_logger, g_doh_conf->tables[TYPE_HOST].id);
- if( scan_ret > 0)
+ scan_ret = tfe_scan_fqdn_cat(stream, result, &(ctx->scan_mid), hit_cnt, ctx->thread_id, g_doh_conf->local_logger, ctx->addr_string, g_doh_conf->tables[TYPE_HOST].id);
+ if( scan_ret > 0)
{
hit_cnt += scan_ret;
}
@@ -295,11 +295,6 @@ static void doh_maat_scan(const struct tfe_stream *stream, const struct tfe_http
TFE_LOG_INFO(g_doh_conf->local_logger, "Scan %s, NO hit domain: %s scan ret: %d addr: %s",
g_doh_conf->tables[TYPE_QNAME].name, qname, scan_ret, ctx->addr_string);
}
- scan_ret = tfe_scan_fqdn_cat(stream, result, &(ctx->scan_mid), hit_cnt, ctx->thread_id, g_doh_conf->local_logger, g_doh_conf->tables[TYPE_QNAME].id);
- if( scan_ret > 0)
- {
- hit_cnt += scan_ret;
- }
if (hit_cnt)
{