diff options
| author | Qiuwen Lu <[email protected]> | 2020-05-28 15:07:35 +0800 |
|---|---|---|
| committer | Qiuwen Lu <[email protected]> | 2020-05-28 15:07:35 +0800 |
| commit | 7cecf76874695f7f39cfb7c4e0f6bb5152ee1892 (patch) | |
| tree | 7c0eb5b04c9c44df918747a4a0eb2dbef7611658 | |
| parent | 763bc22b2bdabdd2b9498bee6470cb64cd92e2d1 (diff) | |
修正无历史状态发包时引用了内部定义的隧道类型标识的问题。
* 原实现在使用控制域中的隧道类型时，错误地与内部定义的隧道类型相比较，导致ABI定义发生了变化；
* 现修正，改用TUNNAT_TYPE_*系列定义。
| -rw-r--r-- | tunnat/src/runtime.cc | 6 | ||||
| -rw-r--r-- | tunnat/src/tunnel.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tunnat/src/runtime.cc b/tunnat/src/runtime.cc index 02b8775..f17689e 100644 --- a/tunnat/src/runtime.cc +++ b/tunnat/src/runtime.cc @@ -586,7 +586,7 @@ static int __virt_to_phy_pkt_no_session(TunnatInstance * instance, TunnatThreadI return RT_ERR; /* 对于内层是以太报文的 */ - if (ctrlzone->g_device_inner_encap_type == TUNNEL_TYPE_ETHER) + if (ctrlzone->g_device_inner_encap_type == TUNNAT_TUNNEL_TYPE_ETHER) { TunVxlan OuterVXLAN; int ret = OuterVXLAN.CtrlZoneParse(ctrlzone); @@ -600,11 +600,11 @@ static int __virt_to_phy_pkt_no_session(TunnatInstance * instance, TunnatThreadI return RT_SUCCESS; } - else if (ctrlzone->g_device_inner_encap_type == TUNNEL_TYPE_PPP) + else if (ctrlzone->g_device_inner_encap_type == TUNNAT_TUNNEL_TYPE_PPP) { assert(0); } - else if (ctrlzone->g_device_inner_encap_type == TUNNEL_TYPE_HDLC) + else if (ctrlzone->g_device_inner_encap_type == TUNNAT_TUNNEL_TYPE_HDLC) { assert(0); } diff --git a/tunnat/src/tunnel.cc b/tunnat/src/tunnel.cc index 65e9f7d..d85d013 100644 --- a/tunnat/src/tunnel.cc +++ b/tunnat/src/tunnel.cc @@ -121,11 +121,11 @@ int TunVxlan::CtrlZoneParse(struct mr_tunnat_ctrlzone * ctrlzone) /* 内层封装形式 */ switch (ctrlzone->g_device_inner_encap_type) { - case TUNNEL_TYPE_ETHER:vxlan_hdr_.link_layer_type = G_VXLAN_INNER_LINK_TYPE_ETH; + case TUNNAT_TUNNEL_TYPE_ETHER:vxlan_hdr_.link_layer_type = G_VXLAN_INNER_LINK_TYPE_ETH; break; - case TUNNEL_TYPE_HDLC:vxlan_hdr_.link_layer_type = G_VXLAN_INNER_LINK_TYPE_HDLC; + case TUNNAT_TUNNEL_TYPE_HDLC:vxlan_hdr_.link_layer_type = G_VXLAN_INNER_LINK_TYPE_HDLC; break; - case TUNNEL_TYPE_PPP:vxlan_hdr_.link_layer_type = G_VXLAN_INNER_LINK_TYPE_PPP; + case TUNNAT_TUNNEL_TYPE_PPP:vxlan_hdr_.link_layer_type = G_VXLAN_INNER_LINK_TYPE_PPP; break; default:assert(0); return RT_ERR; |