diff options
| author | yangwei <[email protected]> | 2021-12-01 15:11:09 +0800 |
|---|---|---|
| committer | fumingwei <[email protected]> | 2021-12-01 16:03:51 +0800 |
| commit | 66934ce6f06d37a9f2d6bfc62b6a89503f595f15 (patch) | |
| tree | f2cf7a0f970687a034fd171f26c596d5b5fa9b7e | |
| parent | 43398f0d77ae44b5dbad21ccf34f395b3ca2fce3 (diff) | |
tsg_master:fix TSG-8407,TSG-8583,修复L2TP/MAIL日志中的异常
app_proto_identify:fix TSG-8697,TSG-7126,修复socks,L2TP,RTP,FTPS协议识别不准的问题
deal_socks:从business层转换至protocol层，解决socks虚拟层结束顺序不一致可能导致会话记录日志结果异常的问题
4 files changed, 7 insertions, 6 deletions
diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index b8147fae..457effcb 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -20,11 +20,11 @@ firewall_rpm_version: rtp: rtp-1.0.5.93e978a mesa_sip: mesa_sip-1.1.2.b4bc77d fw_voip_plug: fw_voip_plug-1.0.7.0521f2f - app_proto_identify: app_proto_identify-2.0.14.769dbe8 + app_proto_identify: app_proto_identify-2.0.16.85f5d7c app_proto_engine: app_proto_engine-2.1.3.cc6c1ed gtp: gtp-1.0.5.afa055c gtp_signaling_plug: gtp_signaling_plug-1.0.3.c3d2c93 - deal_socks: deal_socks-1.0.2.379a897 + deal_socks: deal_socks-1.0.3.651bc6f tsg_ddos_sketch: tsg_ddos_sketch-1.2.2.6ed20a6 radius: radius-1.0.5.b330829 radius_collect_plug: radius_collect_plug-2.0.4.7057cc5 @@ -66,7 +66,7 @@ tsg_app_rpm_version: app_sketch_local: app_sketch_local-4.2.0.9529fcf tsg_master_rpm_version: - tsg_master: tsg_master-5.4.19.6cde067 + tsg_master: tsg_master-5.4.20.f98acd8 tsg_diagnose_rpm_version: tsg_diagnose: tsg-diagnose-21.10.2.c848872 diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 b/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 index 4a4a6958..ab980974 100644 --- a/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 +++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 @@ -22,6 +22,7 @@ {% endraw %} [protocol] +./plug/protocol/deal_socks/deal_socks.inf ./plug/protocol/mesa_sip/mesa_sip.inf ./plug/protocol/rtp/rtp.inf ./plug/protocol/ssl/ssl.inf @@ -60,7 +61,6 @@ ./plug/business/fw_quic_plug/fw_quic_plug.inf ./plug/business/fw_voip_plug/fw_voip_plug.inf ./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf -./plug/business/deal_socks/deal_socks.inf {% endif %} ./plug/business/conn_telemetry/conn_telemetry.inf {% if app.identify_by.user_defined_signature == 1 %} diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 b/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 index 118951b7..74c58e55 100644 --- a/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 +++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 @@ -22,6 +22,7 @@ {% endraw %} [protocol] +./plug/protocol/deal_socks/deal_socks.inf ./plug/protocol/mesa_sip/mesa_sip.inf ./plug/protocol/rtp/rtp.inf ./plug/protocol/ssl/ssl.inf @@ -60,7 +61,6 @@ ./plug/business/fw_quic_plug/fw_quic_plug.inf ./plug/business/fw_voip_plug/fw_voip_plug.inf ./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf -./plug/business/deal_socks/deal_socks.inf {% endif %} ./plug/business/conn_telemetry/conn_telemetry.inf {% if app.identify_by.user_defined_signature == 1 %} diff --git a/ansible/roles/sapp/templates/entrylist.conf.j2 b/ansible/roles/sapp/templates/entrylist.conf.j2 index e1415474..b2b14849 100644 --- a/ansible/roles/sapp/templates/entrylist.conf.j2 +++ b/ansible/roles/sapp/templates/entrylist.conf.j2 @@ -19,4 +19,5 @@ RTP SIP GTP SSH -RADIUS
\ No newline at end of file +RADIUS +SOCKS |