Hello community, here is the log from the commit of package tcpdump for openSUSE:Factory checked in at 2015-04-30 11:49:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tcpdump (Old) and /work/SRC/openSUSE:Factory/.tcpdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcpdump" Changes: -------- --- /work/SRC/openSUSE:Factory/tcpdump/tcpdump.changes 2015-04-22 01:14:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tcpdump.new/tcpdump.changes 2015-04-30 11:49:29.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Apr 26 18:51:40 UTC 2015 - astie...@suse.com + +- tcpdump 4.7.4: + * PPKI to Router Protocol: Fix Segmentation Faults and other problems + * RPKI to Router Protocol: print strings with fn_printn() + * wb: fix some bounds checks + (previously patched in, removed CVE-2015-3138.patch) + +------------------------------------------------------------------- Old: ---- CVE-2015-3138.patch tcpdump-4.7.3.tar.gz tcpdump-4.7.3.tar.gz.sig New: ---- tcpdump-4.7.4.tar.gz tcpdump-4.7.4.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tcpdump.spec ++++++ --- /var/tmp/diff_new_pack.weaWI1/_old 2015-04-30 11:49:30.000000000 +0200 +++ /var/tmp/diff_new_pack.weaWI1/_new 2015-04-30 11:49:30.000000000 +0200 @@ -20,7 +20,7 @@ # for pcap_set_tstamp_precision() %define min_libpcap_version 1.7.2 Name: tcpdump -Version: 4.7.3 +Version: 4.7.4 Release: 0 Summary: A Packet Sniffer License: BSD-3-Clause @@ -30,7 +30,6 @@ Source1: tcpdump-qeth Source2: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz.sig Source3: http://www.tcpdump.org/tcpdump-workers.asc#/%{name}.keyring -Patch0: CVE-2015-3138.patch BuildRequires: libpcap-devel >= %{min_libpcap_version} BuildRequires: libsmi-devel BuildRequires: openssl-devel @@ -43,7 +42,6 @@ %prep %setup -q -%patch0 -p1 %build export CFLAGS="%{optflags} -Wall -DGUESS_TSO -fstack-protector -fno-strict-aliasing" ++++++ tcpdump-4.7.3.tar.gz -> tcpdump-4.7.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/CHANGES new/tcpdump-4.7.4/CHANGES --- old/tcpdump-4.7.3/CHANGES 2015-03-11 01:47:37.000000000 +0100 +++ new/tcpdump-4.7.4/CHANGES 2015-04-22 22:33:01.000000000 +0200 @@ -1,8 +1,14 @@ -Monday March. 11, 2015 g...@alum.mit.edu +Friday April 10, 2015 g...@alum.mit.edu + Summary for 4.7.4 tcpdump release + RPKI to Router Protocol: Fix Segmentation Faults and other problems + RPKI to Router Protocol: print strings with fn_printn() + wb: fix some bounds checks + +Wednesday March 11, 2015 m...@sandelman.ca Summary for 4.7.3 tcpdump release Capsicum fixes for FreeBSD 10 -Monday March. 10, 2015 g...@alum.mit.edu +Tuesday March 10, 2015 m...@sandelman.ca Summary for 4.7.2 tcpdump release DCCP: update Packet Types with RFC4340/IANA names fixes for CVE-2015-0261: IPv6 mobility header check issue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/VERSION new/tcpdump-4.7.4/VERSION --- old/tcpdump-4.7.3/VERSION 2015-03-11 01:44:05.000000000 +0100 +++ new/tcpdump-4.7.4/VERSION 2015-04-22 22:32:26.000000000 +0200 @@ -1 +1 @@ -4.7.3 +4.7.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/netdissect.h new/tcpdump-4.7.4/netdissect.h --- old/tcpdump-4.7.3/netdissect.h 2015-03-11 01:40:50.000000000 +0100 +++ new/tcpdump-4.7.4/netdissect.h 2015-04-22 22:32:16.000000000 +0200 @@ -81,9 +81,9 @@ char *buf, size_t bufsize); /* tok2str is deprecated */ -extern const char *tok2str(const struct tok *, const char *, int); -extern char *bittok2str(const struct tok *, const char *, int); -extern char *bittok2str_nosep(const struct tok *, const char *, int); +extern const char *tok2str(const struct tok *, const char *, u_int); +extern char *bittok2str(const struct tok *, const char *, u_int); +extern char *bittok2str_nosep(const struct tok *, const char *, u_int); typedef struct netdissect_options netdissect_options; @@ -293,7 +293,6 @@ extern int fn_print(netdissect_options *, const u_char *, const u_char *); extern int fn_printn(netdissect_options *, const u_char *, u_int, const u_char *); extern int fn_printzp(netdissect_options *, const u_char *, u_int, const u_char *); -extern const char *tok2str(const struct tok *, const char *, int); /* * Flags for txtproto_print(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/print-isoclns.c new/tcpdump-4.7.4/print-isoclns.c --- old/tcpdump-4.7.3/print-isoclns.c 2015-03-11 01:36:52.000000000 +0100 +++ new/tcpdump-4.7.4/print-isoclns.c 2015-04-22 22:32:16.000000000 +0200 @@ -3093,14 +3093,18 @@ ND_PRINT((ndo, "(unverified)")); } else { unsigned char *truncated = "trunc"; - //printf("\nosi_print_cksum: %p %u %u %u\n", pptr, checksum_offset, length, ndo->ndo_snaplen); - //ND_TCHECK2(pptr, checksum_offset+length); +#if 0 + printf("\nosi_print_cksum: %p %u %u %u\n", pptr, checksum_offset, length, ndo->ndo_snaplen); + ND_TCHECK2(pptr, checksum_offset+length); +#endif calculated_checksum = create_osi_cksum(pptr, checksum_offset, length); if (checksum == calculated_checksum) { ND_PRINT((ndo, " (correct)")); } else { truncated = "incorrect"; - //trunc: +#if 0 + trunc: +#endif ND_PRINT((ndo, " (%s should be 0x%04x)", truncated, calculated_checksum)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/print-rpki-rtr.c new/tcpdump-4.7.4/print-rpki-rtr.c --- old/tcpdump-4.7.3/print-rpki-rtr.c 2015-03-09 20:07:01.000000000 +0100 +++ new/tcpdump-4.7.4/print-rpki-rtr.c 2015-04-22 22:32:16.000000000 +0200 @@ -178,7 +178,7 @@ pdu_header = (rpki_rtr_pdu *)tptr; pdu_type = pdu_header->pdu_type; pdu_len = EXTRACT_32BITS(pdu_header->length); - ND_TCHECK2(tptr, pdu_len); + ND_TCHECK2(*tptr, pdu_len); hexdump = FALSE; ND_PRINT((ndo, "%sRPKI-RTRv%u, %s PDU (%u), length: %u", @@ -251,10 +251,10 @@ { rpki_rtr_pdu_error_report *pdu; u_int encapsulated_pdu_length, text_length, tlen, error_code; - u_char buf[80]; pdu = (rpki_rtr_pdu_error_report *)tptr; encapsulated_pdu_length = EXTRACT_32BITS(pdu->encapsulated_pdu_length); + ND_TCHECK2(*tptr, encapsulated_pdu_length); tlen = pdu_len; error_code = EXTRACT_16BITS(pdu->pdu_header.u.error_code); @@ -287,11 +287,10 @@ tptr += 4; tlen -= 4; } - printf("text_length: %u tlen %u\n", text_length, tlen); + ND_TCHECK2(*tptr, text_length); if (text_length && (text_length <= tlen )) { - memcpy(buf, tptr, min(sizeof(buf)-1, text_length)); - buf[text_length] = '\0'; - ND_PRINT((ndo, "%sError text: %s", indent_string(indent+2), buf)); + ND_PRINT((ndo, "%sError text: ", indent_string(indent+2))); + fn_printn(ndo, tptr, text_length, ndo->ndo_snapend); } } break; @@ -337,13 +336,13 @@ pdu_header = (rpki_rtr_pdu *)tptr; pdu_type = pdu_header->pdu_type; pdu_len = EXTRACT_32BITS(pdu_header->length); + ND_TCHECK2(*tptr, pdu_len); /* infinite loop check */ if (!pdu_type || !pdu_len) { break; } - ND_TCHECK2(*tptr, pdu_len); if (tlen < pdu_len) { goto trunc; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/print-wb.c new/tcpdump-4.7.4/print-wb.c --- old/tcpdump-4.7.3/print-wb.c 2014-11-13 12:02:47.000000000 +0100 +++ new/tcpdump-4.7.4/print-wb.c 2015-04-22 22:32:16.000000000 +0200 @@ -202,7 +202,7 @@ len -= sizeof(*io) * nid; io = (struct id_off *)(id + 1); cp = (char *)(io + nid); - if (!ND_TTEST2(cp, len)) { + if (ND_TTEST2(cp, len)) { ND_PRINT((ndo, "\"")); fn_print(ndo, (u_char *)cp, (u_char *)cp + len); ND_PRINT((ndo, "\"")); @@ -267,7 +267,7 @@ } n = EXTRACT_32BITS(&prep->pp_n); ps = (const struct pgstate *)(prep + 1); - while (--n >= 0 && !ND_TTEST(*ps)) { + while (--n >= 0 && ND_TTEST(*ps)) { const struct id_off *io, *ie; char c = '<'; @@ -276,7 +276,7 @@ ipaddr_string(ndo, &ps->page.p_sid), EXTRACT_32BITS(&ps->page.p_uid))); io = (struct id_off *)(ps + 1); - for (ie = io + ps->nid; io < ie && !ND_TTEST(*io); ++io) { + for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) { ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id), EXTRACT_32BITS(&io->off))); c = ','; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/tcpdump.c new/tcpdump-4.7.4/tcpdump.c --- old/tcpdump-4.7.3/tcpdump.c 2015-03-11 01:44:53.000000000 +0100 +++ new/tcpdump-4.7.4/tcpdump.c 2015-04-22 22:32:16.000000000 +0200 @@ -2220,9 +2220,6 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) { struct dump_info *dump_info; -#ifdef HAVE_CAPSICUM - cap_rights_t rights; -#endif ++packets_captured; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/tests/kday2.out new/tcpdump-4.7.4/tests/kday2.out --- old/tcpdump-4.7.3/tests/kday2.out 2015-03-09 20:07:01.000000000 +0100 +++ new/tcpdump-4.7.4/tests/kday2.out 2015-04-22 22:32:16.000000000 +0200 @@ -22,6 +22,13 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!) 204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x7767), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x8900), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x8900), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347 + RPKI-RTRv177, Unknown PDU (100), length: 60 + 0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 21 + Error code: Unknown (66), Encapsulated PDU length: 37|trunc [|RPKI-RTR] EXIT CODE 00000100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/tests/kday3.out new/tcpdump-4.7.4/tests/kday3.out --- old/tcpdump-4.7.3/tests/kday3.out 2015-03-09 20:07:01.000000000 +0100 +++ new/tcpdump-4.7.4/tests/kday3.out 2015-04-22 22:32:16.000000000 +0200 @@ -7,7 +7,17 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!) 204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x7767), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x0cf1), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2381534627 ecr 3084508609], length 347|trunc|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x0cf1), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2381534627 ecr 3084508609], length 347 + RPKI-RTRv177, Unknown PDU (100), length: 60 + 0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 66|trunc + RPKI-RTRv115, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 12 + -----encapsulated PDU-----|trunc|trunc + [|RPKI-RTR] IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52) 204.9.51.132.50079 > 204.9.54.80.22: Flags [.], cksum 0x8611 (incorrect -> 0xa678), ack 0, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 0 IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 4504 (->451a)!) @@ -15,6 +25,17 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!) 204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 1, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xa6b3), seq 0:347, ack 1, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xa6b3), seq 0:347, ack 1, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347 + RPKI-RTRv177, Unknown PDU (100), length: 60 + 0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 37 + -----encapsulated PDU-----|trunc|trunc + RPKI-RTRv9, Unknown PDU (51), length: 32 + 0x0000: 0933 84cc 0000 0020 9f00 1649 d1c8 546c + 0x0010: ff13 1980 100f fc85 8b00 0055 0000 0101 [|RPKI-RTR] EXIT CODE 00000100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/tests/kday4.out new/tcpdump-4.7.4/tests/kday4.out --- old/tcpdump-4.7.3/tests/kday4.out 2015-03-09 20:07:01.000000000 +0100 +++ new/tcpdump-4.7.4/tests/kday4.out 2015-04-22 22:32:16.000000000 +0200 @@ -6,7 +6,18 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52) 204.9.54.80.55936 > 204.9.55.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x725a), ack 3589495407, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xcd5f), seq 3589495407:3589495754, ack 370436242, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xcd5f), seq 3589495407:3589495754, ack 370436242, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347 + RPKI-RTRv177, Unknown PDU (100), length: 60 + 0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 58f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 37 + -----encapsulated PDU-----|trunc|trunc + RPKI-RTRv115, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 12 + -----encapsulated PDU-----|trunc|trunc [|RPKI-RTR] IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52) 204.9.51.132.50079 > 204.9.54.80.22: Flags [.], cksum 0x8611 (incorrect -> 0xa678), ack 1819218606, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 0 @@ -15,7 +26,19 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!) 204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xfa70), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xfa70), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347 + RPKI-RTRv197, Unknown PDU (100), length: 60 + 0x0000: c564 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 37 + -----encapsulated PDU-----|trunc|trunc + RPKI-RTRv115, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 12 + -----encapsulated PDU-----|trunc|trunc + [|RPKI-RTR] IP truncated-ip - 768 bytes missing! (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 820, bad cksum 3da6 (->3aa6)!) 204.9.51.132.50079 > 204.9.54.80.22: Flags [.], seq 0:768, ack 1, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 768 IP (tos 0x6,ECT(0), ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 4504 (->4524)!) @@ -23,6 +46,15 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!) 204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 1, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x3f28), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x3f28), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347 + RPKI-RTRv177, Unknown PDU (100), length: 60 + 0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 100 + Error text: ^@^@^@M-^?M-^?^_^[pM-xWM-nhMM-}M_M-YM-=M-G^I0M-,M-^AvM-3mM-L^Q:M-?^RM-^QM-q^FNM-^aM-tbM-^WM-/M-D9M-$^MM-9zM-%hs3M-hA^J^@B^@^@^@B^@^@^@%M-Dz^HM-i^RM-^DM-5M-^\M->0H^H^@E^P^@4M-}&@^@>^F + RPKI-RTRv115, Error Report PDU (10), length: 66|trunc [|RPKI-RTR] EXIT CODE 00000100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/tests/kday5.out new/tcpdump-4.7.4/tests/kday5.out --- old/tcpdump-4.7.3/tests/kday5.out 2015-03-09 20:07:01.000000000 +0100 +++ new/tcpdump-4.7.4/tests/kday5.out 2015-04-22 22:32:16.000000000 +0200 @@ -22,6 +22,14 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!) 204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x7767), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x183a), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2351322531 ecr 3084508609], length 347|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x183a), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2351322531 ecr 3084508609], length 347 + RPKI-RTRv177, Unknown PDU (100), length: 60 + 0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 80 + Error text: M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-CM-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9M-9^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^V^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J^J [|RPKI-RTR] EXIT CODE 00000100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/tests/kday7.out new/tcpdump-4.7.4/tests/kday7.out --- old/tcpdump-4.7.3/tests/kday7.out 2015-03-09 20:07:01.000000000 +0100 +++ new/tcpdump-4.7.4/tests/kday7.out 2015-04-22 22:32:16.000000000 +0200 @@ -6,7 +6,18 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52) 204.9.54.80.55936 > 204.9.55.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x725a), ack 3589495407, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xcd5f), seq 3589495407:3589495754, ack 370436242, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xcd5f), seq 3589495407:3589495754, ack 370436242, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347 + RPKI-RTRv177, Unknown PDU (100), length: 60 + 0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 58f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 37 + -----encapsulated PDU-----|trunc|trunc + RPKI-RTRv115, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 12 + -----encapsulated PDU-----|trunc|trunc [|RPKI-RTR] IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52) 204.9.51.132.50079 > 204.9.54.80.22: Flags [.], cksum 0x8611 (incorrect -> 0xa678), ack 1819218606, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 0 @@ -15,7 +26,19 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!) 204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xfa86), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xfa86), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347 + RPKI-RTRv197, Unknown PDU (100), length: 60 + 0x0000: c564 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 37 + -----encapsulated PDU-----|trunc|trunc + RPKI-RTRv115, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 12 + -----encapsulated PDU-----|trunc|trunc + [|RPKI-RTR] IP truncated-ip - 768 bytes missing! (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 820, bad cksum 3da6 (->3aa6)!) 204.9.51.132.50079 > 204.9.54.80.22: Flags [.], seq 0:768, ack 1, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 768 IP (tos 0x6,ECT(0), ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 4504 (->4524)!) @@ -23,6 +46,14 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!) 204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 1, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x4ba9), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x4ba9), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347 + RPKI-RTRv177, Unknown PDU (100), length: 60 + 0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 100|trunc + RPKI-RTRv115, Error Report PDU (10), length: 66|trunc [|RPKI-RTR] EXIT CODE 00000100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/tests/kday8.out new/tcpdump-4.7.4/tests/kday8.out --- old/tcpdump-4.7.3/tests/kday8.out 2015-03-09 20:07:01.000000000 +0100 +++ new/tcpdump-4.7.4/tests/kday8.out 2015-04-22 22:32:16.000000000 +0200 @@ -22,6 +22,13 @@ IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!) 204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x7767), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0 IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!) - 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xed9b), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc + 204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xed9b), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347 + RPKI-RTRv177, Unknown PDU (100), length: 60 + 0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70 + 0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176 + 0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297 + 0x0030: afc4 39a4 0db9 7aa5 6873 33e8 + RPKI-RTRv65, Error Report PDU (10), length: 66 + Error code: Unknown (66), Encapsulated PDU length: 80|trunc [|RPKI-RTR] EXIT CODE 00000100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcpdump-4.7.3/util.c new/tcpdump-4.7.4/util.c --- old/tcpdump-4.7.3/util.c 2014-11-13 12:02:47.000000000 +0100 +++ new/tcpdump-4.7.4/util.c 2015-04-22 22:32:16.000000000 +0200 @@ -337,7 +337,7 @@ */ const char * tok2str(register const struct tok *lp, register const char *fmt, - register int v) + register u_int v) { static char buf[4][128]; static int idx = 0; @@ -355,12 +355,12 @@ */ static char * bittok2str_internal(register const struct tok *lp, register const char *fmt, - register int v, register int sep) + register u_int v, const char *sep) { static char buf[256]; /* our stringbuffer */ int buflen=0; - register int rotbit; /* this is the bit we rotate through all bitpositions */ - register int tokval; + register u_int rotbit; /* this is the bit we rotate through all bitpositions */ + register u_int tokval; const char * sepstr = ""; while (lp != NULL && lp->s != NULL) { @@ -375,7 +375,7 @@ /* ok we have found something */ buflen+=snprintf(buf+buflen, sizeof(buf)-buflen, "%s%s", sepstr, lp->s); - sepstr = sep ? ", " : ""; + sepstr = sep; break; } rotbit=rotbit<<1; /* no match - lets shift and try again */ @@ -385,7 +385,7 @@ if (buflen == 0) /* bummer - lets print the "unknown" message as advised in the fmt string if we got one */ - (void)snprintf(buf, sizeof(buf), fmt == NULL ? "#%d" : fmt, v); + (void)snprintf(buf, sizeof(buf), fmt == NULL ? "#%08x" : fmt, v); return (buf); } @@ -395,9 +395,9 @@ */ char * bittok2str_nosep(register const struct tok *lp, register const char *fmt, - register int v) + register u_int v) { - return (bittok2str_internal(lp, fmt, v, 0)); + return (bittok2str_internal(lp, fmt, v, "")); } /* @@ -406,9 +406,9 @@ */ char * bittok2str(register const struct tok *lp, register const char *fmt, - register int v) + register u_int v) { - return (bittok2str_internal(lp, fmt, v, 1)); + return (bittok2str_internal(lp, fmt, v, ", ")); } /*
