X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ddd98d0f3b8c094cffe8b8fc5fac4f4601343054..b54ff914a1ea5c40da3687b52a508748ecb801b0:/print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index be622868..af91c687 100644
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.55 2004-09-20 14:56:34 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.58 2005-05-06 07:56:53 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -873,15 +873,13 @@ trunc:
 
 void
 ospf_print(register const u_char *bp, register u_int length,
-    register const u_char *bp2)
+    const u_char *bp2 _U_)
 {
 	register const struct ospfhdr *op;
-	register const struct ip *ip;
 	register const u_char *dataend;
 	register const char *cp;
 
 	op = (struct ospfhdr *)bp;
-	ip = (struct ip *)bp2;
 
         /* XXX Before we do anything else, strip off the MD5 trailer */
         TCHECK(op->ospf_authtype);
@@ -894,10 +892,9 @@ 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, "unknown LS-type", op->ospf_type);
-	printf("OSPFv%u, %s (%u), length: %u",
+	printf("OSPFv%u, %s, length: %u",
 	       op->ospf_version,
 	       cp,
-	       op->ospf_type,
 	       length);
 	if (*cp == 'u')
 		return;
@@ -935,8 +932,11 @@ ospf_print(register const u_char *bp, register u_int length,
 			break;
 
 		case OSPF_AUTH_SIMPLE:
-			(void)fn_printn(op->ospf_authdata,
-			    sizeof(op->ospf_authdata), NULL);
+			if (fn_printn(op->ospf_authdata,
+			    sizeof(op->ospf_authdata), snapend)) {
+				printf("\"");
+				goto trunc;
+			}
 			printf("\"");
 			break;