gfwleak/common-tools-tcpdump-mesa
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(print_packt and dump_packet): 读包模式下开启-g，对v4和v6头同时进行bpf

Browse Source
This commit is contained in:
yangwei
2021-09-24 14:23:54 +08:00
parent ca549c5d44
commit 453d331717
1 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/tcpdump.c
View File

@@ -3077,49 +3077,45 @@ dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
static void static void
MESA_dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *raw_pkt) MESA_dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *raw_pkt)
{ {
//char modify_pkt_buf[2048]; int ipv4_inner_pkt_len;
int inner_pkt_len; int ipv6_inner_pkt_len;
int bpf_match_ipv4 = 0, bpf_match_ipv6 = 0;
++packets_captured; ++packets_captured;
++infodelay; ++infodelay;
//memcpy(modify_pkt_buf, raw_pkt, h->caplen >= 2048? 2048:h->caplen);
//inner_pkt_len = MESA_dump_seek_to_inner(modify_pkt_buf, h->caplen);
//if(inner_pkt_len < 0){
// return;
//}
struct mesa_ip4_hdr *ip4hdr_greedy; struct mesa_ip4_hdr *ip4hdr_greedy;
struct mesa_ip6_hdr *ip6hdr_greedy; struct mesa_ip6_hdr *ip6hdr_greedy;
const unsigned char *inner_iphdr = NULL; const unsigned char *ipv4_inner_iphdr = NULL;
const unsigned char *ipv6_inner_iphdr = NULL;
ip4hdr_greedy = (struct mesa_ip4_hdr *)MESA_jump_layer_greedy(raw_pkt, ADDR_TYPE_MAC, __ADDR_TYPE_IP_PAIR_V4); ip4hdr_greedy = (struct mesa_ip4_hdr *)MESA_jump_layer_greedy(raw_pkt, ADDR_TYPE_MAC, __ADDR_TYPE_IP_PAIR_V4);
if(ip4hdr_greedy) if(ip4hdr_greedy)
{ {
inner_iphdr = (const unsigned char *)ip4hdr_greedy; ipv4_inner_iphdr = (const unsigned char *)ip4hdr_greedy;
inner_pkt_len = h->caplen - ((const u_char *)ip4hdr_greedy - raw_pkt) ; ipv4_inner_pkt_len = h->caplen - ((const u_char *)ip4hdr_greedy - raw_pkt) ;
} }
else
{
ip6hdr_greedy = (struct mesa_ip6_hdr *)MESA_jump_layer_greedy(raw_pkt, ADDR_TYPE_MAC, __ADDR_TYPE_IP_PAIR_V6); ip6hdr_greedy = (struct mesa_ip6_hdr *)MESA_jump_layer_greedy(raw_pkt, ADDR_TYPE_MAC, __ADDR_TYPE_IP_PAIR_V6);
if(ip6hdr_greedy) if(ip6hdr_greedy)
{ {
inner_iphdr = (const unsigned char *)ip6hdr_greedy; ipv6_inner_iphdr = (const unsigned char *)ip6hdr_greedy;
inner_pkt_len = h->caplen - ((const u_char *)ip6hdr_greedy - raw_pkt); ipv6_inner_pkt_len = h->caplen - ((const u_char *)ip6hdr_greedy - raw_pkt);
} }
else
if (has_bpf_filter_flag != 0)
{ {
if (ip4hdr_greedy)
{
bpf_match_ipv4 = bpf_filter(fcode.bf_insns, (const unsigned char *)ipv4_inner_iphdr, ipv4_inner_pkt_len, ipv4_inner_pkt_len);
}
if (ip6hdr_greedy)
{
bpf_match_ipv6 = bpf_filter(fcode.bf_insns, (const unsigned char *)ipv6_inner_iphdr, ipv6_inner_pkt_len, ipv6_inner_pkt_len);
}
if (bpf_match_ipv4 == 0 && bpf_match_ipv6 == 0)
return; return;
} }
}
if(has_bpf_filter_flag != 0){
if(0 == bpf_filter(fcode.bf_insns,
(const unsigned char *)inner_iphdr, inner_pkt_len, inner_pkt_len)){
return;
}
}
/* -w参数要存储包, 实际存储的包还是用原始报文, 只是BPF用内层过滤 */ /* -w参数要存储包, 实际存储的包还是用原始报文, 只是BPF用内层过滤 */
pcap_dump(user, h, raw_pkt); pcap_dump(user, h, raw_pkt);
#ifdef HAVE_PCAP_DUMP_FLUSH #ifdef HAVE_PCAP_DUMP_FLUSH
@@ -3163,8 +3159,6 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
static void static void
MESA_dump_print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *pkt) MESA_dump_print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *pkt)
{ {
int inner_pkt_len;
#if 0 #if 0
/* 此函数仅用于tcpdump屏幕打印, 直接修改pkt原始包, 避免再copy一次, 节约点CPU */ /* 此函数仅用于tcpdump屏幕打印, 直接修改pkt原始包, 避免再copy一次, 节约点CPU */
inner_pkt_len = MESA_dump_seek_to_inner(pkt, h->caplen); inner_pkt_len = MESA_dump_seek_to_inner(pkt, h->caplen);
@@ -3183,37 +3177,39 @@ MESA_dump_print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *
((struct pcap_pkthdr *)h)->caplen = (unsigned int)inner_pkt_len; ((struct pcap_pkthdr *)h)->caplen = (unsigned int)inner_pkt_len;
((struct pcap_pkthdr *)h)->len = (unsigned int)inner_pkt_len; ((struct pcap_pkthdr *)h)->len = (unsigned int)inner_pkt_len;
#else #else
int ipv4_inner_pkt_len;
int ipv6_inner_pkt_len;
int bpf_match_ipv4 = 0, bpf_match_ipv6 = 0;
struct mesa_ip4_hdr *ip4hdr_greedy; struct mesa_ip4_hdr *ip4hdr_greedy;
struct mesa_ip6_hdr *ip6hdr_greedy; struct mesa_ip6_hdr *ip6hdr_greedy;
const unsigned char *inner_iphdr = NULL; const unsigned char *ipv4_inner_iphdr = NULL;
const unsigned char *ipv6_inner_iphdr = NULL;
ip4hdr_greedy = (struct mesa_ip4_hdr *)MESA_jump_layer_greedy(pkt, ADDR_TYPE_MAC, __ADDR_TYPE_IP_PAIR_V4); ip4hdr_greedy = (struct mesa_ip4_hdr *)MESA_jump_layer_greedy(pkt, ADDR_TYPE_MAC, __ADDR_TYPE_IP_PAIR_V4);
if(ip4hdr_greedy) if(ip4hdr_greedy)
{ {
inner_iphdr = (const unsigned char *)ip4hdr_greedy; ipv4_inner_iphdr = (const unsigned char *)ip4hdr_greedy;
inner_pkt_len = h->caplen - ((const unsigned char *)ip4hdr_greedy - pkt); ipv4_inner_pkt_len = h->caplen - ((const unsigned char *)ip4hdr_greedy - pkt);
} }
else
{
ip6hdr_greedy = (struct mesa_ip6_hdr *)MESA_jump_layer_greedy(pkt, ADDR_TYPE_MAC, __ADDR_TYPE_IP_PAIR_V6); ip6hdr_greedy = (struct mesa_ip6_hdr *)MESA_jump_layer_greedy(pkt, ADDR_TYPE_MAC, __ADDR_TYPE_IP_PAIR_V6);
if(ip6hdr_greedy) if (ip6hdr_greedy)
{ {
inner_iphdr = (const unsigned char *)ip6hdr_greedy; ipv6_inner_iphdr = (const unsigned char *)ip6hdr_greedy;
inner_pkt_len = h->caplen - ((const unsigned char *)ip6hdr_greedy - pkt); ipv6_inner_pkt_len = h->caplen - ((const unsigned char *)ip6hdr_greedy - pkt);
}
else
{
return;
}
} }
if (has_bpf_filter_flag != 0) if (has_bpf_filter_flag != 0)
{ {
if (0 == bpf_filter(fcode.bf_insns, if (ip4hdr_greedy)
(const unsigned char *)inner_iphdr, inner_pkt_len, inner_pkt_len))
{ {
return; bpf_match_ipv4 = bpf_filter(fcode.bf_insns, (const unsigned char *)ipv4_inner_iphdr, ipv4_inner_pkt_len, ipv4_inner_pkt_len);
} }
if (ip6hdr_greedy)
{
bpf_match_ipv6 = bpf_filter(fcode.bf_insns, (const unsigned char *)ipv6_inner_iphdr, ipv6_inner_pkt_len, ipv6_inner_pkt_len);
}
if (bpf_match_ipv4 == 0 && bpf_match_ipv6 == 0)
return;
} }
#endif #endif