From 269a4becc68d248e15ae45b89c55a28d8213d327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E5=AE=A3=E6=AD=A3?=
 <pengxuanzheng@geedgenetworks.com>
Date: Wed, 1 Dec 2021 14:50:06 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(TSG-8685,=20TSG=5F8606,=20TS?=
 =?UTF-8?q?G-8684):=20update=20tsg=5Fconn=5Fsketch-3.1.12=20to=20tsg=5Fcon?=
 =?UTF-8?q?n=5Fsketch-3.1.145?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/install_config/group_vars/rpm_version.yml           | 2 +-
 ansible/roles/firewall/templates/tsg_conn_sketch.inf.j2.j2  | 6 +++++-
 .../roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01  | 1 +
 .../roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01   | 1 +
 ansible/roles/sapp/templates/entrylist.conf.j2              | 1 +
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index 090c70f2..5bc0390e 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -16,7 +16,7 @@ firewall_rpm_version:
   mail: mail-1.0.15.b23de6c
   quic: quic-2.0.2.d76065f
   ssl: ssl-2.0.6.27f6517
-  tsg_conn_sketch:  tsg_conn_sketch-3.1.12.2653eb2
+  tsg_conn_sketch:  tsg_conn_sketch-3.1.15.2af358b
   rtp: rtp-1.0.5.93e978a
   mesa_sip: mesa_sip-1.1.2.b4bc77d
   fw_voip_plug: fw_voip_plug-1.0.7.0521f2f
diff --git a/ansible/roles/firewall/templates/tsg_conn_sketch.inf.j2.j2 b/ansible/roles/firewall/templates/tsg_conn_sketch.inf.j2.j2
index 4cc73515..c4aac106 100644
--- a/ansible/roles/firewall/templates/tsg_conn_sketch.inf.j2.j2
+++ b/ansible/roles/firewall/templates/tsg_conn_sketch.inf.j2.j2
@@ -53,4 +53,8 @@ FUNC_NAME=tsg_record_ftp_entry
 
 [QUIC]
 FUNC_FLAG=QUIC_CLIENT_HELLO,QUIC_SERVER_HELLO,QUIC_CACHED_CERT,QUIC_COMM_CERT,QUIC_CERT_CHAIN,QUIC_VERSION,QUIC_APPLICATION_DATA
-FUNC_NAME=tsg_record_quic_entry
\ No newline at end of file
+FUNC_NAME=tsg_record_quic_entry
+
+[SSH]
+FUNC_FLAG=ALL
+FUNC_NAME=tsg_record_ssh_entry
\ No newline at end of file
diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 b/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01
index 4a461bdb..4a4a6958 100644
--- a/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01
+++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01
@@ -33,6 +33,7 @@
 ./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
 ./plug/protocol/gtp/gtp.inf
 ./plug/protocol/radius/radius.inf
+./plug/protocol/ssh/ssh.inf
 
 [business]
 {% raw %}{% if connsketch.enable is defined %}
diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 b/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01
index 56d9733d..118951b7 100644
--- a/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01
+++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01
@@ -33,6 +33,7 @@
 ./plug/protocol/l2tp_protocol_plug/l2tp_protocol_plug.inf
 ./plug/protocol/gtp/gtp.inf
 ./plug/protocol/radius/radius.inf
+./plug/protocol/ssh/ssh.inf
 
 [business]
 {% raw %}{% if connsketch.enable is defined %}
diff --git a/ansible/roles/sapp/templates/entrylist.conf.j2 b/ansible/roles/sapp/templates/entrylist.conf.j2
index 9fa86d82..e1415474 100644
--- a/ansible/roles/sapp/templates/entrylist.conf.j2
+++ b/ansible/roles/sapp/templates/entrylist.conf.j2
@@ -18,4 +18,5 @@ SSL
 RTP
 SIP
 GTP
+SSH
 RADIUS
\ No newline at end of file