X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/cf53dc05f1c854cc8cb94afd3409bbf033a055ed..3e12b0b42cd8d08df77a02374ffae47c23748bf1:/print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index 3d67cb3e..cd3f6542 100644
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -23,20 +23,15 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.29 2000-09-29 04:58:45 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.32 2002-08-01 08:53:22 risso Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
+#include <tcpdump-stdinc.h>
 
-#include <netinet/in.h>
-
-#include <ctype.h>
 #include <stdio.h>
 
 #include "interface.h"
@@ -78,6 +73,10 @@ static struct tok type2str[] = {
 
 static char tstr[] = " [|ospf]";
 
+#ifdef WIN32
+#define inline __inline
+#endif /* WIN32 */
+
 /* Forwards */
 static inline void ospf_print_seqage(u_int32_t, time_t);
 static inline void ospf_print_bits(const struct bits *, u_char);
@@ -403,8 +402,9 @@ ospf_decode_v2(register const struct ospfhdr *op,
 			printf(" bdr %s",
 			    ipaddr_string(&op->ospf_hello.hello_bdr));
 		if (vflag) {
-			printf(" nbrs");
 			ap = op->ospf_hello.hello_neighbor;
+			if ((u_char *)ap < dataend)
+				printf(" nbrs");
 			while ((u_char *)ap < dataend) {
 				TCHECK(*ap);
 				printf(" %s", ipaddr_string(ap));
@@ -509,12 +509,6 @@ ospf_print(register const u_char *bp, register u_int length,
 
 	op = (struct ospfhdr *)bp;
 	ip = (struct ip *)bp2;
-	/* Print the source and destination address  */
-#if 0
-	(void) printf("%s > %s:",
-	    ipaddr_string(&ip->ip_src),
-	    ipaddr_string(&ip->ip_dst));
-#endif
 
         /* XXX Before we do anything else, strip off the MD5 trailer */
         TCHECK(op->ospf_authtype);
@@ -527,7 +521,7 @@ ospf_print(register const u_char *bp, register u_int length,
 	/* value.  If it's not valid, say so and return */
 	TCHECK(op->ospf_type);
 	cp = tok2str(type2str, "type%d", op->ospf_type);
-	printf(" OSPFv%d-%s %d:", op->ospf_version, cp, length);
+	printf("OSPFv%d-%s %d:", op->ospf_version, cp, length);
 	if (*cp == 't')
 		return;