From 91ce6b97a1b5bcf5fbe15899901cdb5d93b37aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=AD=A6=E5=88=A9?= <liuxueli@geedgenetworks.com>
Date: Mon, 1 Aug 2022 09:19:40 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0:=20tsg=5Fmaster=E3=80=81app?=
 =?UTF-8?q?=5Fsketch=5Flocal=E3=80=81dns=E3=80=81ssl=E3=80=81bgp=E3=80=81l?=
 =?UTF-8?q?ibmaatframe=E3=80=81app=5Fproto=5Fidentify,=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=88=96=E4=BF=AE=E5=A4=8D:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/install_config/group_vars/rpm_version.yml   | 13 +++++++------
 ansible/roles/firewall/templates/main.conf.j2.j2    |  4 ++++
 ansible/roles/sapp/templates/conflist.inf.j2.j2     |  1 +
 ansible/roles/sapp/templates/entrylist.conf.j2      |  3 ++-
 .../sapp/templates/necessary_plug_list.conf.j2      |  2 ++
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index b0dc852d..f70e24b7 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -15,15 +15,15 @@ firewall_rpm_version:
   gtp_signaling_plug: gtp_signaling_plug-1.0.4.eb9cd29
   tsg_vulpes: tsg_vulpes-1.0.9.0d7c615
   radius_collect_plug: radius_collect_plug-2.0.6.ccdc363
-  app_proto_identify: app_proto_identify-2.1.2.b5953d8
+  app_proto_identify: app_proto_identify-2.1.3.50ba01f
   app_proto_engine: app_proto_engine-2.3.4.e5750e2
   tsg_ddos_sketch: tsg_ddos_sketch-1.3.1.3c090b5
-  dns: dns-2.1.3.ac4dda4
+  dns: dns-2.1.4.fa0ebd4
   ftp: ftp-1.0.14.02d6a2c
   http: http-2.0.10.274614c
   mail: mail-1.0.17.eb41cef
   quic: quic-2.0.4.ffb443e
-  ssl: ssl-2.0.10.e8f6986
+  ssl: ssl-2.0.11.d67f099
   rtp: rtp-1.0.7.530ac76
   gtp: gtp-1.0.7.e1041b2
   ssh: ssh-2.1.7.b053e65
@@ -32,6 +32,7 @@ firewall_rpm_version:
   deal_socks: deal_socks-1.0.4.329bba3
   stratum: stratum-1.0.6.16c1c35
   rdp: rdp-1.0.3.f392ffd
+  bgp: bgp-1.1.0.ec59191
 
 framework_rpm_version:
   libcjson: libcjson-1.7.12.6c09dcf
@@ -50,7 +51,7 @@ framework_rpm_version:
   libMV_Sketch: libMV_Sketch-2.1.2.20220225.dc6bb95
   librdkafka: librdkafka-1.2.2.1218b3c
   libMESA_jump_layer: libMESA_jump_layer-1.0.10.6fb4738
-  libmaatframe: libmaatframe-3.6.10.d482a8d
+  libmaatframe: libmaatframe-3.6.11.47a7101
 
 kni_rpm_version:
   kni: kni-5.0.1.3cc6d58
@@ -68,10 +69,10 @@ tfe_rpm_version:
   tfe-pr: tfe-pr-4.6.15.1c59946
 
 tsg_app_rpm_version:
-  app_sketch_local: app_sketch_local-4.3.8.12a9882
+  app_sketch_local: app_sketch_local-4.4.0.bf53e69
 
 tsg_master_rpm_version:
-  tsg_master: tsg_master-5.7.5.c89e3dc
+  tsg_master: tsg_master-5.8.0.c558ea4
 
 tsg_diagnose_rpm_version:
   tsg_diagnose: tsg-diagnose-2.0.1.8c7e9cc
diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2
index 95794a49..d1fe30cf 100644
--- a/ansible/roles/firewall/templates/main.conf.j2.j2
+++ b/ansible/roles/firewall/templates/main.conf.j2.j2
@@ -40,6 +40,8 @@ LOCATION_TABLE_TYPE=19
 
 [TSG_LOG]
 MODE=1
+VSYSTEM_ID=1
+NAMESPACE_ID=1
 NIC_NAME="{{ control_and_policy.nic_name }}"
 MAX_SERVICE=1
 LOG_LEVEL=30
@@ -178,6 +180,8 @@ SENDLOG_SWITCH=1
 SENDLOG_SWITCH=0
 {% endif %}
 {% endraw %}
+#NO/HASH/REDIS
+SIGNALING_ORIGIN=HASH
 
 [CAPTURE]
 {% raw %}
diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2 b/ansible/roles/sapp/templates/conflist.inf.j2.j2
index a7ae06d7..03de7157 100644
--- a/ansible/roles/sapp/templates/conflist.inf.j2.j2
+++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2
@@ -37,6 +37,7 @@
 ./plug/protocol/ssh/ssh.inf
 ./plug/protocol/stratum/stratum.inf
 ./plug/protocol/rdp/rdp.inf
+./plug/protocol/bgp/bgp.inf
 
 [business]
 {% raw %}{% if app_behavior.enable == 1 %}
diff --git a/ansible/roles/sapp/templates/entrylist.conf.j2 b/ansible/roles/sapp/templates/entrylist.conf.j2
index ca24aa81..72b5b75d 100644
--- a/ansible/roles/sapp/templates/entrylist.conf.j2
+++ b/ansible/roles/sapp/templates/entrylist.conf.j2
@@ -22,4 +22,5 @@ SSH
 RADIUS
 SOCKS
 STRATUM
-RDP
\ No newline at end of file
+RDP
+BGP
\ No newline at end of file
diff --git a/ansible/roles/sapp/templates/necessary_plug_list.conf.j2 b/ansible/roles/sapp/templates/necessary_plug_list.conf.j2
index 4b8fd18b..965b51b7 100644
--- a/ansible/roles/sapp/templates/necessary_plug_list.conf.j2
+++ b/ansible/roles/sapp/templates/necessary_plug_list.conf.j2
@@ -17,6 +17,8 @@
 ./plug/protocol/ftp/ftp.inf
 ./plug/protocol/quic/quic.inf
 ./plug/protocol/radius/radius.inf
+./plug/protocol/rdp/rdp.inf
+./plug/protocol/bgp/bgp.inf
 ./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
 ./plug/business/tsg_conn_sketch/tsg_conn_sketch.inf
 ./plug/business/capture_packet_plug/capture_packet_plug.inf