gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: TSG-7285 在TSG-9140设备上，Proxy解密流量转发封装MAC地址时未使用策略中指定的MAC

Browse Source
This commit is contained in:
luwenpeng
2021-08-06 14:52:33 +08:00
parent be8de2eaf4
commit 95d05be338
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugin/business/traffic-mirror/src/rebuild.cpp
View File

@@ -319,16 +319,19 @@ static void tcp_segment_send_to_target_group(struct tfe_stream_addr * addr, stru
unsigned int pkt_len = 0;
/* Ethernet and VLAN header */
if (target->vlan_tci > 0)
{
pkt_len += ether_header_construct(ethdev, pkt_buffer, ether_addr_src,
ether_addr_dst, target->vlan_tci, l3_protocol);
}
else
{
pkt_len += ether_header_construct(ethdev, pkt_buffer, ether_addr_src,
if ((target->rewrite_as_target_mac && target->rewrite_as_target_vlan) ||
(target->rewrite_as_target_mac && !target->rewrite_as_target_vlan))
{
pkt_len += ether_header_construct(ethdev, pkt_buffer, ether_addr_src,
&target->ether_addr, target->vlan_tci, l3_protocol);
}
}
// !target->rewrite_as_target_mac && target->rewrite_as_target_vlan
// !target->rewrite_as_target_mac && !target->rewrite_as_target_vlan
else
{
pkt_len += ether_header_construct(ethdev, pkt_buffer, ether_addr_src,
ether_addr_dst, target->vlan_tci, l3_protocol);
}
/* IPv4/IPv6 Header */
pkt_len += ip_header_construct_by_stream_addr(addr,