Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/tcpdump merge conflicts
details: https://anonhg.NetBSD.org/src/rev/4cacca68328d
branches: trunk
changeset: 333865:4cacca68328d
user: christos <christos%NetBSD.org@localhost>
date: Thu Nov 20 03:05:03 2014 +0000
description:
merge conflicts
diffstat:
external/bsd/tcpdump/bin/Makefile | 7 +-
external/bsd/tcpdump/dist/addrtoname.c | 73 +-
external/bsd/tcpdump/dist/af.c | 8 +-
external/bsd/tcpdump/dist/ah.h | 18 +-
external/bsd/tcpdump/dist/aodv.h | 190 --
external/bsd/tcpdump/dist/arcnet.h | 101 -
external/bsd/tcpdump/dist/bgp.h | 17 -
external/bsd/tcpdump/dist/bpf_dump.c | 9 +-
external/bsd/tcpdump/dist/checksum.c | 40 +-
external/bsd/tcpdump/dist/configure | 502 +++--
external/bsd/tcpdump/dist/configure.in | 215 +-
external/bsd/tcpdump/dist/cpack.c | 33 +-
external/bsd/tcpdump/dist/cpack.h | 26 +-
external/bsd/tcpdump/dist/dccp.h | 139 -
external/bsd/tcpdump/dist/decnet.h | 461 -----
external/bsd/tcpdump/dist/decode_prefix.h | 41 -
external/bsd/tcpdump/dist/enc.h | 47 -
external/bsd/tcpdump/dist/esp.h | 68 -
external/bsd/tcpdump/dist/ether.h | 7 +-
external/bsd/tcpdump/dist/extract.h | 208 +-
external/bsd/tcpdump/dist/fddi.h | 76 -
external/bsd/tcpdump/dist/gmpls.c | 28 +-
external/bsd/tcpdump/dist/gmt2local.c | 8 +-
external/bsd/tcpdump/dist/icmp6.h | 469 ------
external/bsd/tcpdump/dist/ieee802_11.h | 347 ----
external/bsd/tcpdump/dist/ieee802_11_radio.h | 294 ---
external/bsd/tcpdump/dist/igrp.h | 33 -
external/bsd/tcpdump/dist/interface.h | 273 +---
external/bsd/tcpdump/dist/ip.h | 36 +-
external/bsd/tcpdump/dist/ip6.h | 73 +-
external/bsd/tcpdump/dist/ipfc.h | 29 -
external/bsd/tcpdump/dist/ipnet.h | 13 -
external/bsd/tcpdump/dist/ipproto.c | 8 +-
external/bsd/tcpdump/dist/ipproto.h | 2 -
external/bsd/tcpdump/dist/ipsec_doi.h | 151 -
external/bsd/tcpdump/dist/ipx.h | 31 -
external/bsd/tcpdump/dist/isakmp.h | 501 ------
external/bsd/tcpdump/dist/l2tp.h | 62 -
external/bsd/tcpdump/dist/l2vpn.c | 30 +-
external/bsd/tcpdump/dist/lane.h | 41 -
external/bsd/tcpdump/dist/machdep.c | 7 +-
external/bsd/tcpdump/dist/missing/sockstorage.h | 38 -
external/bsd/tcpdump/dist/mptcp.h | 151 -
external/bsd/tcpdump/dist/nameser.h | 35 +-
external/bsd/tcpdump/dist/netbios.h | 16 -
external/bsd/tcpdump/dist/netdissect.h | 4 +
external/bsd/tcpdump/dist/nflog.h | 42 -
external/bsd/tcpdump/dist/nfs.h | 111 +-
external/bsd/tcpdump/dist/nlpid.c | 8 +-
external/bsd/tcpdump/dist/ntp.h | 127 -
external/bsd/tcpdump/dist/oakley.h | 126 -
external/bsd/tcpdump/dist/ospf6.h | 265 ---
external/bsd/tcpdump/dist/oui.c | 8 +-
external/bsd/tcpdump/dist/parsenfsfh.c | 32 +-
external/bsd/tcpdump/dist/pcap_dump_ftell.c | 7 +-
external/bsd/tcpdump/dist/pmap_prot.h | 89 -
external/bsd/tcpdump/dist/ppi.h | 9 -
external/bsd/tcpdump/dist/print-802_11.c | 1541 +++++++++++++-----
external/bsd/tcpdump/dist/print-ah.c | 33 +-
external/bsd/tcpdump/dist/print-ahcp.c | 5 +
external/bsd/tcpdump/dist/print-aodv.c | 425 +++-
external/bsd/tcpdump/dist/print-aoe.c | 5 +
external/bsd/tcpdump/dist/print-ap1394.c | 51 +-
external/bsd/tcpdump/dist/print-arcnet.c | 158 +-
external/bsd/tcpdump/dist/print-arp.c | 79 +-
external/bsd/tcpdump/dist/print-ascii.c | 85 +-
external/bsd/tcpdump/dist/print-atalk.c | 301 +-
external/bsd/tcpdump/dist/print-atm.c | 163 +-
external/bsd/tcpdump/dist/print-beep.c | 34 +-
external/bsd/tcpdump/dist/print-bfd.c | 125 +-
external/bsd/tcpdump/dist/print-bgp.c | 1099 +++++++------
external/bsd/tcpdump/dist/print-bootp.c | 338 ++--
external/bsd/tcpdump/dist/print-bt.c | 29 +-
external/bsd/tcpdump/dist/print-cdp.c | 170 +-
external/bsd/tcpdump/dist/print-cfm.c | 231 +-
external/bsd/tcpdump/dist/print-chdlc.c | 97 +-
external/bsd/tcpdump/dist/print-cip.c | 43 +-
external/bsd/tcpdump/dist/print-cnfp.c | 99 +-
external/bsd/tcpdump/dist/print-dccp.c | 646 +++++---
external/bsd/tcpdump/dist/print-decnet.c | 845 ++++++++--
external/bsd/tcpdump/dist/print-dhcp6.c | 611 +++----
external/bsd/tcpdump/dist/print-domain.c | 375 ++--
external/bsd/tcpdump/dist/print-dvmrp.c | 201 +-
external/bsd/tcpdump/dist/print-eap.c | 91 +-
external/bsd/tcpdump/dist/print-egp.c | 176 +-
external/bsd/tcpdump/dist/print-eigrp.c | 292 +-
external/bsd/tcpdump/dist/print-enc.c | 77 +-
external/bsd/tcpdump/dist/print-esp.c | 175 +-
external/bsd/tcpdump/dist/print-ether.c | 93 +-
external/bsd/tcpdump/dist/print-fddi.c | 156 +-
external/bsd/tcpdump/dist/print-forces.c | 858 +++++-----
external/bsd/tcpdump/dist/print-fr.c | 303 ++-
external/bsd/tcpdump/dist/print-frag6.c | 33 +-
external/bsd/tcpdump/dist/print-gre.c | 199 +-
external/bsd/tcpdump/dist/print-hsrp.c | 82 +-
external/bsd/tcpdump/dist/print-icmp.c | 209 +-
external/bsd/tcpdump/dist/print-icmp6.c | 1503 +++++++++++++-----
external/bsd/tcpdump/dist/print-igmp.c | 228 +-
external/bsd/tcpdump/dist/print-igrp.c | 92 +-
external/bsd/tcpdump/dist/print-ip.c | 289 +-
external/bsd/tcpdump/dist/print-ip6.c | 92 +-
external/bsd/tcpdump/dist/print-ip6opts.c | 216 +--
external/bsd/tcpdump/dist/print-ipcomp.c | 30 +-
external/bsd/tcpdump/dist/print-ipfc.c | 54 +-
external/bsd/tcpdump/dist/print-ipx.c | 153 +-
external/bsd/tcpdump/dist/print-isakmp.c | 1144 ++++++++++----
external/bsd/tcpdump/dist/print-isoclns.c | 1556 +++++++++----------
external/bsd/tcpdump/dist/print-juniper.c | 473 +++--
external/bsd/tcpdump/dist/print-krb.c | 116 +-
external/bsd/tcpdump/dist/print-l2tp.c | 339 ++-
external/bsd/tcpdump/dist/print-lane.c | 43 +-
external/bsd/tcpdump/dist/print-ldp.c | 226 +-
external/bsd/tcpdump/dist/print-llc.c | 162 +-
external/bsd/tcpdump/dist/print-lldp.c | 592 +++---
external/bsd/tcpdump/dist/print-lmp.c | 427 ++--
external/bsd/tcpdump/dist/print-loopback.c | 5 +
external/bsd/tcpdump/dist/print-lspping.c | 367 ++--
external/bsd/tcpdump/dist/print-lwapp.c | 109 +-
external/bsd/tcpdump/dist/print-lwres.c | 223 +-
external/bsd/tcpdump/dist/print-m3ua.c | 5 +
external/bsd/tcpdump/dist/print-mobile.c | 56 +-
external/bsd/tcpdump/dist/print-mobility.c | 188 +-
external/bsd/tcpdump/dist/print-mpcp.c | 140 +-
external/bsd/tcpdump/dist/print-mpls.c | 60 +-
external/bsd/tcpdump/dist/print-msdp.c | 56 +-
external/bsd/tcpdump/dist/print-netbios.c | 96 -
external/bsd/tcpdump/dist/print-nfs.c | 1236 ++++++--------
external/bsd/tcpdump/dist/print-ntp.c | 301 ++-
external/bsd/tcpdump/dist/print-null.c | 56 +-
external/bsd/tcpdump/dist/print-ospf.c | 646 ++++----
external/bsd/tcpdump/dist/print-ospf6.c | 799 +++++++--
external/bsd/tcpdump/dist/print-pflog.c | 67 +-
external/bsd/tcpdump/dist/print-pfsync.c | 17 +-
external/bsd/tcpdump/dist/print-pgm.c | 453 ++--
external/bsd/tcpdump/dist/print-pim.c | 652 ++++----
external/bsd/tcpdump/dist/print-pktap.c | 5 +
external/bsd/tcpdump/dist/print-ppp.c | 946 ++++++-----
external/bsd/tcpdump/dist/print-pppoe.c | 69 +-
external/bsd/tcpdump/dist/print-pptp.c | 1133 ++++++-------
external/bsd/tcpdump/dist/print-radius.c | 275 +-
external/bsd/tcpdump/dist/print-raw.c | 21 +-
external/bsd/tcpdump/dist/print-rip.c | 144 +-
external/bsd/tcpdump/dist/print-ripng.c | 110 +-
external/bsd/tcpdump/dist/print-rrcp.c | 29 +-
external/bsd/tcpdump/dist/print-rsvp.c | 621 +++----
external/bsd/tcpdump/dist/print-rt6.c | 46 +-
external/bsd/tcpdump/dist/print-rx.c | 1084 +++++++------
external/bsd/tcpdump/dist/print-sctp.c | 680 ++++++--
external/bsd/tcpdump/dist/print-sflow.c | 480 +++---
external/bsd/tcpdump/dist/print-sip.c | 32 +-
external/bsd/tcpdump/dist/print-sl.c | 119 +-
external/bsd/tcpdump/dist/print-sll.c | 176 +-
external/bsd/tcpdump/dist/print-slow.c | 277 +-
external/bsd/tcpdump/dist/print-smb.c | 577 +++---
external/bsd/tcpdump/dist/print-snmp.c | 671 ++++----
external/bsd/tcpdump/dist/print-stp.c | 174 +-
external/bsd/tcpdump/dist/print-sunatm.c | 30 +-
external/bsd/tcpdump/dist/print-sunrpc.c | 141 +-
external/bsd/tcpdump/dist/print-symantec.c | 69 +-
external/bsd/tcpdump/dist/print-syslog.c | 52 +-
external/bsd/tcpdump/dist/print-tcp.c | 328 ++--
external/bsd/tcpdump/dist/print-telnet.c | 356 ++++-
external/bsd/tcpdump/dist/print-tftp.c | 100 +-
external/bsd/tcpdump/dist/print-timed.c | 142 +-
external/bsd/tcpdump/dist/print-token.c | 143 +-
external/bsd/tcpdump/dist/print-udp.c | 412 ++--
external/bsd/tcpdump/dist/print-vjc.c | 51 +-
external/bsd/tcpdump/dist/print-vqp.c | 73 +-
external/bsd/tcpdump/dist/print-vrrp.c | 111 +-
external/bsd/tcpdump/dist/print-wb.c | 218 +-
external/bsd/tcpdump/dist/print-zephyr.c | 85 +-
external/bsd/tcpdump/dist/route6d.h | 77 -
external/bsd/tcpdump/dist/rx.h | 113 -
external/bsd/tcpdump/dist/sctpConstants.h | 571 -------
external/bsd/tcpdump/dist/sctpHeader.h | 323 ----
external/bsd/tcpdump/dist/setsignal.c | 7 +-
external/bsd/tcpdump/dist/signature.c | 31 +-
external/bsd/tcpdump/dist/slip.h | 34 -
external/bsd/tcpdump/dist/sll.h | 123 -
external/bsd/tcpdump/dist/smbutil.c | 285 +-
external/bsd/tcpdump/dist/strcasecmp.c | 11 +-
external/bsd/tcpdump/dist/tcp.h | 26 +-
external/bsd/tcpdump/dist/tcpdump.1.in | 201 ++-
external/bsd/tcpdump/dist/tcpdump.c | 777 +++++++--
external/bsd/tcpdump/dist/telnet.h | 344 ----
external/bsd/tcpdump/dist/tests/dio.out | 1 -
external/bsd/tcpdump/dist/tests/dio.pcap | Bin
external/bsd/tcpdump/dist/tftp.h | 82 -
external/bsd/tcpdump/dist/timed.h | 93 -
external/bsd/tcpdump/dist/token.h | 52 -
external/bsd/tcpdump/dist/udp.h | 10 +-
external/bsd/tcpdump/dist/util.c | 211 +-
external/bsd/tcpdump/dist/vfprintf.c | 7 +-
external/bsd/tcpdump/dist/win32/Include/bittypes.h | 89 -
external/bsd/tcpdump/dist/win32/Include/errno.h | 132 -
external/bsd/tcpdump/dist/win32/Include/getopt.h | 138 -
external/bsd/tcpdump/dist/win32/Src/getopt.c | 117 -
external/bsd/tcpdump/include/config.h | 60 +-
198 files changed, 20606 insertions(+), 22879 deletions(-)
diffs (truncated from 79125 to 300 lines):
diff -r 1cd9000112ec -r 4cacca68328d external/bsd/tcpdump/bin/Makefile
--- a/external/bsd/tcpdump/bin/Makefile Thu Nov 20 02:00:19 2014 +0000
+++ b/external/bsd/tcpdump/bin/Makefile Thu Nov 20 03:05:03 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/12/31 17:33:11 christos Exp $
+# $NetBSD: Makefile,v 1.11 2014/11/20 03:05:03 christos Exp $
WARNS?= 1 # XXX: need to cleanup later
@@ -26,7 +26,9 @@
print-802_11.c \
print-802_15_4.c \
print-ah.c \
+print-ahcp.c \
print-aodv.c \
+print-aoe.c \
print-ap1394.c \
print-arcnet.c \
print-arp.c \
@@ -82,9 +84,11 @@
print-llc.c \
print-lldp.c \
print-lmp.c \
+print-loopback.c \
print-lspping.c \
print-lwapp.c \
print-lwres.c \
+print-m3ua.c \
print-mobile.c \
print-mobility.c \
print-mpcp.c \
@@ -105,6 +109,7 @@
print-pfsync.c \
print-pgm.c \
print-pim.c \
+print-pktap.c \
print-ppi.c \
print-ppp.c \
print-pppoe.c \
diff -r 1cd9000112ec -r 4cacca68328d external/bsd/tcpdump/dist/addrtoname.c
--- a/external/bsd/tcpdump/dist/addrtoname.c Thu Nov 20 02:00:19 2014 +0000
+++ b/external/bsd/tcpdump/dist/addrtoname.c Thu Nov 20 03:05:03 2014 +0000
@@ -23,13 +23,10 @@
*/
#include <sys/cdefs.h>
#ifndef lint
-#if 0
-static const char rcsid[] _U_ =
- "@(#) Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.119 2007-08-08 14:06:34 hannes Exp (LBL)";
-#endif
-__RCSID("$NetBSD: addrtoname.c,v 1.5 2013/12/31 17:33:30 christos Exp $");
+__RCSID("$NetBSD: addrtoname.c,v 1.6 2014/11/20 03:05:03 christos Exp $");
#endif
+#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -85,7 +82,7 @@
#define HASHNAMESIZE 4096
struct hnamemem {
- u_int32_t addr;
+ uint32_t addr;
const char *name;
struct hnamemem *nxt;
};
@@ -162,7 +159,7 @@
static struct enamemem bytestringtable[HASHNAMESIZE];
struct protoidmem {
- u_int32_t p_oui;
+ uint32_t p_oui;
u_short p_proto;
const char *p_name;
struct protoidmem *p_nxt;
@@ -174,7 +171,7 @@
* A faster replacement for inet_ntoa().
*/
const char *
-intoa(u_int32_t addr)
+intoa(uint32_t addr)
{
register char *cp;
register u_int byte;
@@ -203,8 +200,8 @@
return cp + 1;
}
-static u_int32_t f_netmask;
-static u_int32_t f_localnet;
+static uint32_t f_netmask;
+static uint32_t f_localnet;
/*
* Return a name for the IP address pointed to by ap. This address
@@ -226,10 +223,10 @@
* also needs to check whether they're present in the packet buffer.
*/
const char *
-getname(const u_char *ap)
+getname(netdissect_options *ndo, const u_char *ap)
{
register struct hostent *hp;
- u_int32_t addr;
+ uint32_t addr;
static struct hnamemem *p; /* static for longjmp() */
memcpy(&addr, ap, sizeof(addr));
@@ -248,14 +245,14 @@
* given, f_netmask and f_localnet are 0 and the test
* evaluates to true)
*/
- if (!nflag &&
+ if (!ndo->ndo_nflag &&
(addr & f_netmask) == f_localnet) {
hp = gethostbyaddr((char *)&addr, 4, AF_INET);
if (hp) {
char *dotp;
p->name = strdup(hp->h_name);
- if (Nflag) {
+ if (ndo->ndo_Nflag) {
/* Remove domain qualifications */
dotp = strchr(p->name, '.');
if (dotp)
@@ -274,14 +271,14 @@
* is assumed to be in network byte order.
*/
const char *
-getname6(const u_char *ap)
+getname6(netdissect_options *ndo, const u_char *ap)
{
register struct hostent *hp;
union {
struct in6_addr addr;
struct for_hash_addr {
char fill[14];
- u_int16_t d;
+ uint16_t d;
} addra;
} addr;
static struct h6namemem *p; /* static for longjmp() */
@@ -300,13 +297,13 @@
/*
* Do not print names if -n was given.
*/
- if (!nflag) {
+ if (!ndo->ndo_nflag) {
hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET6);
if (hp) {
char *dotp;
p->name = strdup(hp->h_name);
- if (Nflag) {
+ if (ndo->ndo_Nflag) {
/* Remove domain qualifications */
dotp = strchr(p->name, '.');
if (dotp)
@@ -474,7 +471,7 @@
}
const char *
-etheraddr_string(register const u_char *ep)
+etheraddr_string(netdissect_options *ndo, register const u_char *ep)
{
register int i;
register char *cp;
@@ -486,7 +483,7 @@
if (tp->e_name)
return (tp->e_name);
#ifdef USE_ETHER_NTOHOST
- if (!nflag) {
+ if (!ndo->ndo_nflag) {
char buf2[BUFSIZE];
/*
@@ -511,7 +508,7 @@
*cp++ = hex[*ep++ & 0xf];
}
- if (!nflag) {
+ if (!ndo->ndo_nflag) {
snprintf(cp, BUFSIZE - (2 + 5*3), " (oui %s)",
tok2str(oui_values, "Unknown", oui));
} else
@@ -549,7 +546,7 @@
}
const char *
-linkaddr_string(const u_char *ep, const unsigned int type, const unsigned int len)
+linkaddr_string(netdissect_options *ndo, const u_char *ep, const unsigned int type, const unsigned int len)
{
register u_int i;
register char *cp;
@@ -559,7 +556,7 @@
return ("<empty>");
if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN)
- return (etheraddr_string(ep));
+ return (etheraddr_string(ndo, ep));
if (type == LINKADDR_FRELAY)
return (q922_string(ep));
@@ -587,7 +584,7 @@
{
register char *cp;
register struct hnamemem *tp;
- register u_int32_t i = port;
+ register uint32_t i = port;
char buf[sizeof("0000")];
for (tp = &eprototable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
@@ -670,7 +667,7 @@
tcpport_string(u_short port)
{
register struct hnamemem *tp;
- register u_int32_t i = port;
+ register uint32_t i = port;
char buf[sizeof("00000")];
for (tp = &tporttable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
@@ -689,7 +686,7 @@
udpport_string(register u_short port)
{
register struct hnamemem *tp;
- register u_int32_t i = port;
+ register uint32_t i = port;
char buf[sizeof("00000")];
for (tp = &uporttable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
@@ -709,7 +706,7 @@
{
register char *cp;
register struct hnamemem *tp;
- register u_int32_t i = port;
+ register uint32_t i = port;
char buf[sizeof("0000")];
for (tp = &ipxsaptable[i & (HASHNAMESIZE-1)]; tp->nxt; tp = tp->nxt)
@@ -731,7 +728,7 @@
}
static void
-init_servarray(void)
+init_servarray(netdissect_options *ndo)
{
struct servent *sv;
register struct hnamemem *table;
@@ -750,7 +747,7 @@
while (table->name)
table = table->nxt;
- if (nflag) {
+ if (ndo->ndo_nflag) {
(void)snprintf(buf, sizeof(buf), "%d", port);
table->name = strdup(buf);
} else
@@ -763,7 +760,7 @@
/* in libpcap.a (nametoaddr.c) */
#if defined(WIN32) && !defined(USE_STATIC_LIBPCAP)
-__declspec(dllimport)
+extern __declspec(dllimport)
#else
extern
#endif
@@ -1139,32 +1136,32 @@
/*
* Initialize the address to name translation machinery. We map all
- * non-local IP addresses to numeric addresses if fflag is true (i.e.,
- * to prevent blocking on the nameserver). localnet is the IP address
+ * non-local IP addresses to numeric addresses if ndo->ndo_fflag is true
+ * (i.e., to prevent blocking on the nameserver). localnet is the IP address
* of the local network. mask is its subnet mask.
*/
void
-init_addrtoname(u_int32_t localnet, u_int32_t mask)
+init_addrtoname(netdissect_options *ndo, uint32_t localnet, uint32_t mask)
{
- if (fflag) {
+ if (ndo->ndo_fflag) {
f_localnet = localnet;
f_netmask = mask;
}
- if (nflag)
+ if (ndo->ndo_nflag)
/*
* Simplest way to suppress names.
*/
return;
init_etherarray();
- init_servarray();
+ init_servarray(ndo);
init_eprotoarray();
init_protoidarray();
init_ipxsaparray();
}
Home |
Main Index |
Thread Index |
Old Index