TSG-8716, 解决wannat C2S,S2C方向分流不一致, 导致的单向流问题.

ansible/install_config/group_vars/rpm_version.yml

@@ -75,8 +75,9 @@ http_healthcheck_rpm_version:
   http_healthcheck: http_healthcheck-21.06.01.d0685bb
 
 wannat_wangw_rpm_version:
-  libwangw: libwangw-1.4.0.689e57b
+  libwangw: libwangw-1.5.0.f362c8a
+  libwannat_common: libwannat_common-1.0.1.8cc3bda
 
 wire_graft_rpm_version:  
-  wire_graft: wire_graft_plug-1.5.0.f3cadd2
-  libwire_graft: libwire_graft-1.5.0.f3cadd2
+  wire_graft: wire_graft_plug-1.5.2.36b072a
+  libwire_graft: libwire_graft-1.5.2.36b072a

ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml

@@ -76,6 +76,7 @@ wannat_wangw:
       recvfrom_NATGW_bind_first_port: 3545
       NAT_GW_tunnel_send_port: 3544
       NAT_GW_tunnel_device: eth_ctl
+      
 
 wire_graft:
   wire_graft_conf:

ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.7400MCN0P01R01

@@ -29,6 +29,10 @@ wannat:
   natgw_address: "127.0.0.1"
   toroad_address: "127.0.0.1"
   toroad_port: 8888
+  feedback_linkinfo_interval: 30
+  NAT_GW_broadcast_session_port: 5671
+  toroad_broadcast_session_port: 5672
+  toroad_tunnel_port: 3542
 
 ddossketch:
   enable: 1

ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.9000NPBP01R01

@@ -28,7 +28,11 @@ wannat:
   natgw_address: "127.0.0.1"
   toroad_address: "127.0.0.1"
   toroad_port: 8888  
-
+  feedback_linkinfo_interval: 30
+  NAT_GW_broadcast_session_port: 5671
+  toroad_broadcast_session_port: 5672
+  toroad_tunnel_port: 3542
+  
 ddossketch:
   enable: 1
   tcp_flood_report_thresh: 0.0008

ansible/roles/wannat_common/tasks/main.yml

@@ -0,0 +1,27 @@
+---
+- name: "copy nanomsg.rpm to destination server"
+  copy:
+    src: "{{ role_path }}/files/nanomsg-1.1.5-6.el7.x86_64.rpm"
+    dest: /tmp
+
+- name: "install nanomsg library"
+  yum:
+    name:
+      - /tmp/nanomsg-1.1.5-6.el7.x86_64.rpm
+    state: present
+    
+- name: "download wannat wannat_common library"
+  yum:
+    name: "{{ item.value }}"
+    conf_file: "{{ rpm_repo_config_path }}"
+    state: present
+    download_only: yes
+    download_dir: /tmp/rpm_download/
+  with_dict: "{{ wannat_wangw_rpm_version }}"
+
+- name: "Install wannat_common library"
+  shell: rpm -i /tmp/rpm_download/{{ item.rpm_version }}* --prefix {{ item.prefix }}
+  with_items:
+    - { "rpm_version": "{{ wannat_wangw_rpm_version.libwannat_common }}", "prefix": "{{ framework.prefix_path }}" }
+
+

ansible/roles/wannat_wangw/tasks/main.yml

@@ -8,9 +8,10 @@
     download_dir: /tmp/rpm_download/
   with_dict: "{{ wannat_wangw_rpm_version }}"
 
-- name: "Install wangw that is sapp plugins"
-  shell: rpm -i /tmp/rpm_download/{{ item.value }}* --prefix {{ sapp.prefix_path }}
-  with_dict: "{{ wannat_wangw_rpm_version }}"
+- name: "Install wangw plugins"
+  shell: rpm -i /tmp/rpm_download/{{ item.rpm_version }}* --prefix {{ item.prefix }}
+  with_items:
+    - { "rpm_version": "{{ wannat_wangw_rpm_version.libwangw }}", "prefix": "{{ sapp.prefix_path }}" }
 
 - name: "Template the etc/wannat/wangw.conf"
   template:

ansible/roles/wannat_wangw/templates/wangw.conf.j2.j2

@@ -17,6 +17,19 @@ NAT_GW_tunnel_port={{ wannat_wangw.wangw_conf.main.NAT_GW_tunnel_send_port }}
 {% raw %}NAT_GW_tunnel_ip={{ wannat.natgw_address }}
 {% endraw %}
 
+#连接NATGW, 订阅四元组广播消息端口
+{% raw %}NAT_GW_broadcast_session_port={{ wannat.NAT_GW_broadcast_session_port }}
+{% endraw %}
+
+{% raw %}toroad_tunnel_ip={{ wannat.toroad_address }}
+{% endraw %}
+#连接toroad, 订阅四元组广播消息端口
+{% raw %}toroad_broadcast_session_port={{ wannat.toroad_broadcast_session_port }}
+{% endraw %}
+
+#SNAT的应答首包发送给toroad时, 对端的监听端口
+{% raw %}toroad_tunnel_port={{ wannat.toroad_tunnel_port }}
+{% endraw %}
 
 [session]
 #最大并发连接数 

ansible/roles/wire_graft/templates/wire_graft.conf.j2.j2

@@ -33,8 +33,10 @@ mirror_linkinfo_dir_syntax="mac[4]:7-7"
 
 [toroad]
 sendto_toroad_enable={{ wire_graft.wire_graft_conf.toroad.sendto_toroad_enable }}
+
 {% raw %}toroad_ip={{ wannat.toroad_address }}
 toroad_port={{ wannat.toroad_port }}
+sendto_toroad_interval= {{ wannat.feedback_linkinfo_interval }}
 {% endraw %}
 
 [log]

ansible/stage_one_deploy.yml

@@ -25,6 +25,7 @@
     - {role: tsg-diagnose, tags: tsg-diagnose}
     - {role: system-init, tags: system-init}
     - {role: wannat_wangw, tags: wannat_wangw}
+    - {role: wannat_common, tags: wannat_common}
     - {role: wire_graft, tags: wire_graft}
     - {role: hasp, tags: hasp}
 
@@ -73,6 +74,7 @@
     - {role: system-init-9140, tags: system-init-9140}
     - {role: system-init, tags: system-init}
     - {role: wannat_wangw, tags: wannat_wangw}
+    - {role: wannat_common, tags: wannat_common}
     - {role: wire_graft, tags: wire_graft}
     - {role: nz-talon, tags: nz-talon}
     - {role: tsg-os-provision-condition, tags: tsg-os-provision-condition}