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

修复sapp在线捕包模式下使用-o参数偏移两次的bug.

Browse Source
This commit is contained in:
lijia
2021-07-07 15:11:28 +08:00
parent 793bb5317e
commit faa4eba4f7
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tcpdump.c
View File

@@ -57,7 +57,7 @@ static int has_bpf_filter_flag = 0; /* 是否有正确的BPF过滤条件 */
extern int treat_vlan_as_mac_in_mac_sw; extern int treat_vlan_as_mac_in_mac_sw;
static short pkt_classify_flag = 0; static short pkt_classify_flag = 0;
static char pkt_classify_watermark_sw = 0; static char pkt_classify_watermark_sw = 0;
int tcpdump_r_offline_mode = 0; /* 从pcap文件里读包, 而不是来源于sapp, 主要是应对有-o参数时处理模式不一样 */
#endif #endif
#ifndef lint #ifndef lint
@@ -1778,6 +1778,7 @@ main(int argc, char **argv)
RFileName = optarg; RFileName = optarg;
#if MESA_DUMP #if MESA_DUMP
has_device_flag = 1; has_device_flag = 1;
tcpdump_r_offline_mode = 1;
#endif #endif
break; break;
@@ -3050,7 +3051,12 @@ dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
++packets_captured; ++packets_captured;
++infodelay; ++infodelay;
if(tcpdump_data_offset > 0) /*
sapp内部也处理了-o参数, 通过udp socket输出的包已经跳过了前面的offset字节,
此时再跳过offset就重复偏移两次了,
所以要判断一下tcpdump_r_offline_mode.
*/
if((tcpdump_data_offset > 0) && (tcpdump_r_offline_mode != 0))
{ {
pcap_dump(user, h, sp+tcpdump_data_offset); pcap_dump(user, h, sp+tcpdump_data_offset);
} }
@@ -3133,7 +3139,13 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
++packets_captured; ++packets_captured;
++infodelay; ++infodelay;
if(tcpdump_data_offset > 0)
/*
sapp内部也处理了-o参数, 通过udp socket输出的包已经跳过了前面的offset字节,
此时再跳过offset就重复偏移两次了,
所以要判断一下tcpdump_r_offline_mode.
*/
if((tcpdump_data_offset > 0) && (tcpdump_r_offline_mode != 0))
{ {
pretty_print_packet((netdissect_options *)user, h, sp+tcpdump_data_offset, packets_captured); pretty_print_packet((netdissect_options *)user, h, sp+tcpdump_data_offset, packets_captured);
} }