修复ip分片跳转BUG.

net_common.c

@@ -155,6 +155,12 @@ static int ipv4_jump_to_layer(const char *raw_data,  int raw_layer_type, int exp
 	if(raw_layer_type == expect_layer_type){
 		return 0;
 	}
+
+	/* IP<49><50>Ƭ<EFBFBD><C6AC><EFBFBD>ټ<EFBFBD><D9BC><EFBFBD><EFBFBD><EFBFBD>ת */
+	unsigned short *iphdr_off = (unsigned short *)&p_ip_hdr->ip_off[0];
+	if((htons(*iphdr_off) & IP_MF) || (htons(*iphdr_off) & IP_OFFMASK)){
+		return -1;
+	}
 	
 	switch(p_ip_hdr->ip_p){
 		case IPPROTO_TCP:
@@ -262,8 +268,9 @@ static int ipv6_jump_to_layer(const char *raw_data,  int raw_layer_type, int exp
 				goto done;
 			break;
 
-			case 44:///NEXTHDR_FRAGMENT:		
+			case 44:///NEXTHDR_FRAGMENT:	
-				offset_to_ip6 = 8; // 8 == sizeof(struct ipv6_frag_hdr);
+				/* IP<49><50>Ƭ<EFBFBD><C6AC><EFBFBD>ټ<EFBFBD><D9BC><EFBFBD><EFBFBD><EFBFBD>ת */
+				return -1;
 			break;
 
 			case 50://NEXTHDR_ESP:
@@ -642,6 +649,11 @@ const void *MESA_net_jump_to_layer_greedy(const void *raw_data, int raw_layer_ty
 			case __ADDR_TYPE_IP_PAIR_V4:
 			{
 				const struct mesa_ip4_hdr *ip4hdr = (const struct mesa_ip4_hdr *)expect_layer;
+				if((ntohs(ip4hdr->ip_off) & IP_MF ) || (ntohs(ip4hdr->ip_off) & IP_OFFMASK)){
+					/* IP<49><50>Ƭ<EFBFBD><C6AC><EFBFBD>ټ<EFBFBD><D9BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><DAB2><EFBFBD>ת */
+					goto done;
+				}
+				
 				if(IPPROTO_UDP == ip4hdr->ip_p){
 					new_next_layer_data = (char *)expect_layer + ip4hdr->ip_hl * 4;
 					new_raw_layer_type = ADDR_TYPE_UDP; /* IP<49><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>ƫ<EFBFBD><C6AB>, ֻ֧<D6BB><D6A7>UDP, IPIP, GRE, L2TPv3. */

print-ether.c

@@ -137,18 +137,6 @@ ether_print(netdissect_options *ndo,
 	int llc_hdrlen;
 
 	ep = (const struct ether_header *)p;
-
-	/* 2017-01-06 lijia add, <20>dz<EFBFBD><C7B3><EFBFBD>Ethernet<65><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ */
-	switch(ntohs(ep->ether_length_type)){
-		case ETHERTYPE_IP:
-		case ETHERTYPE_IPV6:
-		case ETHERTYPE_8021Q:
-		case ETHERTYPE_ARP:
-		break;
-
-		default:
-		return;
-	}
 	
 	if (caplen < ETHER_HDRLEN) {
 		ND_PRINT((ndo, "[|ether]"));

print.c

@@ -336,7 +336,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	 */
 	ndo->ndo_snapend = sp + h->caplen;
 
-        hdrlen = (ndo->ndo_if_printer)(ndo, h, sp); /* <20>˺<EFBFBD><CBBA><EFBFBD>ָ<EFBFBD><D6B8>ʵ<EFBFBD><CAB5>ָ<EFBFBD><D6B8> ether_if_print() */
+    hdrlen = (ndo->ndo_if_printer)(ndo, h, sp); /* <20>˺<EFBFBD><CBBA><EFBFBD>ָ<EFBFBD><D6B8>ʵ<EFBFBD><CAB5>ָ<EFBFBD><D6B8> ether_if_print() */
 
 	/*
 	 * Restore the original snapend, as a printer might have

tcpdump.c

@@ -2177,7 +2177,10 @@ main(int argc, char **argv)
 	if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0){
 		error("%s", pcap_geterr(pd));
 	}else{
-		has_bpf_filter_flag = 1;
+		/* <20><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>bpf filter, <20>˴<EFBFBD><CBB4>ж<EFBFBD>һ<EFBFBD><D2BB> */
+		if(cmdbuf){
+			has_bpf_filter_flag = 1;
+		}
 	}
 	
 	if (dflag) {