diff options
| author | fengweihao <[email protected]> | 2023-12-25 14:43:00 +0800 |
|---|---|---|
| committer | fengweihao <[email protected]> | 2023-12-25 14:43:00 +0800 |
| commit | f69de9f4e3d5abff660220e86e164e83ca18aff7 (patch) | |
| tree | 66a9904e435ae16d0ea55b3553eefe047dbbe1ec /plugin | |
| parent | 4f9372d9667f21b346da2389987fc938591f3888 (diff) | |
TSG-18071 选择Internal作为Condition时，无法命中策略
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/business/doh/src/doh.cpp | 14 | ||||
| -rw-r--r-- | plugin/business/tsg-http/src/tsg_http.cpp | 14 |
2 files changed, 4 insertions, 24 deletions
diff --git a/plugin/business/doh/src/doh.cpp b/plugin/business/doh/src/doh.cpp index b6c7ce2..c5e080a 100644 --- a/plugin/business/doh/src/doh.cpp +++ b/plugin/business/doh/src/doh.cpp @@ -325,12 +325,7 @@ static void doh_maat_scan(const struct tfe_stream *stream, const struct tfe_http doh_addr_tfe2sapp(stream->addr, &sapp_addr); if (sapp_addr.addrtype == ADDR_TYPE_IPV4) { - scan_ret = tfe_scan_ipv4_addr(result, ctx->scan_mid, hit_cnt, sapp_addr); - if (scan_ret > 0) - { - hit_cnt += scan_ret; - } - scan_ret = tfe_scan_ipv4_internal_addr(stream, result, ctx->scan_mid, hit_cnt, sapp_addr); + scan_ret = tfe_scan_ipv4_addr(stream, result, ctx->scan_mid, hit_cnt, sapp_addr); if (scan_ret > 0) { hit_cnt += scan_ret; @@ -338,12 +333,7 @@ static void doh_maat_scan(const struct tfe_stream *stream, const struct tfe_http } if (sapp_addr.addrtype == ADDR_TYPE_IPV6) { - scan_ret = tfe_scan_ipv6_addr(result, ctx->scan_mid, hit_cnt, sapp_addr); - if (scan_ret > 0) - { - hit_cnt += scan_ret; - } - scan_ret = tfe_scan_ipv6_internal_addr(stream, result, ctx->scan_mid, hit_cnt, sapp_addr); + scan_ret = tfe_scan_ipv6_addr(stream, result, ctx->scan_mid, hit_cnt, sapp_addr); if (scan_ret > 0) { hit_cnt += scan_ret; diff --git a/plugin/business/tsg-http/src/tsg_http.cpp b/plugin/business/tsg-http/src/tsg_http.cpp index e2644e2..f44863d 100644 --- a/plugin/business/tsg-http/src/tsg_http.cpp +++ b/plugin/business/tsg-http/src/tsg_http.cpp @@ -3159,12 +3159,7 @@ void proxy_on_http_begin(const struct tfe_stream *stream, const struct tfe_http_ addr_tfe2sapp(stream->addr, &sapp_addr); if (sapp_addr.addrtype == ADDR_TYPE_IPV4) { - scan_ret = tfe_scan_ipv4_addr(result, ctx->scan_mid, hit_cnt, sapp_addr); - if (scan_ret > 0) - { - hit_cnt += scan_ret; - } - scan_ret = tfe_scan_ipv4_internal_addr(stream, result, ctx->scan_mid, hit_cnt, sapp_addr); + scan_ret = tfe_scan_ipv4_addr(stream, result, ctx->scan_mid, hit_cnt, sapp_addr); if (scan_ret > 0) { hit_cnt += scan_ret; @@ -3172,12 +3167,7 @@ void proxy_on_http_begin(const struct tfe_stream *stream, const struct tfe_http_ } if (sapp_addr.addrtype == ADDR_TYPE_IPV6) { - scan_ret = tfe_scan_ipv6_addr(result, ctx->scan_mid, hit_cnt, sapp_addr); - if (scan_ret > 0) - { - hit_cnt += scan_ret; - } - scan_ret = tfe_scan_ipv6_internal_addr(stream, result, ctx->scan_mid, hit_cnt, sapp_addr); + scan_ret = tfe_scan_ipv6_addr(stream, result, ctx->scan_mid, hit_cnt, sapp_addr); if (scan_ret > 0) { hit_cnt += scan_ret; |