diff options
| author | Qiuwen Lu <[email protected]> | 2017-07-31 12:56:19 +0800 |
|---|---|---|
| committer | Qiuwen Lu <[email protected]> | 2017-07-31 12:56:19 +0800 |
| commit | 547f5a31fe38e2f1ecdeb16172ec85adbd04d2b8 (patch) | |
| tree | f66b1b063d306da2fabcbdaf77d9f0dd1fc771d0 | |
| parent | b84ab1d6344878baab38a820af79e9af13dc53bc (diff) | |
变更VXLAN头部字段的名称v4.2.8-20170731
| -rw-r--r-- | include/external/mrtunnat.h | 2 | ||||
| -rw-r--r-- | tunnat/src/runtime.cc | 2 | ||||
| -rw-r--r-- | tunnat/src/tunnel.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/external/mrtunnat.h b/include/external/mrtunnat.h index e7f5fea..e83e62d 100644 --- a/include/external/mrtunnat.h +++ b/include/external/mrtunnat.h @@ -53,7 +53,7 @@ struct mr_tunnat_ctrlzone /* 本地设备IP地址 */ uint32_t l_device_in_addr; /* 本地设备端口 */ - uint16_t l_device_l4_port; + uint16_t l4_src_port; /* 专用设备VPN号 */ uint32_t g_device_vpn_id; diff --git a/tunnat/src/runtime.cc b/tunnat/src/runtime.cc index f4d113f..1a20e44 100644 --- a/tunnat/src/runtime.cc +++ b/tunnat/src/runtime.cc @@ -109,7 +109,7 @@ static int __phy_to_virt_pkt_modify(TunnatInstance * instance, TunnatThreadInsta if (outer_tunnel.GetAddressInfo(outer_tunnel_addrinfo) == RT_SUCCESS) { ctrlzone->g_device_in_addr = outer_tunnel_addrinfo.dst_in_addr.s_addr; - ctrlzone->l_device_l4_port = outer_tunnel_addrinfo.s_port; + ctrlzone->l4_src_port = outer_tunnel_addrinfo.s_port; ctrlzone->g_device_vpn_id = outer_tunnel_addrinfo.vpn_id; } diff --git a/tunnat/src/tunnel.cc b/tunnat/src/tunnel.cc index a4336f6..ee103b7 100644 --- a/tunnat/src/tunnel.cc +++ b/tunnat/src/tunnel.cc @@ -102,7 +102,7 @@ int TunVxlan::CtrlZoneParse(struct mr_tunnat_ctrlzone * ctrlzone) /* UDP头部填充 */ udp_hdr_.dst_port = htons(G_VXLAN_DPORT); - udp_hdr_.src_port = ctrlzone->l_device_l4_port; + udp_hdr_.src_port = ctrlzone->l4_src_port; udp_hdr_.dgram_cksum = 0; /* VXLAN头部 */ |