mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-10-19 05:58:53 +02:00
Code Issues

tcpdump: bump to 4.9.2

Browse Source 
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
Stijn Tintel 2017-09-10 21:27:26 +02:00
parent 910e3bed12
commit 21014d9708
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/utils/tcpdump/Makefile
View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=tcpdump PKG_NAME:=tcpdump
PKG_VERSION:=4.9.1 PKG_VERSION:=4.9.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.us.tcpdump.org/release/ \ PKG_SOURCE_URL:=http://www.us.tcpdump.org/release/ \
http://www.tcpdump.org/release/ http://www.tcpdump.org/release/
PKG_HASH:=f9448cf4deb2049acf713655c736342662e652ef40dbe0a8f6f8d5b9ce5bd8f3 PKG_HASH:=798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1

74
package/network/utils/tcpdump/patches/100-tcpdump_mini.patch
View File

@ -92,7 +92,7 @@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
--- a/addrtoname.c --- a/addrtoname.c
+++ b/addrtoname.c +++ b/addrtoname.c
@@ -566,8 +566,10 @@ linkaddr_string(netdissect_options *ndo, @@ -578,8 +578,10 @@ linkaddr_string(netdissect_options *ndo,
if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN) if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN)
return (etheraddr_string(ndo, ep)); return (etheraddr_string(ndo, ep));
@ -102,8 +102,8 @@
+#endif +#endif
tp = lookup_bytestring(ndo, ep, len); tp = lookup_bytestring(ndo, ep, len);
if (tp->e_name) if (tp->bs_name)
@@ -1202,6 +1204,7 @@ init_addrtoname(netdissect_options *ndo, @@ -1214,6 +1216,7 @@ init_addrtoname(netdissect_options *ndo,
init_ipxsaparray(ndo); init_ipxsaparray(ndo);
} }
@ -111,7 +111,7 @@
const char * const char *
dnaddr_string(netdissect_options *ndo, u_short dnaddr) dnaddr_string(netdissect_options *ndo, u_short dnaddr)
{ {
@@ -1221,6 +1224,7 @@ dnaddr_string(netdissect_options *ndo, u @@ -1233,6 +1236,7 @@ dnaddr_string(netdissect_options *ndo, u
return(tp->name); return(tp->name);
} }
@ -224,7 +224,7 @@
return (1); return (1);
@@ -368,6 +369,7 @@ ethertype_print(netdissect_options *ndo, @@ -368,6 +369,7 @@ ethertype_print(netdissect_options *ndo,
} }
isoclns_print(ndo, p + 1, length - 1, caplen - 1); isoclns_print(ndo, p + 1, length - 1);
return(1); return(1);
+#endif +#endif
@ -312,7 +312,7 @@
break; break;
--- a/print-ip6.c --- a/print-ip6.c
+++ b/print-ip6.c +++ b/print-ip6.c
@@ -303,6 +303,7 @@ ip6_print(netdissect_options *ndo, const @@ -305,6 +305,7 @@ ip6_print(netdissect_options *ndo, const
return; return;
nh = *cp; nh = *cp;
break; break;
@ -320,13 +320,16 @@
case IPPROTO_FRAGMENT: case IPPROTO_FRAGMENT:
advance = frag6_print(ndo, cp, (const u_char *)ip6); advance = frag6_print(ndo, cp, (const u_char *)ip6);
if (advance < 0 || ndo->ndo_snapend <= cp + advance) if (advance < 0 || ndo->ndo_snapend <= cp + advance)
@@ -324,16 +325,19 @@ ip6_print(netdissect_options *ndo, const @@ -328,6 +329,7 @@ ip6_print(netdissect_options *ndo, const
advance = mobility_print(ndo, cp, (const u_char *)ip6); return;
nh = *cp; nh = *cp;
return; return;
+#endif +#endif
case IPPROTO_ROUTING: case IPPROTO_ROUTING:
ND_TCHECK(*cp);
advance = rt6_print(ndo, cp, (const u_char *)ip6); advance = rt6_print(ndo, cp, (const u_char *)ip6);
@@ -335,12 +337,14 @@ ip6_print(netdissect_options *ndo, const
return;
nh = *cp; nh = *cp;
break; break;
+#ifndef TCPDUMP_MINI +#ifndef TCPDUMP_MINI
@ -340,15 +343,15 @@
case IPPROTO_TCP: case IPPROTO_TCP:
tcp_print(ndo, cp, len, (const u_char *)ip6, fragmented); tcp_print(ndo, cp, len, (const u_char *)ip6, fragmented);
return; return;
@@ -343,6 +347,7 @@ ip6_print(netdissect_options *ndo, const @@ -350,6 +354,7 @@ ip6_print(netdissect_options *ndo, const
case IPPROTO_ICMPV6: case IPPROTO_ICMPV6:
icmp6_print(ndo, cp, len, (const u_char *)ip6, fragmented); icmp6_print(ndo, cp, len, (const u_char *)ip6, fragmented);
return; return;
+#ifndef TCPDUMP_MINI +#ifndef TCPDUMP_MINI
case IPPROTO_AH: case IPPROTO_AH:
advance = ah_print(ndo, cp); advance = ah_print(ndo, cp);
nh = *cp; if (advance < 0)
@@ -371,6 +376,7 @@ ip6_print(netdissect_options *ndo, const @@ -382,6 +387,7 @@ ip6_print(netdissect_options *ndo, const
case IPPROTO_PIM: case IPPROTO_PIM:
pim_print(ndo, cp, len, (const u_char *)ip6); pim_print(ndo, cp, len, (const u_char *)ip6);
return; return;
@ -356,7 +359,7 @@
case IPPROTO_OSPF: case IPPROTO_OSPF:
ospf6_print(ndo, cp, len); ospf6_print(ndo, cp, len);
@@ -384,9 +390,11 @@ ip6_print(netdissect_options *ndo, const @@ -395,9 +401,11 @@ ip6_print(netdissect_options *ndo, const
ip_print(ndo, cp, len); ip_print(ndo, cp, len);
return; return;
@ -370,7 +373,7 @@
gre_print(ndo, cp, len); gre_print(ndo, cp, len);
--- a/print-ip.c --- a/print-ip.c
+++ b/print-ip.c +++ b/print-ip.c
@@ -329,6 +329,7 @@ ip_print_demux(netdissect_options *ndo, @@ -344,6 +344,7 @@ ip_print_demux(netdissect_options *ndo,
again: again:
switch (ipds->nh) { switch (ipds->nh) {
@ -378,7 +381,7 @@
case IPPROTO_AH: case IPPROTO_AH:
if (!ND_TTEST(*ipds->cp)) { if (!ND_TTEST(*ipds->cp)) {
ND_PRINT((ndo, "[|AH]")); ND_PRINT((ndo, "[|AH]"));
@@ -367,7 +368,9 @@ again: @@ -382,7 +383,9 @@ again:
*/ */
break; break;
} }
@ -388,7 +391,7 @@
case IPPROTO_SCTP: case IPPROTO_SCTP:
sctp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len); sctp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
break; break;
@@ -375,6 +378,7 @@ again: @@ -390,6 +393,7 @@ again:
case IPPROTO_DCCP: case IPPROTO_DCCP:
dccp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len); dccp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
break; break;
@ -396,7 +399,7 @@
case IPPROTO_TCP: case IPPROTO_TCP:
/* pass on the MF bit plus the offset to detect fragments */ /* pass on the MF bit plus the offset to detect fragments */
@@ -394,6 +398,7 @@ again: @@ -409,6 +413,7 @@ again:
ipds->off & (IP_MF|IP_OFFMASK)); ipds->off & (IP_MF|IP_OFFMASK));
break; break;
@ -404,7 +407,7 @@
case IPPROTO_PIGP: case IPPROTO_PIGP:
/* /*
* XXX - the current IANA protocol number assignments * XXX - the current IANA protocol number assignments
@@ -414,14 +419,17 @@ again: @@ -429,14 +434,17 @@ again:
case IPPROTO_EIGRP: case IPPROTO_EIGRP:
eigrp_print(ndo, ipds->cp, ipds->len); eigrp_print(ndo, ipds->cp, ipds->len);
break; break;
@ -422,7 +425,7 @@
case IPPROTO_OSPF: case IPPROTO_OSPF:
ospf_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip); ospf_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
@@ -454,6 +462,7 @@ again: @@ -469,6 +477,7 @@ again:
gre_print(ndo, ipds->cp, ipds->len); gre_print(ndo, ipds->cp, ipds->len);
break; break;
@ -430,14 +433,14 @@
case IPPROTO_MOBILE: case IPPROTO_MOBILE:
mobile_print(ndo, ipds->cp, ipds->len); mobile_print(ndo, ipds->cp, ipds->len);
break; break;
@@ -482,6 +491,7 @@ again: @@ -497,6 +506,7 @@ again:
case IPPROTO_PGM: case IPPROTO_PGM:
pgm_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip); pgm_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
break; break;
+#endif +#endif
default: default:
if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL) if (ndo->ndo_nflag==0 && (p_name = netdb_protoname(ipds->nh)) != NULL)
--- a/print-llc.c --- a/print-llc.c
+++ b/print-llc.c +++ b/print-llc.c
@@ -206,6 +206,7 @@ llc_print(netdissect_options *ndo, const @@ -206,6 +206,7 @@ llc_print(netdissect_options *ndo, const
@ -472,21 +475,22 @@
#ifdef ENABLE_SMB #ifdef ENABLE_SMB
if (ssap == LLCSAP_NETBEUI && dsap == LLCSAP_NETBEUI if (ssap == LLCSAP_NETBEUI && dsap == LLCSAP_NETBEUI
@@ -322,11 +326,13 @@ llc_print(netdissect_options *ndo, const @@ -322,12 +326,13 @@ llc_print(netdissect_options *ndo, const
return (hdrlen); return (hdrlen);
} }
#endif #endif
+#ifndef TCPDUMP_MINI +#ifndef TCPDUMP_MINI
if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS
&& control == LLC_UI) { && control == LLC_UI) {
isoclns_print(ndo, p, length, caplen); isoclns_print(ndo, p, length);
return (hdrlen); return (hdrlen);
} }
-
+#endif +#endif
if (!ndo->ndo_eflag) { if (!ndo->ndo_eflag) {
if (ssap == dsap) { if (ssap == dsap) {
@@ -480,6 +486,7 @@ snap_print(netdissect_options *ndo, cons if (src == NULL || dst == NULL)
@@ -480,6 +485,7 @@ snap_print(netdissect_options *ndo, cons
case OUI_CISCO: case OUI_CISCO:
switch (et) { switch (et) {
@ -494,7 +498,7 @@
case PID_CISCO_CDP: case PID_CISCO_CDP:
cdp_print(ndo, p, length, caplen); cdp_print(ndo, p, length, caplen);
return (1); return (1);
@@ -492,6 +499,7 @@ snap_print(netdissect_options *ndo, cons @@ -492,6 +498,7 @@ snap_print(netdissect_options *ndo, cons
case PID_CISCO_VTP: case PID_CISCO_VTP:
vtp_print(ndo, p, length); vtp_print(ndo, p, length);
return (1); return (1);
@ -502,7 +506,7 @@
case PID_CISCO_PVST: case PID_CISCO_PVST:
case PID_CISCO_VLANBRIDGE: case PID_CISCO_VLANBRIDGE:
stp_print(ndo, p, length); stp_print(ndo, p, length);
@@ -504,6 +512,7 @@ snap_print(netdissect_options *ndo, cons @@ -504,6 +511,7 @@ snap_print(netdissect_options *ndo, cons
case OUI_RFC2684: case OUI_RFC2684:
switch (et) { switch (et) {
@ -510,7 +514,7 @@
case PID_RFC2684_ETH_FCS: case PID_RFC2684_ETH_FCS:
case PID_RFC2684_ETH_NOFCS: case PID_RFC2684_ETH_NOFCS:
/* /*
@@ -565,6 +574,7 @@ snap_print(netdissect_options *ndo, cons @@ -565,6 +573,7 @@ snap_print(netdissect_options *ndo, cons
*/ */
fddi_print(ndo, p, length, caplen); fddi_print(ndo, p, length, caplen);
return (1); return (1);
@ -526,7 +530,7 @@
+#ifndef TCPDUMP_MINI +#ifndef TCPDUMP_MINI
case BSD_AFNUM_ISO: case BSD_AFNUM_ISO:
isoclns_print(ndo, p, length, caplen); isoclns_print(ndo, p, length);
break; break;
@@ -127,6 +128,7 @@ null_if_print(netdissect_options *ndo, c @@ -127,6 +128,7 @@ null_if_print(netdissect_options *ndo, c
case BSD_AFNUM_IPX: case BSD_AFNUM_IPX:
@ -538,7 +542,7 @@
/* unknown AF_ value */ /* unknown AF_ value */
--- a/print-ppp.c --- a/print-ppp.c
+++ b/print-ppp.c +++ b/print-ppp.c
@@ -1358,6 +1358,7 @@ trunc: @@ -1367,6 +1367,7 @@ trunc:
return 0; return 0;
} }
@ -546,7 +550,7 @@
static void static void
ppp_hdlc(netdissect_options *ndo, ppp_hdlc(netdissect_options *ndo,
const u_char *p, int length) const u_char *p, int length)
@@ -1436,6 +1437,7 @@ trunc: @@ -1445,6 +1446,7 @@ trunc:
free(b); free(b);
ND_PRINT((ndo, "[|ppp]")); ND_PRINT((ndo, "[|ppp]"));
} }
@ -554,7 +558,7 @@
/* PPP */ /* PPP */
@@ -1443,10 +1445,12 @@ static void @@ -1452,10 +1454,12 @@ static void
handle_ppp(netdissect_options *ndo, handle_ppp(netdissect_options *ndo,
u_int proto, const u_char *p, int length) u_int proto, const u_char *p, int length)
{ {
@ -567,7 +571,7 @@
switch (proto) { switch (proto) {
case PPP_LCP: /* fall through */ case PPP_LCP: /* fall through */
@@ -1479,6 +1483,7 @@ handle_ppp(netdissect_options *ndo, @@ -1488,6 +1492,7 @@ handle_ppp(netdissect_options *ndo,
case PPP_IPV6: case PPP_IPV6:
ip6_print(ndo, p, length); ip6_print(ndo, p, length);
break; break;
@ -575,7 +579,7 @@
case ETHERTYPE_IPX: /*XXX*/ case ETHERTYPE_IPX: /*XXX*/
case PPP_IPX: case PPP_IPX:
ipx_print(ndo, p, length); ipx_print(ndo, p, length);
@@ -1490,6 +1495,7 @@ handle_ppp(netdissect_options *ndo, @@ -1499,6 +1504,7 @@ handle_ppp(netdissect_options *ndo,
case PPP_MPLS_MCAST: case PPP_MPLS_MCAST:
mpls_print(ndo, p, length); mpls_print(ndo, p, length);
break; break;
@ -583,7 +587,7 @@
case PPP_COMP: case PPP_COMP:
ND_PRINT((ndo, "compressed PPP data")); ND_PRINT((ndo, "compressed PPP data"));
break; break;
@@ -1630,6 +1636,7 @@ ppp_if_print(netdissect_options *ndo, @@ -1639,6 +1645,7 @@ ppp_if_print(netdissect_options *ndo,
return (0); return (0);
} }
@ -591,7 +595,7 @@
/* /*
* PPP I/F printer to use if we know that RFC 1662-style PPP in HDLC-like * PPP I/F printer to use if we know that RFC 1662-style PPP in HDLC-like
* framing, or Cisco PPP with HDLC framing as per section 4.3.1 of RFC 1547, * framing, or Cisco PPP with HDLC framing as per section 4.3.1 of RFC 1547,
@@ -1857,6 +1864,7 @@ printx: @@ -1866,6 +1873,7 @@ printx:
#endif /* __bsdi__ */ #endif /* __bsdi__ */
return (hdrlength); return (hdrlength);
} }