diff options
| author | sam <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
| commit | 7dacff5dd0aeebda55a754dc5d25feab441b5d03 (patch) | |
| tree | 71f0f8d5860cc5ba4d96abee0d8048a044b51cd3 /contrib/tcpdump/print-ipx.c | |
| parent | d9db21b8bcec89e09ac680f84c6d7d0ca014d6df (diff) | |
| download | FreeBSD-src-7dacff5dd0aeebda55a754dc5d25feab441b5d03.zip FreeBSD-src-7dacff5dd0aeebda55a754dc5d25feab441b5d03.tar.gz | |
resolve merge conflicts and update for proper build; including:
o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h
Reviewed by: bms
Diffstat (limited to 'contrib/tcpdump/print-ipx.c')
| -rw-r--r-- | contrib/tcpdump/print-ipx.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/contrib/tcpdump/print-ipx.c b/contrib/tcpdump/print-ipx.c index 6a6dfb9..7ec704b 100644 --- a/contrib/tcpdump/print-ipx.c +++ b/contrib/tcpdump/print-ipx.c @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.34.2.2 2003/11/16 08:51:28 guy Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.40 2004/05/26 19:57:57 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -58,12 +58,15 @@ ipx_print(const u_char *p, u_int length) { const struct ipxHdr *ipx = (const struct ipxHdr *)p; + if (!eflag) + printf("IPX "); + TCHECK(ipx->srcSkt); (void)printf("%s.%04x > ", ipxaddr_string(EXTRACT_32BITS(ipx->srcNet), ipx->srcNode), EXTRACT_16BITS(&ipx->srcSkt)); - (void)printf("%s.%04x:", + (void)printf("%s.%04x: ", ipxaddr_string(EXTRACT_32BITS(ipx->dstNet), ipx->dstNode), EXTRACT_16BITS(&ipx->dstSkt)); @@ -96,7 +99,7 @@ ipx_decode(const struct ipxHdr *ipx, const u_char *datap, u_int length) dstSkt = EXTRACT_16BITS(&ipx->dstSkt); switch (dstSkt) { case IPX_SKT_NCP: - (void)printf(" ipx-ncp %d", length); + (void)printf("ipx-ncp %d", length); break; case IPX_SKT_SAP: ipx_sap_print((u_short *)datap, length); @@ -105,25 +108,25 @@ ipx_decode(const struct ipxHdr *ipx, const u_char *datap, u_int length) ipx_rip_print((u_short *)datap, length); break; case IPX_SKT_NETBIOS: - (void)printf(" ipx-netbios %d", length); + (void)printf("ipx-netbios %d", length); #ifdef TCPDUMP_DO_SMB ipx_netbios_print(datap, length); #endif break; case IPX_SKT_DIAGNOSTICS: - (void)printf(" ipx-diags %d", length); + (void)printf("ipx-diags %d", length); break; case IPX_SKT_NWLINK_DGM: - (void)printf(" ipx-nwlink-dgm %d", length); + (void)printf("ipx-nwlink-dgm %d", length); #ifdef TCPDUMP_DO_SMB ipx_netbios_print(datap, length); #endif break; case IPX_SKT_EIGRP: - (void)printf(" ipx-eigrp %d", length); + eigrp_print(datap, length); break; default: - (void)printf(" ipx-#%x %d", dstSkt, length); + (void)printf("ipx-#%x %d", dstSkt, length); break; } } |
