Use %s and __func__ in DPRINTF() to reduce false positive with grep(1).

ok kettenis@, dhill@, visa@, jca@

1 files changed, 48 insertions, 49 deletions

diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index c4a79f2f54d..a34201245f6 100644
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp.c,v 1.150 2017/08/11 21:24:20 mpi Exp $ */
+/*	$OpenBSD: ip_esp.c,v 1.151 2017/11/06 15:12:43 mpi Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -352,7 +352,7 @@ esp_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff)
 	alen = esph ? esph->authsize : 0;
 	plen = m->m_pkthdr.len - (skip + hlen + alen);
 	if (plen <= 0) {
-		DPRINTF(("esp_input: invalid payload length\n"));
+		DPRINTF(("%s: invalid payload length\n", __func__));
 		espstat.esps_badilen++;
 		m_freem(m);
 		return EINVAL;
@@ -364,8 +364,8 @@ esp_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff)
 		 * block size.
 		 */
 		if (plen & (espx->blocksize - 1)) {
-			DPRINTF(("esp_input(): payload of %d octets "
-			    "not a multiple of %d octets, SA %s/%08x\n",
+			DPRINTF(("%s: payload of %d octets not a multiple of %d"
+			    " octets, SA %s/%08x\n", __func__,
 			    plen, espx->blocksize, ipsp_address(&tdb->tdb_dst,
 			    buf, sizeof(buf)), ntohl(tdb->tdb_spi)));
 			espstat.esps_badilen++;
@@ -385,32 +385,33 @@ esp_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff)
 			break;
 		case 1:
 			m_freem(m);
-			DPRINTF(("esp_input(): replay counter wrapped"
-			    " for SA %s/%08x\n",
+			DPRINTF(("%s: replay counter wrapped for SA %s/%08x\n",
+			    __func__,
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi)));
 			espstat.esps_wrap++;
 			return EACCES;
 		case 2:
 			m_freem(m);
-			DPRINTF(("esp_input(): old packet received"
-			    " in SA %s/%08x\n",
+			DPRINTF(("%s: old packet received in SA %s/%08x\n",
+			    __func__,
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi)));
 			espstat.esps_replay++;
 			return EACCES;
 		case 3:
 			m_freem(m);
-			DPRINTF(("esp_input(): duplicate packet received"
-			    " in SA %s/%08x\n",
+			DPRINTF(("%s: duplicate packet received"
+			    " in SA %s/%08x\n", __func__,
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi)));
 			espstat.esps_replay++;
 			return EACCES;
 		default:
 			m_freem(m);
-			DPRINTF(("esp_input(): bogus value from"
+			DPRINTF(("%s: bogus value from"
 			    " checkreplaywindow() in SA %s/%08x\n",
+			    __func__,
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi)));
 			espstat.esps_replay++;
@@ -442,7 +443,7 @@ esp_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff)
 	crp = crypto_getreq(esph && espx ? 2 : 1);
 	if (crp == NULL) {
 		m_freem(m);
-		DPRINTF(("esp_input(): failed to acquire crypto descriptors\n"));
+		DPRINTF(("%s: failed to acquire crypto descriptors\n", __func__));
 		espstat.esps_crypto++;
 		return ENOBUFS;
 	}
@@ -455,7 +456,7 @@ esp_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff)
 	if (tc == NULL)	{
 		m_freem(m);
 		crypto_freereq(crp);
-		DPRINTF(("esp_input(): failed to allocate tdb_crypto\n"));
+		DPRINTF(("%s: failed to allocate tdb_crypto\n", __func__));
 		espstat.esps_crypto++;
 		return ENOBUFS;
 	}
@@ -552,7 +553,7 @@ esp_input_cb(struct cryptop *crp)
 		free(tc, M_XDATA, 0);
 		crypto_freereq(crp);
 		espstat.esps_crypto++;
-		DPRINTF(("esp_input_cb(): bogus returned buffer from crypto\n"));
+		DPRINTF(("%s: bogus returned buffer from crypto\n", __func__));
 		return;
 	}
 
@@ -562,7 +563,7 @@ esp_input_cb(struct cryptop *crp)
 	if (tdb == NULL) {
 		free(tc, M_XDATA, 0);
 		espstat.esps_notdb++;
-		DPRINTF(("esp_input_cb(): TDB is expired while in crypto"));
+		DPRINTF(("%s: TDB is expired while in crypto", __func__));
 		goto baddone;
 	}
 
@@ -580,7 +581,7 @@ esp_input_cb(struct cryptop *crp)
 		}
 		free(tc, M_XDATA, 0);
 		espstat.esps_noxform++;
-		DPRINTF(("esp_input_cb(): crypto error %d\n", crp->crp_etype));
+		DPRINTF(("%s: crypto error %d\n", __func__, crp->crp_etype));
 		goto baddone;
 	}
 
@@ -595,8 +596,8 @@ esp_input_cb(struct cryptop *crp)
 		/* Verify authenticator */
 		if (timingsafe_bcmp(ptr, aalg, esph->authsize)) {
 			free(tc, M_XDATA, 0);
-			DPRINTF(("esp_input_cb(): authentication "
-			    "failed for packet in SA %s/%08x\n",
+			DPRINTF(("%s: authentication "
+			    "failed for packet in SA %s/%08x\n", __func__,
 			    ipsp_address(&tdb->tdb_dst, buf,
 				sizeof(buf)), ntohl(tdb->tdb_spi)));
 			espstat.esps_badauth++;
@@ -622,29 +623,29 @@ esp_input_cb(struct cryptop *crp)
 			break;
 
 		case 1:
-			DPRINTF(("esp_input_cb(): replay counter wrapped"
-			    " for SA %s/%08x\n",
+			DPRINTF(("%s: replay counter wrapped for SA %s/%08x\n",
+			    __func__,
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi)));
 			espstat.esps_wrap++;
 			goto baddone;
 		case 2:
-			DPRINTF(("esp_input_cb(): old packet received"
-			    " in SA %s/%08x\n",
+			DPRINTF(("%s: old packet received in SA %s/%08x\n",
+			    __func__,
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi)));
 			espstat.esps_replay++;
 			goto baddone;
 		case 3:
-			DPRINTF(("esp_input_cb(): duplicate packet received"
-			    " in SA %s/%08x\n",
+			DPRINTF(("%s: duplicate packet received"
+			    " in SA %s/%08x\n", __func__,
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi)));
 			espstat.esps_replay++;
 			goto baddone;
 		default:
-			DPRINTF(("esp_input_cb(): bogus value from"
-			    " checkreplaywindow() in SA %s/%08x\n",
+			DPRINTF(("%s: bogus value from"
+			    " checkreplaywindow() in SA %s/%08x\n", __func__,
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi)));
 			espstat.esps_replay++;
@@ -663,7 +664,7 @@ esp_input_cb(struct cryptop *crp)
 	if (m1 == NULL)	{
 		espstat.esps_hdrops++;
 		NET_UNLOCK();
-		DPRINTF(("esp_input_cb(): bad mbuf chain, SA %s/%08x\n",
+		DPRINTF(("%s: bad mbuf chain, SA %s/%08x\n", __func__,
 		    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 		    ntohl(tdb->tdb_spi)));
 		m_freem(m);
@@ -721,8 +722,8 @@ esp_input_cb(struct cryptop *crp)
 	if (lastthree[1] + 2 > m->m_pkthdr.len - skip) {
 		espstat.esps_badilen++;
 		NET_UNLOCK();
-		DPRINTF(("esp_input_cb(): invalid padding length %d for "
-		    "packet in SA %s/%08x\n", lastthree[1],
+		DPRINTF(("%s: invalid padding length %d for packet in "
+		    "SA %s/%08x\n", __func__, lastthree[1],
 		    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 		    ntohl(tdb->tdb_spi)));
 		m_freem(m);
@@ -733,8 +734,8 @@ esp_input_cb(struct cryptop *crp)
 	if ((lastthree[1] != lastthree[0]) && (lastthree[1] != 0)) {
 		espstat.esps_badenc++;
 		NET_UNLOCK();
-		DPRINTF(("esp_input(): decryption failed for packet in "
-		    "SA %s/%08x\n", ipsp_address(&tdb->tdb_dst, buf,
+		DPRINTF(("%s: decryption failed for packet in SA %s/%08x\n",
+		    __func__, ipsp_address(&tdb->tdb_dst, buf,
 		    sizeof(buf)), ntohl(tdb->tdb_spi)));
 		m_freem(m);
 		return;
@@ -821,8 +822,8 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip,
 	case AF_INET:
 		/* Check for IP maximum packet size violations. */
 		if (skip + hlen + rlen + padding + alen > IP_MAXPACKET)	{
-			DPRINTF(("esp_output(): packet in SA %s/%08x got "
-			    "too big\n", ipsp_address(&tdb->tdb_dst, buf,
+			DPRINTF(("%s: packet in SA %s/%08x got too big\n",
+			    __func__, ipsp_address(&tdb->tdb_dst, buf,
 			    sizeof(buf)),
 			    ntohl(tdb->tdb_spi)));
 			m_freem(m);
@@ -835,8 +836,8 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip,
 	case AF_INET6:
 		/* Check for IPv6 maximum packet size violations. */
 		if (skip + hlen + rlen + padding + alen > IPV6_MAXPACKET) {
-			DPRINTF(("esp_output(): packet in SA %s/%08x got too "
-			    "big\n", ipsp_address(&tdb->tdb_dst, buf,
+			DPRINTF(("%s: packet in SA %s/%08x got too big\n",
+			    __func__, ipsp_address(&tdb->tdb_dst, buf,
 			    sizeof(buf)), ntohl(tdb->tdb_spi)));
 			m_freem(m);
 			espstat.esps_toobig++;
@@ -846,8 +847,8 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip,
 #endif /* INET6 */
 
 	default:
-		DPRINTF(("esp_output(): unknown/unsupported protocol "
-		    "family %d, SA %s/%08x\n", tdb->tdb_dst.sa.sa_family,
+		DPRINTF(("%s: unknown/unsupported protocol family %d, "
+		    "SA %s/%08x\n", __func__, tdb->tdb_dst.sa.sa_family,
 		    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 		    ntohl(tdb->tdb_spi)));
 		m_freem(m);
@@ -887,7 +888,7 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip,
 		struct mbuf *n = m_dup_pkt(m, 0, M_DONTWAIT);
 
 		if (n == NULL) {
-			DPRINTF(("esp_output(): bad mbuf chain, SA %s/%08x\n",
+			DPRINTF(("%s: bad mbuf chain, SA %s/%08x\n", __func__,
 			    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 			    ntohl(tdb->tdb_spi)));
 			espstat.esps_hdrops++;
@@ -902,8 +903,8 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip,
 	/* Inject ESP header. */
 	mo = m_makespace(m, skip, hlen, &roff);
 	if (mo == NULL) {
-		DPRINTF(("esp_output(): failed to inject ESP header for "
-		    "SA %s/%08x\n", ipsp_address(&tdb->tdb_dst, buf,
+		DPRINTF(("%s: failed to inject ESP header for SA %s/%08x\n",
+		    __func__, ipsp_address(&tdb->tdb_dst, buf,
 		    sizeof(buf)), ntohl(tdb->tdb_spi)));
 		m_freem(m);
 		espstat.esps_hdrops++;
@@ -928,7 +929,7 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip,
 	 */
 	mo = m_makespace(m, m->m_pkthdr.len, padding + alen, &roff);
 	if (mo == NULL) {
-		DPRINTF(("esp_output(): m_makespace() failed for SA %s/%08x\n",
+		DPRINTF(("%s: m_makespace() failed for SA %s/%08x\n", __func__,
 		    ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
 		    ntohl(tdb->tdb_spi)));
 		m_freem(m);
@@ -952,8 +953,8 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip,
 	crp = crypto_getreq(esph && espx ? 2 : 1);
 	if (crp == NULL) {
 		m_freem(m);
-		DPRINTF(("esp_output(): failed to acquire crypto "
-		    "descriptors\n"));
+		DPRINTF(("%s: failed to acquire crypto descriptors\n",
+		    __func__));
 		espstat.esps_crypto++;
 		return ENOBUFS;
 	}
@@ -985,7 +986,7 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip,
 	if (tc == NULL) {
 		m_freem(m);
 		crypto_freereq(crp);
-		DPRINTF(("esp_output(): failed to allocate tdb_crypto\n"));
+		DPRINTF(("%s: failed to allocate tdb_crypto\n", __func__));
 		espstat.esps_crypto++;
 		return ENOBUFS;
 	}
@@ -1050,8 +1051,7 @@ esp_output_cb(struct cryptop *crp)
 		free(tc, M_XDATA, 0);
 		crypto_freereq(crp);
 		espstat.esps_crypto++;
-		DPRINTF(("esp_output_cb(): bogus returned buffer from "
-		    "crypto\n"));
+		DPRINTF(("%s: bogus returned buffer from crypto\n", __func__));
 		return;
 	}
 
@@ -1062,7 +1062,7 @@ esp_output_cb(struct cryptop *crp)
 	if (tdb == NULL) {
 		free(tc, M_XDATA, 0);
 		espstat.esps_notdb++;
-		DPRINTF(("esp_output_cb(): TDB is expired while in crypto\n"));
+		DPRINTF(("%s: TDB is expired while in crypto\n", __func__));
 		goto baddone;
 	}
 
@@ -1078,8 +1078,7 @@ esp_output_cb(struct cryptop *crp)
 		}
 		free(tc, M_XDATA, 0);
 		espstat.esps_noxform++;
-		DPRINTF(("esp_output_cb(): crypto error %d\n",
-		    crp->crp_etype));
+		DPRINTF(("%s: crypto error %d\n", __func__, crp->crp_etype));
 		goto baddone;
 	}
 	free(tc, M_XDATA, 0);