功能端部署剧本升级，适配20.04版本

roles/sapp/tasks/main.yml

@@ -8,6 +8,7 @@
   yum:
     name:
       - /tmp/ansible_deploy/sapp-4.0.5.3385992-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/tsg_master-debug-1.0.3.a4e2a7c-1.el7.centos.x86_64.rpm
     state: present
 
 - name: make dir
@@ -37,7 +38,7 @@
   template:
     src: "{{ role_path }}/templates/gdev.conf.j2"
     dest: /home/mesasoft/sapp_run/etc/gdev.conf
-  tags: template
+  when: tsg_access_type == 1
   
 - name: "enable sapp"
   systemd:

roles/sapp/templates/conflist.inf.j2

@@ -1,5 +1,9 @@
 [platform]
+{% if tsg_access_type == 1 %}
 ./plug/platform/g_device_plug/g_device_plug.inf
+{% else %}
+#./plug/platform/g_device_plug/g_device_plug.inf
+{% endif %}
 ./plug/platform/tsg_master/tsg_master.inf
 
 [protocol]
@@ -16,4 +20,5 @@
 ./plug/business/fw_dns_plug/fw_dns_plug.inf
 ./plug/business/fw_mail_plug/fw_mail_plug.inf
 ./plug/business/fw_ftp_plug/fw_ftp_plug.inf
-./plug/business/tsg_conn_record/tsg_conn_record.inf
+./plug/business/tsg_conn_record/tsg_conn_record.inf
+./plug/business/capture_packet_plug/capture_packet_plug.inf

roles/sapp/templates/gdev.conf.j2

@@ -1,5 +1,5 @@
 [Module]
 pcapdevice={{ nic_data_incoming.name }}
 sendto_gdev_card={{ nic_data_incoming.name }}
-sendto_gdev_ip={{ nic_data_incoming.address }}
-gdev_status_switch=1
+sendto_gdev_ip={{ nic_data_incoming.ip }}
+gdev_status_switch=1

roles/sapp/templates/project_list.conf.j2

@@ -1,4 +1,7 @@
 tcp_flow_stat           struct
 udp_flow_stat           struct
 tcp_deduce_flow_stat    struct
-POLICY_PRIORITY	struct
+POLICY_PRIORITY	struct
+ESTABLISH_LATENCY	long
+MAIL_IDENTIFY	int
+

roles/sapp/templates/sapp.toml.j2

@@ -9,16 +9,16 @@
 instance_name = "sapp4"
 
 [CPU]
-{% if run_as_tun_mode %}
+{% if tsg_access_type == 0 %}
 worker_threads=1
 {% else %}
 worker_threads={{ sapp.worker_threads }}
 {% endif %}
 ### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as []
-{% if run_as_tun_mode %}
+{% if tsg_access_type == 0 %}
 bind_mask=[]
 {% else %}
-bind_mask=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]
+bind_mask=[{{ sapp.bind_mask }}]
 {% endif %}
 
 [PACKET_IO]
@@ -27,7 +27,7 @@ BSD_packet_filter=""
    
 ### note, depolyment.mode options: [mirror, inline, transparent]
     [packet_io.depolyment]
-    {% if nic_transparent_mode.enable %}
+    {% if nic_transparent_mode.enable == 1 %}
     mode=transparent
     {% else %}
     mode=inline
@@ -35,7 +35,7 @@ BSD_packet_filter=""
 
 ### note, interface.type options: [pag,pcap,marsio]
     [packet_io.internal.interface]
-    {% if nic_transparent_mode.enable %}
+    {% if nic_transparent_mode.enable == 1 %}
     type={{nic_transparent_mode.mode}}
     name={{nic_transparent_mode.internel_interface}}
     {% else %}