care and KNF

1 files changed, 162 insertions, 168 deletions

diff --git a/usr.sbin/tcpdump/print-ike.c b/usr.sbin/tcpdump/print-ike.c
index 68204803d1b..31662015da8 100644
--- a/usr.sbin/tcpdump/print-ike.c
+++ b/usr.sbin/tcpdump/print-ike.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-ike.c,v 1.8 2001/10/26 14:14:49 ho Exp $	*/
+/*	$OpenBSD: print-ike.c,v 1.9 2001/11/12 18:04:08 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ike.c,v 1.8 2001/10/26 14:14:49 ho Exp $ (XXX)";
+    "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/print-ike.c,v 1.9 2001/11/12 18:04:08 deraadt Exp $ (XXX)";
 #endif
 
 #include <sys/param.h>
@@ -62,7 +62,7 @@ struct isakmp_header {
 	u_char  flags;
 	u_char  msgid[4];
 	u_int32_t length;
-	u_char  payloads[0];  
+	u_char  payloads[0];
 };
 
 struct notification_payload {
@@ -76,7 +76,7 @@ struct notification_payload {
 	u_char    data[0];
 };
 
-static void ike_pl_print(register u_char, register u_char *, u_char);
+static void ike_pl_print(u_char, u_char *, u_char);
 
 int ike_tab_level = 0;
 u_char xform_proto;
@@ -86,30 +86,30 @@ static const char *ike[] = IKE_PROTO_INITIALIZER;
 #define SMALL_TABS 4
 #define SPACES "                                                   "
 const char *
-ike_tab_offset (void)
+ike_tab_offset(void)
 {
-  const char *p, *endline;
-  static const char line[] = SPACES;
+	const char *p, *endline;
+	static const char line[] = SPACES;
 
-  endline = line + sizeof line - 1;
-  p = endline - SMALL_TABS * (ike_tab_level);  
+	endline = line + sizeof line - 1;
+	p = endline - SMALL_TABS * (ike_tab_level);
 
-  return (p > line ? p : line);
+	return (p > line ? p : line);
 }
 
 static char *
 ike_get_cookie (u_char *ic, u_char *rc)
 {
 	static char cookie_jar[35];
-	register int i;
-	cookie_jar[0] = cookie_jar[34] = 0;
+	int i;
 
 	for (i = 0; i < 8; i++)
-		sprintf (cookie_jar + (i<<1), "%02x", *(ic + i));
-	strcat (cookie_jar, "->");
+		snprintf(cookie_jar + i*2, sizeof(cookie_jar) - i*2,
+		    "%02x", *(ic + i));
+	strlcat(cookie_jar, "->", sizeof(cookie_jar));
 	for (i = 0; i < 8; i++)
-		sprintf (cookie_jar + 18 + (i<<1), "%02x", *(rc + i));
-
+		snprintf(cookie_jar + 18 + i*2, sizeof(cookie_jar) - 18 - i*2,
+		    "%02x", *(rc + i));
 	return cookie_jar;
 }
 
@@ -117,10 +117,10 @@ ike_get_cookie (u_char *ic, u_char *rc)
  * Print isakmp requests
  */
 void
-ike_print (register const u_char *cp, register u_int length)
+ike_print (const u_char *cp, u_int length)
 {
 	struct isakmp_header *ih;
-	register const u_char *ep;
+	const u_char *ep;
 	u_char *payload;
 	u_char  nextpayload;
 	int encrypted;
@@ -132,12 +132,12 @@ ike_print (register const u_char *cp, register u_int length)
 #undef TCHECK
 #endif
 #define TCHECK(var, l) if ((u_char *)&(var) > ep - l) goto trunc
-	
+
 	ih = (struct isakmp_header *)cp;
 	/* Note funny sized packets */
-	if (length < 20) {
+
+	if (length < 20)
 		(void)printf(" [len=%d]", length);
-	}
 
 	/* 'ep' points to the end of avaible data. */
 	ep = snapend;
@@ -148,15 +148,15 @@ ike_print (register const u_char *cp, register u_int length)
 
 	printf(" exchange ");
 	if (ih->exgtype < (sizeof exgtypes/sizeof exgtypes[0]))
-	        printf("%s", exgtypes[ih->exgtype]);
+		printf("%s", exgtypes[ih->exgtype]);
 	else
-	        printf("%d (unknown)", ih->exgtype);
+		printf("%d (unknown)", ih->exgtype);
 
 	if (ih->flags & FLAGS_ENCRYPTION) {
 		printf(" encrypted");
 		encrypted = 1;
 	}
-	
+
 	if (ih->flags & FLAGS_COMMIT) {
 		printf(" commit");
 	}
@@ -165,13 +165,12 @@ ike_print (register const u_char *cp, register u_int length)
 						 ih->resp_cookie));
 
 	TCHECK(ih->msgid, sizeof(ih->msgid));
-	printf(" msgid: %02x%02x%02x%02x",
-	       ih->msgid[0], ih->msgid[1],
-	       ih->msgid[2], ih->msgid[3]);
+	printf(" msgid: %02x%02x%02x%02x", ih->msgid[0], ih->msgid[1],
+	    ih->msgid[2], ih->msgid[3]);
 
 	TCHECK(ih->length, sizeof(ih->length));
 	printf(" len: %d", ntohl(ih->length));
-	
+
 	if (ih->version > 16) {
 		printf(" new version");
 		return;
@@ -188,7 +187,7 @@ ike_print (register const u_char *cp, register u_int length)
 
 	/* if verbose, print payload data */
 	if (vflag)
-	        ike_pl_print(nextpayload, payload, ISAKMP_DOI);
+		ike_pl_print(nextpayload, payload, ISAKMP_DOI);
 
 	return;
 
@@ -197,29 +196,28 @@ trunc:
 }
 
 void
-ike_pl_sa_print (register u_char *buf, register int len)
+ike_pl_sa_print (u_char *buf, int len)
 {
 	u_int32_t situation = ntohl(*(u_int32_t *)(buf + 4));
 	u_char ike_doi = ntohl((*(u_int32_t *)buf));
 	printf(" DOI: %d", ike_doi);
 	if (ike_doi == IPSEC_DOI) {
-	        printf("(IPSEC) situation: ");
+		printf("(IPSEC) situation: ");
 		if (situation & IKE_SITUATION_IDENTITY_ONLY)
-		        printf("IDENTITY_ONLY ");
+			printf("IDENTITY_ONLY ");
 		if (situation & IKE_SITUATION_SECRECY)
-		        printf("SECRECY ");
+			printf("SECRECY ");
 		if (situation & IKE_SITUATION_INTEGRITY)
-		        printf("INTEGRITY ");
+			printf("INTEGRITY ");
 		if ((situation & IKE_SITUATION_MASK) == 0)
-		        printf("0x%x (unknown)", situation);
-	        ike_pl_print (PAYLOAD_PROPOSAL, buf + 8, IPSEC_DOI);
-	}
-	else
-	        printf(" situation: (unknown)");
+			printf("0x%x (unknown)", situation);
+		ike_pl_print (PAYLOAD_PROPOSAL, buf + 8, IPSEC_DOI);
+	} else
+		printf(" situation: (unknown)");
 }
 
 int
-ike_attribute_print (register u_char *buf, u_char doi, register int maxlen)
+ike_attribute_print (u_char *buf, u_char doi, int maxlen)
 {
 	static char *attrs[] = IKE_ATTR_INITIALIZER;
 	static char *attr_enc[] = IKE_ATTR_ENCRYPT_INITIALIZER;
@@ -237,18 +235,17 @@ ike_attribute_print (register u_char *buf, u_char doi, register int maxlen)
 	u_int16_t type = (buf[0] & 0x7f) << 8 | buf[1];
 	u_int16_t len  = buf[2] << 8 | buf[3], val;
 
-	if (doi == ISAKMP_DOI) 
+	if (doi == ISAKMP_DOI)
 		printf("\n\t%sattribute %s = ", ike_tab_offset(),
-		       (type < sizeof attrs / sizeof attrs[0] ?
-			attrs[type] : "<unknown>"));
+		    (type < sizeof attrs / sizeof attrs[0] ?
+		    attrs[type] : "<unknown>"));
 	else
 		printf("\n\t%sattribute %s = ", ike_tab_offset(),
-		       (type < (sizeof ipsec_attrs / sizeof ipsec_attrs[0]) ?
-			ipsec_attrs[type] : "<unknown>"));
+		    (type < (sizeof ipsec_attrs / sizeof ipsec_attrs[0]) ?
+		    ipsec_attrs[type] : "<unknown>"));
 
-	if ((af == 1 && maxlen < 4) ||
-	    (af == 0 && maxlen < (len + 4))) {
-		printf ("\n\t%s[|attr]", ike_tab_offset());
+	if ((af == 1 && maxlen < 4) || (af == 0 && maxlen < (len + 4))) {
+		printf("\n\t%s[|attr]", ike_tab_offset());
 		return maxlen;
 	}
 
@@ -262,13 +259,13 @@ ike_attribute_print (register u_char *buf, u_char doi, register int maxlen)
 	val = len;	/* For AF=1, this field is the "VALUE" */
 	len = 4; 	/* and with AF=1, length is always 4 */
 
-#define CASE_PRINT(TYPE,var) \
-        case TYPE : \
-               	if (val < sizeof var / sizeof var [0]) \
-                       	printf("%s", var [val]); \
-               	else \
-                       	printf("%d (unknown)", val); \
-               	break;
+#define CASE_PRINT(TYPE, var) \
+	case TYPE : \
+		if (val < sizeof var / sizeof var [0]) \
+			printf("%s", var [val]); \
+		else \
+			printf("%d (unknown)", val); \
+		break;
 
 	if (doi == ISAKMP_DOI)
 		switch(type) {
@@ -285,155 +282,154 @@ ike_attribute_print (register u_char *buf, u_char doi, register int maxlen)
 		switch(type) {
 			CASE_PRINT(IPSEC_ATTR_SA_LIFE_TYPE, ipsec_attr_ltype);
 			CASE_PRINT(IPSEC_ATTR_ENCAPSULATION_MODE,
-				   ipsec_attr_encap);
+			    ipsec_attr_encap);
 			CASE_PRINT(IPSEC_ATTR_AUTHENTICATION_ALGORITHM,
-				   ipsec_attr_auth);
+			    ipsec_attr_auth);
 		default:
-			printf ("%d", val);
+			printf("%d", val);
 		}
 
 #undef CASE_PRINT
-
 	return len;
 }
 
 void
-ike_pl_transform_print (register u_char *buf, register int len, u_char doi)
+ike_pl_transform_print (u_char *buf, int len, u_char doi)
 {
 	const char *ah[] = IPSEC_AH_INITIALIZER;
 	const char *esp[] = IPSEC_ESP_INITIALIZER;
 	u_char *attr = buf + 4;
 
 	printf("\n\t%stransform: %u ID: ", ike_tab_offset(), buf[0]);
-	
+
 	switch (doi) {
 	case ISAKMP_DOI:
 		if (buf[1] < (sizeof ike / sizeof ike[0]))
-			printf ("%s", ike[buf[1]]);
+			printf("%s", ike[buf[1]]);
 		else
-			printf ("%d(unknown)", buf[1]);
+			printf("%d(unknown)", buf[1]);
 		break;
 
 	default: /* IPSEC_DOI */
 		switch (xform_proto) {	/* from ike_proposal_print */
 		case PROTO_IPSEC_AH:
 			if (buf[1] < (sizeof ah / sizeof ah[0]))
-				printf ("%s", ah[buf[1]]);
+				printf("%s", ah[buf[1]]);
 			else
-				printf ("%d(unknown)", buf[1]);
+				printf("%d(unknown)", buf[1]);
 			break;
 		case PROTO_IPSEC_ESP:
 			if (buf[1] < (sizeof esp / sizeof esp[0]))
-				printf ("%s", esp[buf[1]]);
+				printf("%s", esp[buf[1]]);
 			else
-				printf ("%d(unknown)", buf[1]);
+				printf("%d(unknown)", buf[1]);
 			break;
 		default:
-			printf ("%d(unknown)", buf[1]);
+			printf("%d(unknown)", buf[1]);
 		}
 		break;
 	}
- 
+
 	ike_tab_level++;
-	while((int)(attr - buf) < len - 4)  /* Skip last 'NONE' attr */
+	while ((int)(attr - buf) < len - 4)  /* Skip last 'NONE' attr */
 		attr += ike_attribute_print(attr, doi, len - (attr-buf));
 	ike_tab_level--;
 }
 
 void
-ike_pl_proposal_print (register u_char *buf, register int len, u_char doi)
+ike_pl_proposal_print (u_char *buf, int len, u_char doi)
 {
-	printf(" proposal: %d proto: %s spisz: %d xforms: %d", 
-	       buf[0], (buf[1] < (sizeof ike / sizeof ike[0]) ? ike[buf[1]] : 
-			"(unknown)"), buf[2], buf[3]);
+	printf(" proposal: %d proto: %s spisz: %d xforms: %d",
+	    buf[0], (buf[1] < (sizeof ike / sizeof ike[0]) ? ike[buf[1]] :
+	    "(unknown)"), buf[2], buf[3]);
 
 	/* We need to store this for upcoming ike_attribute_print call. */
 	xform_proto = buf[1];
 
 	if (buf[2]) {
 		/* XXX it is possible that spisz may be != 4 ... */
-		printf(" SPI: 0x%08x", 
-		       buf[4]<<24 | buf[5]<<16 | buf[6]<<8 | buf[7]);
+		printf(" SPI: 0x%08x",
+		    buf[4]<<24 | buf[5]<<16 | buf[6]<<8 | buf[7]);
 		doi = IPSEC_DOI;
-	} else 
+	} else
 		doi = ISAKMP_DOI;
 
-	if((char)buf[3] > 0)
+	if ((char)buf[3] > 0)
 		ike_pl_print(PAYLOAD_TRANSFORM, buf+4+buf[2], doi);
 }
 
 void
-ike_pl_ke_print (register u_char *buf, register int len, u_char doi)
+ike_pl_ke_print (u_char *buf, int len, u_char doi)
 {
 	if (doi != IPSEC_DOI)
 		return;
 
 	/* XXX ... */
 }
-	
+
 void
-ipsec_id_print (register u_char *buf, register int len, u_char doi)
+ipsec_id_print (u_char *buf, int len, u_char doi)
 {
 	static const char *idtypes[] = IPSEC_ID_TYPE_INITIALIZER;
 	char ntop_buf[INET6_ADDRSTRLEN];
 	struct in_addr in;
 	u_char *p;
 
-	if (doi != ISAKMP_DOI) 
+	if (doi != ISAKMP_DOI)
 		return;
 
 	/* Don't print proto+port unless actually used */
 	if (buf[1] | buf[2] | buf[3])
-		printf (" proto: %d port: %d", buf[1], (buf[2] << 8) + buf[3]);
+		printf(" proto: %d port: %d", buf[1], (buf[2] << 8) + buf[3]);
 
-	printf (" type: %s = ", buf[0] < (sizeof idtypes/sizeof idtypes[0]) ?
-		idtypes[buf[0]] : "<unknown>");
+	printf(" type: %s = ", buf[0] < (sizeof idtypes/sizeof idtypes[0]) ?
+	    idtypes[buf[0]] : "<unknown>");
 
 	switch (buf[0]) {
 	case IPSEC_ID_IPV4_ADDR:
 		memcpy (&in.s_addr, buf + 4, sizeof in);
-		printf ("%s", inet_ntoa (in));
+		printf("%s", inet_ntoa (in));
 		break;
 	case IPSEC_ID_IPV4_ADDR_SUBNET:
 	case IPSEC_ID_IPV4_ADDR_RANGE:
 		memcpy (&in.s_addr, buf + 4, sizeof in);
-		printf ("%s%s", inet_ntoa (in),
-			buf[0] == IPSEC_ID_IPV4_ADDR_SUBNET ? "/" : "-");
+		printf("%s%s", inet_ntoa (in),
+		    buf[0] == IPSEC_ID_IPV4_ADDR_SUBNET ? "/" : "-");
 		memcpy (&in.s_addr, buf + 8, sizeof in);
-		printf ("%s", inet_ntoa (in));
+		printf("%s", inet_ntoa (in));
 		break;
 
 	case IPSEC_ID_IPV6_ADDR:
-		printf ("%s", inet_ntop (AF_INET6, buf + 4, ntop_buf,
-					 sizeof ntop_buf));
+		printf("%s", inet_ntop (AF_INET6, buf + 4, ntop_buf,
+		    sizeof ntop_buf));
 		break;
 	case IPSEC_ID_IPV6_ADDR_SUBNET:
 	case IPSEC_ID_IPV6_ADDR_RANGE:
-		printf ("%s%s", inet_ntop (AF_INET6, buf + 4, ntop_buf,
-					   sizeof ntop_buf),
-			buf[0] == IPSEC_ID_IPV6_ADDR_SUBNET ? "/" : "-");
-		printf ("%s", inet_ntop (AF_INET6, buf + 4 + sizeof ntop_buf,
-					 ntop_buf, sizeof ntop_buf));
+		printf("%s%s", inet_ntop (AF_INET6, buf + 4, ntop_buf,
+		    sizeof ntop_buf),
+		    buf[0] == IPSEC_ID_IPV6_ADDR_SUBNET ? "/" : "-");
+		printf("%s", inet_ntop (AF_INET6, buf + 4 + sizeof ntop_buf,
+		    ntop_buf, sizeof ntop_buf));
 
 	case IPSEC_ID_FQDN:
 	case IPSEC_ID_USER_FQDN:
-		printf ("\"");
+		printf("\"");
 		for(p = buf + 4; (int)(p - buf) < len; p++)
-			printf ("%c",(isprint(*p) ? *p : '.'));
-		printf ("\"");
+			printf("%c",(isprint(*p) ? *p : '.'));
+		printf("\"");
 		break;
 
 	case IPSEC_ID_DER_ASN1_DN:
 	case IPSEC_ID_DER_ASN1_GN:
 	case IPSEC_ID_KEY_ID:
 	default:
-		printf ("\"(not shown)\"");
+		printf("\"(not shown)\"");
 		break;
 	}
 }
 
 void
-ike_pl_notification_print (register u_char *buf, register int len)
+ike_pl_notification_print (u_char *buf, int len)
 {
   	static const char *nftypes[] = IKE_NOTIFY_TYPES_INITIALIZER;
   	struct notification_payload *np = (struct notification_payload *)buf;
@@ -441,7 +437,7 @@ ike_pl_notification_print (register u_char *buf, register int len)
 	u_char *attr;
 
 	if (len < sizeof (struct notification_payload)) {
-		printf (" (|len)");
+		printf(" (|len)");
 		return;
 	}
 
@@ -449,73 +445,73 @@ ike_pl_notification_print (register u_char *buf, register int len)
 	np->type = ntohs (np->type);
 
 	if (np->doi != ISAKMP_DOI && np->doi != IPSEC_DOI) {
-		printf (" (unknown DOI)");
+		printf(" (unknown DOI)");
 		return;
 	}
 
-	printf ("\n\t%snotification: ", ike_tab_offset());
+	printf("\n\t%snotification: ", ike_tab_offset());
 
-	if (np->type > 0 && np->type < (sizeof nftypes / sizeof nftypes[0]))
+	if (np->type > 0 && np->type < (sizeof nftypes / sizeof nftypes[0])) {
 		printf("%s", nftypes[np->type]);
-	else switch (np->type) {
+		return;
+	}
+	switch (np->type) {
 
 	case NOTIFY_IPSEC_RESPONDER_LIFETIME:
 		printf("RESPONDER LIFETIME");
 		if (np->spi_size == 16)
-			printf ("(%s)", ike_get_cookie (&np->data[0], 
-							&np->data[8]));
+			printf("(%s)", ike_get_cookie (&np->data[0],
+			    &np->data[8]));
 		else
-			printf("SPI: 0x%08x", np->data[0]<<24 | 
-			       np->data[1]<<16 | np->data[2]<<8 | np->data[3]);
+			printf("SPI: 0x%08x", np->data[0]<<24 |
+			    np->data[1]<<16 | np->data[2]<<8 | np->data[3]);
 		attr = &np->data[np->spi_size];
 		ike_tab_level++;
-		while((int)(attr - buf) < len - 4)  /* Skip last 'NONE' attr */
+		while ((int)(attr - buf) < len - 4)  /* Skip last 'NONE' attr */
 			attr += ike_attribute_print(attr, IPSEC_DOI,
-						    len - (attr-buf));
-		ike_tab_level--;	
+			    len - (attr-buf));
+		ike_tab_level--;
 		break;
 
 	case NOTIFY_IPSEC_REPLAY_STATUS:
 		replay = (u_int32_t *)&np->data[np->spi_size];
 		printf("REPLAY STATUS [%sabled] ", *replay ? "en" : "dis");
 		if (np->spi_size == 16)
-			printf ("(%s)", ike_get_cookie (&np->data[0], 
-							&np->data[8]));
+			printf("(%s)", ike_get_cookie (&np->data[0],
+			    &np->data[8]));
 		else
-			printf("SPI: 0x%08x", np->data[0]<<24 | 
-			       np->data[1]<<16 | np->data[2]<<8 | np->data[3]);
-		break; 
+			printf("SPI: 0x%08x", np->data[0]<<24 |
+			    np->data[1]<<16 | np->data[2]<<8 | np->data[3]);
+		break;
 
 	case NOTIFY_IPSEC_INITIAL_CONTACT:
 		printf("INITIAL CONTACT (%s)", ike_get_cookie (&np->data[0],
-							       &np->data[8]));
+		    &np->data[8]));
 		break;
 
 	default:
 	  	printf("%d (unknown)", np->type);
 		break;
 	}
-  	return;
 }
-	
+
 void
-ike_pl_vendor_print (register u_char *buf, register int len, u_char doi)
+ike_pl_vendor_print (u_char *buf, int len, u_char doi)
 {
 	u_char *p = buf;
 
-	if (doi != IPSEC_DOI) 
+	if (doi != IPSEC_DOI)
 		return;
 
 	printf(" \"");
-	for(p = buf; (int)(p - buf) < len; p++)
-	        printf("%c",(isprint(*p) ? *p : '.'));
+	for (p = buf; (int)(p - buf) < len; p++)
+		printf("%c",(isprint(*p) ? *p : '.'));
 	printf("\"");
 }
 
 /* IKE mode-config. */
 int
-ike_cfg_attribute_print (register u_char *buf, register int attr_type, 
-			 register int maxlen)
+ike_cfg_attribute_print (u_char *buf, int attr_type, int maxlen)
 {
 	static char *attrs[] = IKE_CFG_ATTRIBUTE_INITIALIZER;
 	char ntop_buf[INET6_ADDRSTRLEN];
@@ -527,21 +523,21 @@ ike_cfg_attribute_print (register u_char *buf, register int attr_type,
 	u_char   *val  = af ? buf + 2 : buf + 4;
 
 	printf("\n\t\%sattribute %s = ", ike_tab_offset(),
-	       type < (sizeof attrs / sizeof attrs[0]) ? attrs[type] : 
-	       "<unknown>");
+	    type < (sizeof attrs / sizeof attrs[0]) ? attrs[type] :
+	    "<unknown>");
 
 	if ((af == 1 && maxlen < 4) ||
 	    (af == 0 && maxlen < (len + 4))) {
-		printf ("\n\t%s[|attr]", ike_tab_offset());
+		printf("\n\t%s[|attr]", ike_tab_offset());
 		return maxlen;
 	}
 
 	/* XXX The 2nd term is for bug compatibility with PGPnet.  */
 	if (len == 0 || (af && !val[0] && !val[1])) {
-		printf ("<none>");
+		printf("<none>");
 		return 4;
 	}
-	
+
 	/* XXX Generally lengths are not checked well below.  */
 	switch (type) {
 	case IKE_CFG_ATTR_INTERNAL_IP4_ADDRESS:
@@ -550,16 +546,16 @@ ike_cfg_attribute_print (register u_char *buf, register int attr_type,
 	case IKE_CFG_ATTR_INTERNAL_IP4_NBNS:
 	case IKE_CFG_ATTR_INTERNAL_IP4_DHCP:
 		memcpy (&in.s_addr, val, sizeof in);
-		printf ("%s", inet_ntoa (in));
+		printf("%s", inet_ntoa (in));
 		break;
-		
+
 	case IKE_CFG_ATTR_INTERNAL_IP6_ADDRESS:
 	case IKE_CFG_ATTR_INTERNAL_IP6_NETMASK:
 	case IKE_CFG_ATTR_INTERNAL_IP6_DNS:
 	case IKE_CFG_ATTR_INTERNAL_IP6_NBNS:
 	case IKE_CFG_ATTR_INTERNAL_IP6_DHCP:
-		printf ("%s", inet_ntop (AF_INET6, val, ntop_buf,
-					 sizeof ntop_buf));
+		printf("%s", inet_ntop (AF_INET6, val, ntop_buf,
+		    sizeof ntop_buf));
 		break;
 
 	case IKE_CFG_ATTR_INTERNAL_IP4_SUBNET:
@@ -568,35 +564,34 @@ ike_cfg_attribute_print (register u_char *buf, register int attr_type,
 		memcpy(&in.s_addr, val + sizeof in, sizeof in);
 		printf("%s", inet_ntoa (in));
 		break;
-		
+
 	case IKE_CFG_ATTR_INTERNAL_IP6_SUBNET:
-		printf("%s/%u", inet_ntop (AF_INET6, val, ntop_buf, 
-					   sizeof ntop_buf),
-		       val[16]);
+		printf("%s/%u", inet_ntop (AF_INET6, val, ntop_buf,
+		    sizeof ntop_buf), val[16]);
 		break;
-		
+
 	case IKE_CFG_ATTR_INTERNAL_ADDRESS_EXPIRY:
 		printf("%u seconds",
-		       val[0] << 24 | val[1] << 16 | val[2] << 8 | val[3]);
+		    val[0] << 24 | val[1] << 16 | val[2] << 8 | val[3]);
 		break;
 
 	case IKE_CFG_ATTR_APPLICATION_VERSION:
 		for (p = 0; p < len; p++)
 			printf("%c", isprint(val[p]) ? val[p] : '.');
 		break;
-		
+
 	case IKE_CFG_ATTR_SUPPORTED_ATTRIBUTES:
 		printf("<%d attributes>", len / 2);
 		ike_tab_level++;
 		for (p = 0; p < len; p += 2) {
 			type = (val[p] << 8 | val[p + 1]) & 0x7fff;
 			printf("\n\t%s%s", ike_tab_offset(),
-			       type < (sizeof attrs/sizeof attrs[0]) ?
-			       attrs[type] : "<unknown>");
+			    type < (sizeof attrs/sizeof attrs[0]) ?
+			    attrs[type] : "<unknown>");
 		}
 		ike_tab_level--;
 		break;
-		
+
 	default:
 		break;
 	}
@@ -604,7 +599,7 @@ ike_cfg_attribute_print (register u_char *buf, register int attr_type,
 }
 
 void
-ike_pl_attribute_print (register u_char *buf, register int len)
+ike_pl_attribute_print (u_char *buf, int len)
 {
 	static const char *pl_attr[] = IKE_CFG_ATTRIBUTE_TYPE_INITIALIZER;
 	u_char type, *attr;
@@ -614,52 +609,52 @@ ike_pl_attribute_print (register u_char *buf, register int len)
 	id = buf[2]<<8 | buf[3];
 	attr = buf + 4;
 
-	printf(" type: %s Id: %d", 
-	       type < (sizeof pl_attr/sizeof pl_attr[0]) ? pl_attr[type] :
-	       "<unknown>", id);
+	printf(" type: %s Id: %d",
+	    type < (sizeof pl_attr/sizeof pl_attr[0]) ? pl_attr[type] :
+	    "<unknown>", id);
 
-	while((int)(attr - buf) < len - 4)  
+	while ((int)(attr - buf) < len - 4)
 		attr += ike_cfg_attribute_print(attr, type, len - (attr-buf));
 }
 
 void
-ike_pl_print (register u_char type, register u_char *buf, u_char doi)
+ike_pl_print (u_char type, u_char *buf, u_char doi)
 {
 	static const char *pltypes[] = IKE_PAYLOAD_TYPES_INITIALIZER;
 	int next_type = buf[0];
 	int this_len = buf[2]<<8 | buf[3];
 
 	printf("\n\t%spayload: %s len: %d", ike_tab_offset(),
-	       (type < (sizeof pltypes/sizeof pltypes[0]) ?
-		pltypes[type] : "<unknown>"), this_len);
+	    (type < (sizeof pltypes/sizeof pltypes[0]) ?
+	    pltypes[type] : "<unknown>"), this_len);
 
-	if ((u_char *)&(buf[0]) > snapend - this_len) 
-	  goto pltrunc;
+	if ((u_char *)&(buf[0]) > snapend - this_len)
+		goto pltrunc;
 
 	ike_tab_level++;
-	switch(type) {
+	switch (type) {
 	case PAYLOAD_NONE:
 		return;
 
 	case PAYLOAD_SA:
 		ike_pl_sa_print(buf+4, this_len);
 		break;
-	    
+
 	case PAYLOAD_PROPOSAL:
 		ike_pl_proposal_print(buf+4, this_len, doi);
 		break;
-	    
+
 	case PAYLOAD_TRANSFORM:
 		ike_pl_transform_print(buf+4, this_len, doi);
 		break;
-	    
+
 	case PAYLOAD_KE:
 		ike_pl_ke_print(buf+4, this_len, doi);
 		break;
-	    
+
 	case PAYLOAD_ID:
 		/* Should only happen with IPsec DOI */
-	        ipsec_id_print(buf+4, this_len, doi);
+		ipsec_id_print(buf+4, this_len, doi);
 		break;
 
 	case PAYLOAD_CERT:
@@ -669,25 +664,25 @@ ike_pl_print (register u_char type, register u_char *buf, u_char doi)
 	case PAYLOAD_NONCE:
 	case PAYLOAD_DELETE:
 		break;
-	    
+
 	case PAYLOAD_NOTIFICATION:
 	  	ike_pl_notification_print(buf, this_len);
 		break;
 
 	case PAYLOAD_VENDOR:
-	        ike_pl_vendor_print(buf+4, this_len, doi);
+		ike_pl_vendor_print(buf+4, this_len, doi);
 		break;
 
 	case PAYLOAD_ATTRIBUTE:
-	        ike_pl_attribute_print(buf+4, this_len);
+		ike_pl_attribute_print(buf+4, this_len);
 		break;
 
 	default:
 	}
 	ike_tab_level--;
 
-	if(next_type)  /* Recurse over next payload */
-	        ike_pl_print(next_type, buf + this_len, doi);
+	if (next_type)  /* Recurse over next payload */
+		ike_pl_print(next_type, buf + this_len, doi);
 
 	return;
 
@@ -696,5 +691,4 @@ pltrunc:
 		fputs(" [|isakmp]", stdout);
 	else
 		fputs(" [|ipsec]", stdout);
-
 }