aboutsummaryrefslogtreecommitdiff
path: root/contrib/tcpdump/print-ipx.c
diff options
context:
space:
mode:
authorBill Fenner <fenner@FreeBSD.org>2001-04-03 07:50:46 +0000
committerBill Fenner <fenner@FreeBSD.org>2001-04-03 07:50:46 +0000
commit943ee2b15a8e008b2087495c2986bac507caef79 (patch)
tree862679b25d0bf745e54c1775c59b1fb4e25e8e6e /contrib/tcpdump/print-ipx.c
parent4df395f42edf94a848c3a2ef908b406d888207d6 (diff)
downloadsrc-943ee2b15a8e008b2087495c2986bac507caef79.tar.gz
src-943ee2b15a8e008b2087495c2986bac507caef79.zip
Merge tcpdump 3.6.2
Notes
Notes: svn path=/head/; revision=75118
Diffstat (limited to 'contrib/tcpdump/print-ipx.c')
-rw-r--r--contrib/tcpdump/print-ipx.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/contrib/tcpdump/print-ipx.c b/contrib/tcpdump/print-ipx.c
index c17812387848..867634c4ebff 100644
--- a/contrib/tcpdump/print-ipx.c
+++ b/contrib/tcpdump/print-ipx.c
@@ -26,7 +26,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.22 1999/11/21 09:36:54 fenner Exp $";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.27 2000/09/29 04:58:41 guy Exp $";
#endif
#ifdef HAVE_CONFIG_H
@@ -38,16 +38,8 @@ static const char rcsid[] =
#include <sys/socket.h>
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-
-#ifdef __STDC__
+
#include <stdlib.h>
-#endif
#include <stdio.h>
#include <string.h>
@@ -94,7 +86,7 @@ ipxaddr_string(u_int32_t net, const u_char *node)
{
static char line[256];
- sprintf(line, "%x.%02x:%02x:%02x:%02x:%02x:%02x",
+ snprintf(line, sizeof(line), "%x.%02x:%02x:%02x:%02x:%02x:%02x",
net, node[0], node[1], node[2], node[3], node[4], node[5]);
return line;