From 4b6b3ed01cf70263310c9b4b7dda024b5ec7fd34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E5=AE=A3=E6=AD=A3?=
 <pengxuanzheng@geedgenetworks.com>
Date: Thu, 9 Feb 2023 17:14:47 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(TSG-13319,TSG-13478,TSG-1351?=
 =?UTF-8?q?1,TSG-13547,TSG-13549,TSG-13502,TSG-13622):=20update=20session?=
 =?UTF-8?q?=5Fmarker=5Frecord-2.0.6=20to=20session=5Fmarker=5Frecord-2.0.9?=
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/sapp/templates/conflist.inf.j2.j2           | 2 +-
 ansible/roles/traffic-engine/files/helm/conf/conflist.inf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index e3ca3f1c..48557fe2 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -29,7 +29,7 @@ firewall_rpm_version:
   stratum: stratum-1.0.6.16c1c35
   rdp: rdp-1.0.3.f392ffd
   bgp: bgp-1.1.0.ec59191
-  session_marker_record: session_marker_record-2.0.6.3ff8551
+  session_marker_record: session_marker_record-2.0.9.5e98736
 
 framework_rpm_version:
   00_libcjson: libcjson-1.7.12.6c09dcf
diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2 b/ansible/roles/sapp/templates/conflist.inf.j2.j2
index 95585fc2..cec1bb2b 100644
--- a/ansible/roles/sapp/templates/conflist.inf.j2.j2
+++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2
@@ -12,6 +12,7 @@
 ./plug/platform/app_proto_identify/app_proto_identify.inf
 {% endif %}
 {% endif %}
+./plug/platform/session_marker_record/session_marker_record.inf
 ./plug/platform/tsg_master/tsg_master.inf
 {% if app.identify_by.builtin_app_engine == 1 %}
 ./plug/platform/app_proto_engine/app_proto_engine.inf
@@ -41,7 +42,6 @@
 ./plug/protocol/dtls/dtls.inf
 
 [business]
-./plug/business/session_marker_record/session_marker_record.inf
 {% raw %}{% if app_behavior.enable == 1 %}
 ./plug/business/tsg_vulpes/tsg_vulpes.inf
 {% endif %}
diff --git a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
index 35177fdd..d236f2db 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
+++ b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf
@@ -4,6 +4,7 @@
 ./plug/platform/wire_graft/wire_graft.inf
 {{- end }}
 ./plug/platform/app_proto_identify/app_proto_identify.inf
+./plug/platform/session_marker_record/session_marker_record.inf
 ./plug/platform/tsg_master/tsg_master.inf
 {{- if eq .Values.appsketch.enable .Values.define_enable_val_yes }}
 {{- if eq .Values.appsketch.builtin_engine .Values.define_enable_val_yes }}
@@ -66,7 +67,6 @@
 {{- end }}
 
 [business]
-./plug/business/session_marker_record/session_marker_record.inf
 {{- if eq .Values.encrypt_traffic_identify.voice_bahavior_engine .Values.define_enable_val_yes }}
 ./plug/business/tsg_vulpes/tsg_vulpes.inf
 {{- end }}