TSG v21.02.

20 files changed, 123 insertions, 52 deletions

diff --git a/roles/toroad/files/rpm/toroad-1.1.11.b0562a5-2.el7.x86_64.rpm b/roles/toroad/files/rpm/toroad-1.1.11.b0562a5-2.el7.x86_64.rpm
new file mode 100644
index 0000000..009acaf
--- /dev/null
+++ b/roles/toroad/files/rpm/toroad-1.1.11.b0562a5-2.el7.x86_64.rpm
diff --git a/roles/toroad/files/rpm/toroad-1.1.3.466cd11-2.el7.x86_64.rpm b/roles/toroad/files/rpm/toroad-1.1.3.466cd11-2.el7.x86_64.rpm
deleted file mode 100644
index 36d0323..0000000
--- a/roles/toroad/files/rpm/toroad-1.1.3.466cd11-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/toroad/files/service/toroad.service b/roles/toroad/files/service/toroad.service
new file mode 100644
index 0000000..fe799ca
--- /dev/null
+++ b/roles/toroad/files/service/toroad.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=toroad service
+After=network.target
+
+[Service]
+WorkingDirectory=/opt/wannat/toroad
+ExecStart=/opt/wannat/toroad/toroad
+Restart=always
+RestartSec=5s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/roles/toroad/tasks/main.yml b/roles/toroad/tasks/main.yml
index 169ab16..1ed1075 100644
--- a/roles/toroad/tasks/main.yml
+++ b/roles/toroad/tasks/main.yml
@@ -7,7 +7,7 @@
 - name: "copy toroad_rpm_file to destination server"
   synchronize:
     src: "{{ role_path }}/files/rpm/{{ wangw_global.rpm_files.toroad_rpm_file }}"
-    dest: "/tmp/wannat_deploy/"
+    dest: "/tmp/"
 
 - name: "Creates /opt/wannat/toroad/etc directory"
   file:
@@ -20,7 +20,7 @@
     state: present
   vars:
     packages:
-    - /tmp/wannat_deploy/{{ wangw_global.rpm_files.toroad_rpm_file }}    
+    - /tmp/{{ wangw_global.rpm_files.toroad_rpm_file }}    
 
 - name: "Template the toroad.conf"
   template:
diff --git a/roles/toroad/templates/toroad.conf.j2 b/roles/toroad/templates/toroad.conf.j2
index 7e0737c..d635417 100644
--- a/roles/toroad/templates/toroad.conf.j2
+++ b/roles/toroad/templates/toroad.conf.j2
@@ -1,8 +1,7 @@
 [main]
-http_server_listen_port=8888
-wangw_ip_list_file=wangw_ip_list_file.conf
+http_server_listen_port={{wangw_global.wiregraft.toroad_server_port}}
 probe_pkt_timeout=1
-probe_retry_times=2
+probe_retry_times=5
 
 
 [runtime_log]
diff --git a/roles/toroad/templates/wangw_ip_list_file.conf.j2 b/roles/toroad/templates/wangw_ip_list_file.conf.j2
deleted file mode 100644
index 9dfc84b..0000000
--- a/roles/toroad/templates/wangw_ip_list_file.conf.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-#WANGW ip_address, per line
-192.168.40.137
diff --git a/roles/wangw/files/rpm/libwangw-1.1.4.cbc177c-2.el7.x86_64.rpm b/roles/wangw/files/rpm/libwangw-1.1.4.cbc177c-2.el7.x86_64.rpm
deleted file mode 100644
index 24098ed..0000000
--- a/roles/wangw/files/rpm/libwangw-1.1.4.cbc177c-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/wangw/files/rpm/libwangw-1.2.0.7322d17-2.el7.x86_64.rpm b/roles/wangw/files/rpm/libwangw-1.2.0.7322d17-2.el7.x86_64.rpm
new file mode 100644
index 0000000..fa82283
--- /dev/null
+++ b/roles/wangw/files/rpm/libwangw-1.2.0.7322d17-2.el7.x86_64.rpm
diff --git a/roles/wangw/files/rpm/libwire_graft-1.1.6.1d5242c-2.el7.x86_64.rpm b/roles/wangw/files/rpm/libwire_graft-1.1.6.1d5242c-2.el7.x86_64.rpm
deleted file mode 100644
index 29db334..0000000
--- a/roles/wangw/files/rpm/libwire_graft-1.1.6.1d5242c-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/wangw/files/rpm/libwire_graft-devel-1.1.6.1d5242c-2.el7.x86_64.rpm b/roles/wangw/files/rpm/libwire_graft-devel-1.1.6.1d5242c-2.el7.x86_64.rpm
deleted file mode 100644
index 83bcdc6..0000000
--- a/roles/wangw/files/rpm/libwire_graft-devel-1.1.6.1d5242c-2.el7.x86_64.rpm
+++ /dev/null
diff --git a/roles/wangw/tasks/main.yml b/roles/wangw/tasks/main.yml
index 47adee9..1b3732e 100644
--- a/roles/wangw/tasks/main.yml
+++ b/roles/wangw/tasks/main.yml
@@ -2,17 +2,7 @@
 - name: "copy wangw_rpm_file to destination server"
   synchronize:
     src: "{{ role_path }}/files/rpm/{{ wangw_global.rpm_files.wangw_rpm_file }}"
-    dest: "/tmp/wannat_deploy/"
-
-- name: "copy wiregraft_rpm_file to destination server"
-  synchronize:
-    src: "{{ role_path }}/files/rpm/{{ wangw_global.rpm_files.wire_graft_rpm_file }}"
-    dest: "/tmp/wannat_deploy/"
-
-- name: "copy wiregraft_devel_rpm_file to destination server"
-  synchronize:
-    src: "{{ role_path }}/files/rpm/{{ wangw_global.rpm_files.wire_graft_devel_rpm_file }}"
-    dest: "/tmp/wannat_deploy/"
+    dest: "/tmp/"
     
 - name: "install wangw"
   yum:
@@ -20,33 +10,12 @@
     state: present
   vars:
     packages:
-    - /tmp/wannat_deploy/{{ wangw_global.rpm_files.wangw_rpm_file }}    
-
-- name: "install wiregraft"
-  yum:
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
-    - /tmp/wannat_deploy/{{ wangw_global.rpm_files.wire_graft_rpm_file }}    
-
-- name: "install wiregraft_devel"
-  yum:
-    name: "{{ packages }}"
-    state: present
-  vars:
-    packages:
-    - /tmp/wannat_deploy/{{ wangw_global.rpm_files.wire_graft_devel_rpm_file }}    
+    - /tmp/{{ wangw_global.rpm_files.wangw_rpm_file }}    
     
 - name: "Creates ./etc/wannat directory"
   file:
     path: /home/mesasoft/sapp_run/etc/wannat
     state: directory
-
-- name: "Creates ./etc/wire_graft directory"
-  file:
-    path: /home/mesasoft/sapp_run/etc/wire_graft
-    state: directory
     
 - name: "Template the wangw.conf"
   template:
@@ -54,8 +23,3 @@
     dest: /home/mesasoft/sapp_run/etc/wannat/wangw.conf
   tags: template
 
-- name: "Template the wire_graft.conf"
-  template:
-    src: "{{ role_path }}/templates/wire_graft.conf.j2"
-    dest: /home/mesasoft/sapp_run/etc/wire_graft/wire_graft.conf
-  tags: template
diff --git a/roles/wangw/templates/wangw.conf.j2 b/roles/wangw/templates/wangw.conf.j2
index ed8344d..6fbf558 100644
--- a/roles/wangw/templates/wangw.conf.j2
+++ b/roles/wangw/templates/wangw.conf.j2
@@ -2,6 +2,12 @@
 #在线模式用vxlan, 测试模式用ethernet, 即标准ethernet/IP协议
 NAT_GW_tunnel_mode=vxlan
 
+#本地监听端口
+NAT_GW_tunnel_recv_port={{wangw_global.wangw.NAT_GW_tunnel_listen_port}}
+
+#DNAT首包发送给NATGW时, 对端的监听端口
+NAT_GW_tunnel_send_port={{wangw_global.wangw.NAT_GW_tunnel_remote_port}}
+
 #NAT GW的内部互联网卡名称
 NAT_GW_tunnel_device={{wangw_global.wangw.NAT_GW_tunnel_device}}
 
@@ -12,8 +18,13 @@ NAT_GW_tunnel_ip={{wangw_global.wangw.NAT_GW_tunnel_ip}}
 #接收来自NAT GW的包, 需要创建sapp的独立发包线程, 目前暂时只支持1个.
 I2E_independent_thread_num=1
 
-[session]
+#重复流量识别
+duplicate_pkt_prune=1
 
+[pkt_dump]
+command_port=1234
+
+[session]
 #最大并发连接数 
 max_session_num=100000
 
@@ -23,7 +34,7 @@ no_pkt_timeout=60
 
 [runtime_log]
 log_file=./wannat_log/wannat.log
-log_level=10
+log_level=30
 
 [field_stat2]
 Fs2_log_local_dir_path=./wannat_log
@@ -44,9 +55,10 @@ redis_server_ip={{wangw_global.wangw.redis_server_ip}}
 redis_server_port={{wangw_global.wangw.redis_server_port}}
 redis_index={{wangw_global.wangw.redis_index}}
 
-[no_nat_gw_selt_test]
+[no_nat_gw_self_test]
 test_eth_mode_nat_type=snat
 test_eth_mode_vlink_id=0
 test_eth_mode_link_dir=E
 test_eth_bpf="port 80"
+test_linkinfo_file=./etc/wannat/self_test.linkinfo
 
diff --git a/roles/wire_graft/files/rpm/libwire_graft-1.2.0.7fdacbc-2.el7.x86_64.rpm b/roles/wire_graft/files/rpm/libwire_graft-1.2.0.7fdacbc-2.el7.x86_64.rpm
new file mode 100644
index 0000000..3b2d8f7
--- /dev/null
+++ b/roles/wire_graft/files/rpm/libwire_graft-1.2.0.7fdacbc-2.el7.x86_64.rpm
diff --git a/roles/wire_graft/files/rpm/libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm b/roles/wire_graft/files/rpm/libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm
new file mode 100644
index 0000000..6b4d6a8
--- /dev/null
+++ b/roles/wire_graft/files/rpm/libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm
diff --git a/roles/wire_graft/tasks/main.yml b/roles/wire_graft/tasks/main.yml
new file mode 100644
index 0000000..9d61512
--- /dev/null
+++ b/roles/wire_graft/tasks/main.yml
@@ -0,0 +1,31 @@
+---
+- name: "Creates ./etc/wire_graft directory"
+  file:
+    path: /home/mesasoft/sapp_run/etc/wire_graft
+    state: directory
+    
+- name: "copy wiregraft_rpm_file to destination server"
+  synchronize:
+    src: "{{ role_path }}/files/rpm/{{ wangw_global.rpm_files.wire_graft_rpm_file }}"
+    dest: "/tmp/"
+    
+- name: "install wiregraft"
+  yum:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+    - /tmp/{{ wangw_global.rpm_files.wire_graft_rpm_file }}        
+
+- name: "Template the wire_graft.inf"
+  template:
+    src: "{{ role_path }}/templates/wire_graft.inf.j2"
+    dest: /home/mesasoft/sapp_wannat/plug/platform/wire_graft/wire_graft.inf
+  tags: template
+  
+- name: "Template the wire_graft.conf"
+  template:
+    src: "{{ role_path }}/templates/wire_graft.conf.j2"
+    dest: /home/mesasoft/sapp_run/etc/wire_graft/wire_graft.conf
+  tags: template
+
diff --git a/roles/wangw/templates/wire_graft.conf.j2 b/roles/wire_graft/templates/wire_graft.conf.j2
index 878a8f5..b878a22 100644
--- a/roles/wangw/templates/wire_graft.conf.j2
+++ b/roles/wire_graft/templates/wire_graft.conf.j2
@@ -2,18 +2,18 @@
 
 [record_link_info]
 stream_project_tag_enable=1
-
+link_info_prune=1
 #用于标识本机ip使用哪块网卡,可能是管理口,可能是其他业务口
 identification_by_which_device={{wangw_global.wiregraft.identification_by_which_device}}
 
 #单个流超过此包数的才发送链路信息, 防止遭受ddos攻击疯狂发日志
-at_least_total_num=3
-at_least_total_byte=5
+at_least_total_num=2
+at_least_total_byte=10
 
 [toroad]
 sendto_toroad_enable=1
 toroad_ip={{wangw_global.wiregraft.toroad_server_ip}}
-toroad_port=8888
+toroad_port={{wangw_global.wiregraft.toroad_server_port}}
 
 [log]
 log_level=30
diff --git a/roles/wire_graft/templates/wire_graft.inf.j2 b/roles/wire_graft/templates/wire_graft.inf.j2
new file mode 100644
index 0000000..c6e2cf5
--- /dev/null
+++ b/roles/wire_graft/templates/wire_graft.inf.j2
@@ -0,0 +1,12 @@
+[PLUGINFO]
+PLUGNAME=wire_graft
+SO_PATH=./plug/platform/wire_graft/libwire_graft.so
+INIT_FUNC=wire_graft_init
+
+[TCP_RAW]
+FUNC_FLAG=ALL
+FUNC_NAME=record_link_info_entry_raw
+
+#[POLLING]
+#FUNC_FLAG=ALL
+#FUNC_NAME=wire_graft_polling_cb
diff --git a/roles/wire_graft_devel/files/rpm/libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm b/roles/wire_graft_devel/files/rpm/libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm
new file mode 100644
index 0000000..6b4d6a8
--- /dev/null
+++ b/roles/wire_graft_devel/files/rpm/libwire_graft-devel-1.2.0.7fdacbc-2.el7.x86_64.rpm
diff --git a/roles/wire_graft_devel/tasks/main.yml b/roles/wire_graft_devel/tasks/main.yml
new file mode 100644
index 0000000..b244da1
--- /dev/null
+++ b/roles/wire_graft_devel/tasks/main.yml
@@ -0,0 +1,24 @@
+---
+- name: "Creates /opt/MESA/lib directory"
+  file:
+    path: /opt/MESA/lib
+    state: directory
+    
+- name: "copy wiregraft_devel_rpm_file to destination server"
+  synchronize:
+    src: "{{ role_path }}/files/rpm/{{ wangw_global.rpm_files.wire_graft_devel_rpm_file }}"
+    dest: "/tmp/"
+
+- name: "install wiregraft_devel"
+  yum:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+    - /tmp/{{ wangw_global.rpm_files.wire_graft_devel_rpm_file }}        
+    
+    
+
+
+
+
diff --git a/roles/wire_graft_devel/templates/wire_graft.conf.j2 b/roles/wire_graft_devel/templates/wire_graft.conf.j2
new file mode 100644
index 0000000..234ef07
--- /dev/null
+++ b/roles/wire_graft_devel/templates/wire_graft.conf.j2
@@ -0,0 +1,19 @@
+[main]
+
+[record_link_info]
+stream_project_tag_enable=1
+link_info_prune=1
+#用于标识本机ip使用哪块网卡,可能是管理口,可能是其他业务口
+identification_by_which_device=enp6s0
+
+#单个流超过此包数的才发送链路信息, 防止遭受ddos攻击疯狂发日志
+at_least_total_num=2
+at_least_total_byte=5
+
+[toroad]
+sendto_toroad_enable=1
+toroad_ip=192.168.40.134
+toroad_port=8888
+
+[log]
+log_level=30