TSG-7078, TSG-7226, TSG-7177, 更新wannat, wire_graft插件.

ansible/install_config/group_vars/rpm_version.yml

@@ -68,8 +68,8 @@ http_healthcheck_rpm_version:
   http_healthcheck: http_healthcheck-21.06.01.d0685bb
 
 wannat_wangw_rpm_version:
-  libwangw: libwangw-1.3.0.bcc9c59  
+  libwangw: libwangw-1.3.2.88dda8e
 
 wire_graft_rpm_version:  
-  wire_graft: wire_graft_plug-1.3.0.c6048d7
-  libwire_graft: libwire_graft-1.3.0.c6048d7
+  wire_graft: wire_graft_plug-1.3.3.e1fe8e4
+  libwire_graft: libwire_graft-1.3.3.e1fe8e4

ansible/install_config/group_vars/stage_one_7400MCN0P01R01.yml

@@ -72,7 +72,7 @@ cm_policy_server_ip: '{% raw %}{{ cm_policy_server_ip }}{% endraw %}'
 wannat_wangw:
   wangw_conf:
     main:
-      NAT_GW_tunnel_recv_port: 3544
+      recvfrom_NATGW_bind_first_port: 3545
       NAT_GW_tunnel_send_port: 3544
       NAT_GW_tunnel_device: eth_ctl
 

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

@@ -2,15 +2,15 @@
 #在线模式用vxlan, 测试模式用ethernet, 即标准ethernet/IP协议
 NAT_GW_tunnel_mode=vxlan
 
-#本地监听端口
-NAT_GW_tunnel_recv_port={{ wannat_wangw.wangw_conf.main.NAT_GW_tunnel_recv_port }}
-
-#DNAT首包发送给NATGW时, 对端的监听端口
-NAT_GW_tunnel_send_port={{ wannat_wangw.wangw_conf.main.NAT_GW_tunnel_send_port }}
+#从起始位置开始, 本地监听sapp->threa_cound个端口, 支持多线程NIO无锁模式
+recvfrom_NATGW_bind_first_port={{ wannat_wangw.wangw_conf.main.recvfrom_NATGW_bind_first_port }}
 
 #NAT GW的内部互联网卡名称
 NAT_GW_tunnel_device={{ wannat_wangw.wangw_conf.main.NAT_GW_tunnel_device }}
 
+#DNAT首包发送给NATGW时, 对端的监听端口
+NAT_GW_tunnel_port={{ wannat_wangw.wangw_conf.main.NAT_GW_tunnel_send_port }}
+
 #NAT GW的内部互联IP地址, 端口使用vxlan默认值, 要求对方也开放UDP 4789端口
 {% raw %}NAT_GW_tunnel_ip={{ wannat_natgw.natgw_ip }}
 {% endraw %}

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

@@ -7,13 +7,25 @@ stream_project_tag_enable=1
 at_least_total_num=2
 at_least_total_byte=10
 
+#是否将link_info存入streaminfo,供其他插件读取
+stream_project_tag_enable=1
+
 #用于标识本机ip使用哪块网卡,可能是管理口,可能是其他业务口
 identification_by_which_device={{ wire_graft.wire_graft_conf.main.identification_by_which_device}}
 
 #mirror镜像模式下, 从MAC地址获取链路信息
-mirror_mode_enable=0
+### note, for example, dst mac is 01:12:34:56:78:90, src src is 02:AA:BB:CC:DD:EE:FF, 
+### ether[0] is 0x01, dst mac first octet, ether[1] is 0x12, dst mac second octet,
+### ether[6] is 0x02, src mac first octet, ether[11] is 0xFF, src mac sixth octet.
+### the bit field is from 0 to 7, the 0 is least significant bit, the 7 is most significant bit.
+mirror_get_linkinfo_enable=0
 mirror_linkinfo_project_name=mirror_linkinfo_from_mac
 
+mirror_linkinfo_device_syntax="mac[11]:0-7"
+mirror_linkinfo_slot_syntax="mac[9]:0-7"
+mirror_linkinfo_port_syntax="mac[10]:0-7"
+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.server_ip }}