gfwleak/tsg-tsg-scripts-platform
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、删除tsg_access_type 变量

Browse Source 
2、新增proxy_topo_type，capture_pacakge_type,traffic_addr_type,network_topo_type,traffic_load_type,runtime_env_type
3、删除关于adc，atca的mrzcpd，sapp相关配置文件
This commit is contained in:
fumingwei
2021-02-04 17:41:33 +08:00
parent 6478678b45
commit a5610fa082
23 changed files with 83 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
roles/sapp/templates/gdev.conf.j2
View File

@@ -1,11 +0,0 @@
[Module]
{% if tsg_running_type == 2 %}
pcapdevice={{ nic_data_incoming.name }}
sendto_gdev_card={{ nic_data_incoming.name }}
sendto_gdev_ip={{ inline_device_config.keepalive_ip }}
{% else %}
pcapdevice={{ inline_device_config.data_incoming }}
sendto_gdev_card={{ inline_device_config.data_incoming }}
sendto_gdev_ip={{ inline_device_config.keepalive_ip }}
{% endif %}
gdev_status_switch=1

2
roles/sapp/templates/sapp.service.j2
View File

@@ -1,6 +1,6 @@
[Unit]
Description=sapp service
{% if tsg_running_type != 0 %}
{% if proxy_topo_type != 0 %}
Requires=mrzcpd.service
After=mrzcpd.service
{% endif %}

19
roles/sapp/templates/sapp.toml.j2
View File

@@ -9,14 +9,14 @@
instance_name = "sapp4"
[CPU]
{% if tsg_access_type == 0 %}
{% if capture_packet_type == 0 %}
worker_threads=1
{% else %}
worker_threads={{ sapp.worker_threads }}
{% endif %}
send_only_threads_max={{ sapp.send_only_threads_max }}
### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as []
{% if tsg_access_type == 0 %}
{% if capture_packet_type == 0 %}
bind_mask=[]
{% else %}
bind_mask=[{{ sapp.bind_mask }}]
@@ -42,13 +42,6 @@ dictator_enable=0
[packet_io.feature]
{% if tsg_access_type == 4 %}
### note, used to represent inbound or outbound direction value,
### because it comes from Third party device, so it needs to be specified manually,
### if inbound_route_dir=1, then outbound_route_dir=0, vice versa,
### in other words, outbound_route_dir = 1 ^ inbound_route_dir;
inbound_route_dir={{ sapp.inbound_route_dir }}
{% endif %}
### note, BSD_packet_filter, if you do not want to set any filter rule, keep it empty as ""
BSD_packet_filter=""
@@ -76,7 +69,9 @@ dictator_enable=0
### note, depolyment.mode options: [mirror, inline, transparent]
[packet_io.depolyment]
{% if tsg_access_type == 0 %}
{% if traffic_attr_type == 0 %}
mode=mirror
{% elif traffic_addr_type == 1 and network_topo_type == 1 and capture_packet_type == 0 %}
mode=transparent
{% else %}
mode=inline
@@ -84,7 +79,7 @@ dictator_enable=0
### note, interface.type options: [pag,pcap,marsio]
[packet_io.internal.interface]
{% if tsg_access_type == 0 %}
{% if capture_packet_type == 0 %}
type=pcap
name={{packet_io.internal_interface}}
{% else %}
@@ -93,7 +88,7 @@ dictator_enable=0
{% endif %}
[packet_io.external.interface]
{% if tsg_access_type == 0 %}
{% if capture_packet_type == 0 %}
type=pcap
name={{packet_io.external_interface}}
{% else %}