summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_ah.c16
-rw-r--r--sys/netinet/ip_ah_new.c18
-rw-r--r--sys/netinet/ip_ah_old.c12
-rw-r--r--sys/netinet/ip_esp.c18
-rw-r--r--sys/netinet/ip_esp_new.c36
-rw-r--r--sys/netinet/ip_esp_old.c20
-rw-r--r--sys/netinet/ip_ipsp.c8
-rw-r--r--sys/netinet/ip_output.c7
8 files changed, 64 insertions, 71 deletions
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c
index f67359bb4f8..1684b65e86a 100644
--- a/sys/netinet/ip_ah.c
+++ b/sys/netinet/ip_ah.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ah.c,v 1.10 1997/07/27 23:30:33 niklas Exp $ */
+/* $OpenBSD: ip_ah.c,v 1.11 1997/09/28 22:57:43 deraadt Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -110,7 +110,7 @@ ah_input(register struct mbuf *m, int iphlen)
tdbp = gettdb(ahp->ah_spi, ipo->ip_dst, IPPROTO_AH);
if (tdbp == NULL)
{
- log(LOG_ERR, "ah_input(): could not find SA for AH packet from %x to %x, spi %08x", ipo->ip_src, ipo->ip_dst, ntohl(ahp->ah_spi));
+ log(LOG_ERR, "ah_input(): could not find SA for AH packet from %x to %x, spi %08x\n", ipo->ip_src, ipo->ip_dst, ntohl(ahp->ah_spi));
m_freem(m);
ahstat.ahs_notdb++;
return;
@@ -119,7 +119,7 @@ ah_input(register struct mbuf *m, int iphlen)
if (tdbp->tdb_flags & TDBF_INVALID)
{
log(LOG_ALERT,
- "ah_input(): attempted to use invalid AH SA %08x, packet %x->%x",
+ "ah_input(): attempted to use invalid AH SA %08x, packet %x->%x\n",
ntohl(ahp->ah_spi), ipo->ip_src, ipo->ip_dst);
m_freem(m);
ahstat.ahs_invalid++;
@@ -128,7 +128,7 @@ ah_input(register struct mbuf *m, int iphlen)
if (tdbp->tdb_xform == NULL)
{
- log(LOG_ALERT, "ah_input(): attempted to use uninitialized AH SA %08x, packet from %x to %x", ntohl(ahp->ah_spi), ipo->ip_src, ipo->ip_dst);
+ log(LOG_ALERT, "ah_input(): attempted to use uninitialized AH SA %08x, packet from %x to %x\n", ntohl(ahp->ah_spi), ipo->ip_src, ipo->ip_dst);
m_freem(m);
ahstat.ahs_noxform++;
return;
@@ -147,7 +147,7 @@ ah_input(register struct mbuf *m, int iphlen)
if (exp == (struct expiration *) NULL)
{
log(LOG_WARNING,
- "ah_input(): out of memory for expiration timer");
+ "ah_input(): out of memory for expiration timer\n");
ahstat.ahs_hdrops++;
m_freem(m);
return;
@@ -168,7 +168,7 @@ ah_input(register struct mbuf *m, int iphlen)
if (exp == (struct expiration *) NULL)
{
log(LOG_WARNING,
- "ah_input(): out of memory for expiration timer");
+ "ah_input(): out of memory for expiration timer\n");
ahstat.ahs_hdrops++;
m_freem(m);
return;
@@ -189,7 +189,7 @@ ah_input(register struct mbuf *m, int iphlen)
m = (*(tdbp->tdb_xform->xf_input))(m, tdbp);
if (m == NULL)
{
- log(LOG_ALERT, "ah_input(): authentication failed for AH packet from %x to %x, spi %08x", ipn.ip_src, ipn.ip_dst, ntohl(ahn.ah_spi));
+ log(LOG_ALERT, "ah_input(): authentication failed for AH packet from %x to %x, spi %08x\n", ipn.ip_src, ipn.ip_dst, ntohl(ahn.ah_spi));
ahstat.ahs_badkcr++;
return;
}
@@ -212,7 +212,7 @@ ah_input(register struct mbuf *m, int iphlen)
}
else /* So we're paranoid */
{
- log(LOG_ALERT, "ah_input(): AH-tunnel used when expecting AH-transport, SA %08x/%x", tdbp->tdb_spi, tdbp->tdb_dst);
+ log(LOG_ALERT, "ah_input(): AH-tunnel used when expecting AH-transport, SA %08x/%x\n", tdbp->tdb_spi, tdbp->tdb_dst);
m_freem(m);
ahstat.ahs_hdrops++;
return;
diff --git a/sys/netinet/ip_ah_new.c b/sys/netinet/ip_ah_new.c
index d4b4a0e4fbb..fd9c16cc9cd 100644
--- a/sys/netinet/ip_ah_new.c
+++ b/sys/netinet/ip_ah_new.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ah_new.c,v 1.8 1997/09/23 21:42:20 angelos Exp $ */
+/* $OpenBSD: ip_ah_new.c,v 1.9 1997/09/28 22:57:44 deraadt Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -107,7 +107,7 @@ ah_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
em = mtod(m, struct encap_msghdr *);
if (em->em_msglen - EMT_SETSPI_FLEN <= AH_NEW_XENCAP_LEN)
{
- log(LOG_WARNING, "ah_new_init() initialization failed");
+ log(LOG_WARNING, "ah_new_init() initialization failed\n");
return EINVAL;
}
@@ -128,13 +128,13 @@ ah_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
break;
default:
- log(LOG_WARNING, "ah_new_init(): unsupported authentication algorithm %d specified", txd.amx_hash_algorithm);
+ log(LOG_WARNING, "ah_new_init(): unsupported authentication algorithm %d specified\n", txd.amx_hash_algorithm);
return EINVAL;
}
if (txd.amx_keylen + EMT_SETSPI_FLEN + AH_NEW_XENCAP_LEN != em->em_msglen)
{
- log(LOG_WARNING, "ah_new_init(): message length (%d) doesn't match",
+ log(LOG_WARNING, "ah_new_init(): message length (%d) doesn't match\n",
em->em_msglen);
return EINVAL;
}
@@ -286,7 +286,7 @@ ah_new_input(struct mbuf *m, struct tdb *tdb)
default:
log(LOG_ALERT,
- "ah_new_input(): unsupported algorithm %d in SA %x/%08x",
+ "ah_new_input(): unsupported algorithm %d in SA %x/%08x\n",
xd->amx_hash_algorithm, tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
return NULL;
@@ -367,7 +367,7 @@ ah_new_input(struct mbuf *m, struct tdb *tdb)
case 2:
case 3:
- log(LOG_WARNING, "ah_new_input(): duplicate packet received, %x->%x spi %08x", ip->ip_src, ip->ip_dst, ntohl(ah->ah_spi));
+ log(LOG_WARNING, "ah_new_input(): duplicate packet received, %x->%x spi %08x\n", ip->ip_src, ip->ip_dst, ntohl(ah->ah_spi));
ahstat.ahs_replay++;
break;
}
@@ -553,7 +553,7 @@ ah_new_input(struct mbuf *m, struct tdb *tdb)
if (bcmp(aho->ah_data, ah->ah_data, AH_HMAC_HASHLEN))
{
log(LOG_ALERT,
- "ah_new_input(): authentication failed for packet from %x to %x, spi %08x", ip->ip_src, ip->ip_dst, ntohl(ah->ah_spi));
+ "ah_new_input(): authentication failed for packet from %x to %x, spi %08x\n", ip->ip_src, ip->ip_dst, ntohl(ah->ah_spi));
#ifdef ENCDEBUG
if (encdebug)
{
@@ -699,7 +699,7 @@ ah_new_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
default:
log(LOG_ALERT,
- "ah_new_output(): unsupported algorithm %d in SA %x/%08x",
+ "ah_new_output(): unsupported algorithm %d in SA %x/%08x\n",
xd->amx_hash_algorithm, tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
return NULL;
@@ -730,7 +730,7 @@ ah_new_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
if (xd->amx_rpl == 0)
{
- log(LOG_ALERT, "ah_new_output(): SA %x/%0x8 should have expired",
+ log(LOG_ALERT, "ah_new_output(): SA %x/%0x8 should have expired\n",
tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
ahstat.ahs_wrap++;
diff --git a/sys/netinet/ip_ah_old.c b/sys/netinet/ip_ah_old.c
index e680b8c3f22..c847bcb582b 100644
--- a/sys/netinet/ip_ah_old.c
+++ b/sys/netinet/ip_ah_old.c
@@ -102,7 +102,7 @@ ah_old_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
em = mtod(m, struct encap_msghdr *);
if (em->em_msglen - EMT_SETSPI_FLEN <= AH_OLD_XENCAP_LEN)
{
- log(LOG_WARNING, "ah_old_init(): initialization failed");
+ log(LOG_WARNING, "ah_old_init(): initialization failed\n");
return EINVAL;
}
@@ -122,14 +122,14 @@ ah_old_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
break;
default:
- log(LOG_WARNING, "ah_old_init(): unsupported authentication algorithm %d specified", xenc.amx_hash_algorithm);
+ log(LOG_WARNING, "ah_old_init(): unsupported authentication algorithm %d specified\n", xenc.amx_hash_algorithm);
m_freem(m);
return EINVAL;
}
if (xenc.amx_keylen + EMT_SETSPI_FLEN + AH_OLD_XENCAP_LEN != em->em_msglen)
{
- log(LOG_WARNING, "ah_old_init(): message length (%d) doesn't match",
+ log(LOG_WARNING, "ah_old_init(): message length (%d) doesn't match\n",
em->em_msglen);
return EINVAL;
}
@@ -229,7 +229,7 @@ ah_old_input(struct mbuf *m, struct tdb *tdb)
default:
log(LOG_ALERT,
- "ah_old_input(): unsupported algorithm %d in SA %x/%08x",
+ "ah_old_input(): unsupported algorithm %d in SA %x/%08x\n",
xd->amx_hash_algorithm, tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
return NULL;
@@ -449,7 +449,7 @@ ah_old_input(struct mbuf *m, struct tdb *tdb)
if (bcmp(aho->ah_data, ah->ah_data, alen))
{
- log(LOG_ALERT, "ah_old_input(): authentication failed for packet from %x to %x, spi %08x", ipo.ip_src, ipo.ip_dst, ntohl(tdb->tdb_spi));
+ log(LOG_ALERT, "ah_old_input(): authentication failed for packet from %x to %x, spi %08x\n", ipo.ip_src, ipo.ip_dst, ntohl(tdb->tdb_spi));
ahstat.ahs_badauth++;
m_freem(m);
return NULL;
@@ -576,7 +576,7 @@ ah_old_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
default:
log(LOG_ALERT,
- "ah_old_output(): unsupported algorithm %d in SA %x/%08x",
+ "ah_old_output(): unsupported algorithm %d in SA %x/%08x\n",
xd->amx_hash_algorithm, tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
return NULL;
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index c1b605f6f97..85902ac9a42 100644
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_esp.c,v 1.10 1997/07/27 23:30:35 niklas Exp $ */
+/* $OpenBSD: ip_esp.c,v 1.11 1997/09/28 22:57:46 deraadt Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -109,7 +109,7 @@ esp_input(register struct mbuf *m, int iphlen)
tdbp = gettdb(spi, ipo->ip_dst, IPPROTO_ESP);
if (tdbp == NULL)
{
- log(LOG_ERR, "esp_input(): could not find SA for ESP packet from %x to %x, spi %08x", ipo->ip_src, ipo->ip_dst, ntohl(spi));
+ log(LOG_ERR, "esp_input(): could not find SA for ESP packet from %x to %x, spi %08x\n", ipo->ip_src, ipo->ip_dst, ntohl(spi));
m_freem(m);
espstat.esps_notdb++;
return;
@@ -117,9 +117,7 @@ esp_input(register struct mbuf *m, int iphlen)
if (tdbp->tdb_flags & TDBF_INVALID)
{
- log(LOG_ALERT,
- "esp_input(): attempted to use invalid ESP SA %08x, packet %x->%x",
- ntohl(spi), ipo->ip_src, ipo->ip_dst);
+ log(LOG_ALERT, "esp_input(): attempted to use invalid ESP SA %08x, packet %x->%x\n", ntohl(spi), ipo->ip_src, ipo->ip_dst);
m_freem(m);
espstat.esps_invalid++;
return;
@@ -127,7 +125,7 @@ esp_input(register struct mbuf *m, int iphlen)
if (tdbp->tdb_xform == NULL)
{
- log(LOG_ALERT, "esp_input(): attempted to use uninitialized ESP SA %08x, packet from %x to %x", ntohl(spi), ipo->ip_src, ipo->ip_dst);
+ log(LOG_ALERT, "esp_input(): attempted to use uninitialized ESP SA %08x, packet from %x to %x\n", ntohl(spi), ipo->ip_src, ipo->ip_dst);
m_freem(m);
espstat.esps_noxform++;
return;
@@ -146,7 +144,7 @@ esp_input(register struct mbuf *m, int iphlen)
if (exp == (struct expiration *) NULL)
{
log(LOG_WARNING,
- "esp_input(): out of memory for expiration timer");
+ "esp_input(): out of memory for expiration timer\n");
espstat.esps_hdrops++;
m_freem(m);
return;
@@ -167,7 +165,7 @@ esp_input(register struct mbuf *m, int iphlen)
if (exp == (struct expiration *) NULL)
{
log(LOG_WARNING,
- "esp_input(): out of memory for expiration timer");
+ "esp_input(): out of memory for expiration timer\n");
espstat.esps_hdrops++;
m_freem(m);
return;
@@ -188,7 +186,7 @@ esp_input(register struct mbuf *m, int iphlen)
if (m == NULL)
{
- log(LOG_ALERT, "esp_input(): processing failed for ESP packet from %x to %x, spi %08x", ipn.ip_src, ipn.ip_dst, ntohl(spi));
+ log(LOG_ALERT, "esp_input(): processing failed for ESP packet from %x to %x, spi %08x\n", ipn.ip_src, ipn.ip_dst, ntohl(spi));
espstat.esps_badkcr++;
return;
}
@@ -211,7 +209,7 @@ esp_input(register struct mbuf *m, int iphlen)
}
else /* So we're paranoid */
{
- log(LOG_ALERT, "esp_input(): ESP-tunnel used when expecting ESP-transport, SA %08x/%x", tdbp->tdb_spi, tdbp->tdb_dst);
+ log(LOG_ALERT, "esp_input(): ESP-tunnel used when expecting ESP-transport, SA %08x/%x\n", tdbp->tdb_spi, tdbp->tdb_dst);
m_freem(m);
espstat.esps_hdrops++;
return;
diff --git a/sys/netinet/ip_esp_new.c b/sys/netinet/ip_esp_new.c
index cf34d6b85ef..3df20e5d4fc 100644
--- a/sys/netinet/ip_esp_new.c
+++ b/sys/netinet/ip_esp_new.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_esp_new.c,v 1.5 1997/09/24 18:39:40 angelos Exp $ */
+/* $OpenBSD: ip_esp_new.c,v 1.6 1997/09/28 22:57:47 deraadt Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -112,7 +112,7 @@ esp_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
em = mtod(m, struct encap_msghdr *);
if (em->em_msglen - EMT_SETSPI_FLEN <= ESP_NEW_XENCAP_LEN)
{
- log(LOG_WARNING, "esp_new_init(): initialization failed");
+ log(LOG_WARNING, "esp_new_init(): initialization failed\n");
return EINVAL;
}
@@ -132,7 +132,7 @@ esp_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
break;
default:
- log(LOG_WARNING, "esp_new_init(): unsupported encryption algorithm %d specified", txd.edx_enc_algorithm);
+ log(LOG_WARNING, "esp_new_init(): unsupported encryption algorithm %d specified\n", txd.edx_enc_algorithm);
return EINVAL;
}
@@ -150,14 +150,14 @@ esp_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
break;
default:
- log(LOG_WARNING, "esp_new_init(): unsupported authentication algorithm %d specified", txd.edx_enc_algorithm);
+ log(LOG_WARNING, "esp_new_init(): unsupported authentication algorithm %d specified\n", txd.edx_enc_algorithm);
return EINVAL;
}
if (txd.edx_ivlen + txd.edx_keylen + EMT_SETSPI_FLEN + ESP_NEW_XENCAP_LEN
!= em->em_msglen)
{
- log(LOG_WARNING, "esp_new_init(): message length (%d) doesn't match",
+ log(LOG_WARNING, "esp_new_init(): message length (%d) doesn't match\n",
em->em_msglen);
return EINVAL;
}
@@ -167,14 +167,14 @@ esp_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
case ALG_ENC_DES:
if ((txd.edx_ivlen != 0) && (txd.edx_ivlen != 8))
{
- log(LOG_WARNING, "esp_new_init(): unsupported IV length %d",
+ log(LOG_WARNING, "esp_new_init(): unsupported IV length %d\n",
txd.edx_ivlen);
return EINVAL;
}
if (txd.edx_keylen < 8)
{
- log(LOG_WARNING, "esp_new_init(): bad key length",
+ log(LOG_WARNING, "esp_new_init(): bad key length\n",
txd.edx_keylen);
return EINVAL;
}
@@ -185,14 +185,14 @@ esp_new_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
case ALG_ENC_3DES:
if ((txd.edx_ivlen != 0) && (txd.edx_ivlen != 8))
{
- log(LOG_WARNING, "esp_new_init(): unsupported IV length %d",
+ log(LOG_WARNING, "esp_new_init(): unsupported IV length %d\n",
txd.edx_ivlen);
return EINVAL;
}
if (txd.edx_keylen < 24)
{
- log(LOG_WARNING, "esp_new_init(): bad key length",
+ log(LOG_WARNING, "esp_new_init(): bad key length\n",
txd.edx_keylen);
return EINVAL;
}
@@ -391,7 +391,7 @@ esp_new_input(struct mbuf *m, struct tdb *tdb)
default:
log(LOG_ALERT,
- "esp_new_input(): unsupported algorithm %d in SA %x/%08x",
+ "esp_new_input(): unsupported algorithm %d in SA %x/%08x\n",
xd->edx_enc_algorithm, tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
return NULL;
@@ -407,9 +407,7 @@ esp_new_input(struct mbuf *m, struct tdb *tdb)
break;
default:
- log(LOG_ALERT,
- "esp_new_input(): unsupported algorithm %d in SA %x/%08x",
- xd->edx_hash_algorithm, tdb->tdb_dst,
+ log(LOG_ALERT, "esp_new_input(): unsupported algorithm %d in SA %x/%08x\n", xd->edx_hash_algorithm, tdb->tdb_dst,
ntohl(tdb->tdb_spi));
m_freem(m);
return NULL;
@@ -480,7 +478,7 @@ esp_new_input(struct mbuf *m, struct tdb *tdb)
case 2:
case 3:
- log(LOG_WARNING, "esp_new_input(): duplicate packet received, %x->%x spi %08x", ip->ip_src, ip->ip_dst, ntohl(esp->esp_spi));
+ log(LOG_WARNING, "esp_new_input(): duplicate packet received, %x->%x spi %08x\n", ip->ip_src, ip->ip_dst, ntohl(esp->esp_spi));
espstat.esps_replay++;
break;
}
@@ -593,7 +591,7 @@ esp_new_input(struct mbuf *m, struct tdb *tdb)
if (bcmp(buf2, buf, AH_HMAC_HASHLEN))
{
log(LOG_ALERT,
- "esp_new_input(): authentication failed for packet from %x to %x, spi %08x", ip->ip_src, ip->ip_dst, ntohl(esp->esp_spi));
+ "esp_new_input(): authentication failed for packet from %x to %x, spi %08x\n", ip->ip_src, ip->ip_dst, ntohl(esp->esp_spi));
espstat.esps_badauth++;
m_freem(m);
return NULL;
@@ -848,7 +846,7 @@ esp_new_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
default:
log(LOG_ALERT,
- "esp_new_output(): unsupported algorithm %d in SA %x/%08x",
+ "esp_new_output(): unsupported algorithm %d in SA %x/%08x\n",
xd->edx_enc_algorithm, tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
return NULL;
@@ -869,9 +867,7 @@ esp_new_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
break;
default:
- log(LOG_ALERT,
- "esp_new_output(): unsupported algorithm %d in SA %x/%08x",
- xd->edx_hash_algorithm, tdb->tdb_dst, ntohl(tdb->tdb_spi));
+ log(LOG_ALERT, "esp_new_output(): unsupported algorithm %d in SA %x/%08x\n", xd->edx_hash_algorithm, tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
return NULL;
}
@@ -894,7 +890,7 @@ esp_new_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
if (xd->edx_rpl == 0)
{
- log(LOG_ALERT, "esp_new_output(): SA %x/%0x8 should have expired",
+ log(LOG_ALERT, "esp_new_output(): SA %x/%0x8 should have expired\n",
tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
espstat.esps_wrap++;
diff --git a/sys/netinet/ip_esp_old.c b/sys/netinet/ip_esp_old.c
index 5e403ded801..92e6ecb1db8 100644
--- a/sys/netinet/ip_esp_old.c
+++ b/sys/netinet/ip_esp_old.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_esp_old.c,v 1.5 1997/08/26 12:02:50 provos Exp $ */
+/* $OpenBSD: ip_esp_old.c,v 1.6 1997/09/28 22:57:49 deraadt Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -106,7 +106,7 @@ esp_old_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
em = mtod(m, struct encap_msghdr *);
if (em->em_msglen - EMT_SETSPI_FLEN <= ESP_OLD_XENCAP_LEN)
{
- log(LOG_WARNING, "esp_old_init(): initialization failed");
+ log(LOG_WARNING, "esp_old_init(): initialization failed\n");
return EINVAL;
}
@@ -126,14 +126,14 @@ esp_old_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
break;
default:
- log(LOG_WARNING, "esp_old_init(): unsupported encryption algorithm %d specified", xenc.edx_enc_algorithm);
+ log(LOG_WARNING, "esp_old_init(): unsupported encryption algorithm %d specified\n", xenc.edx_enc_algorithm);
return EINVAL;
}
if (xenc.edx_ivlen + xenc.edx_keylen + EMT_SETSPI_FLEN +
ESP_OLD_XENCAP_LEN != em->em_msglen)
{
- log(LOG_WARNING, "esp_old_init(): message length (%d) doesn't match",
+ log(LOG_WARNING, "esp_old_init(): message length (%d) doesn't match\n",
em->em_msglen);
return EINVAL;
}
@@ -143,14 +143,14 @@ esp_old_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
case ALG_ENC_DES:
if ((xenc.edx_ivlen != 4) && (xenc.edx_ivlen != 8))
{
- log(LOG_WARNING, "esp_old_init(): unsupported IV length %d",
+ log(LOG_WARNING, "esp_old_init(): unsupported IV length %d\n",
xenc.edx_ivlen);
return EINVAL;
}
if (xenc.edx_keylen != 8)
{
- log(LOG_WARNING, "esp_old_init(): bad key length",
+ log(LOG_WARNING, "esp_old_init(): bad key length\n",
xenc.edx_keylen);
return EINVAL;
}
@@ -160,14 +160,14 @@ esp_old_init(struct tdb *tdbp, struct xformsw *xsp, struct mbuf *m)
case ALG_ENC_3DES:
if ((xenc.edx_ivlen != 4) && (xenc.edx_ivlen != 8))
{
- log(LOG_WARNING, "esp_old_init(): unsupported IV length %d",
+ log(LOG_WARNING, "esp_old_init(): unsupported IV length %d\n",
xenc.edx_ivlen);
return EINVAL;
}
if (xenc.edx_keylen != 24)
{
- log(LOG_WARNING, "esp_old_init(): bad key length",
+ log(LOG_WARNING, "esp_old_init(): bad key length\n",
xenc.edx_keylen);
return EINVAL;
}
@@ -264,7 +264,7 @@ esp_old_input(struct mbuf *m, struct tdb *tdb)
default:
log(LOG_ALERT,
- "esp_old_input(): unsupported algorithm %d in SA %x/%08x",
+ "esp_old_input(): unsupported algorithm %d in SA %x/%08x\n",
xd->edx_enc_algorithm, tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
return NULL;
@@ -542,7 +542,7 @@ esp_old_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
default:
log(LOG_ALERT,
- "esp_old_output(): unsupported algorithm %d in SA %x/%08x",
+ "esp_old_output(): unsupported algorithm %d in SA %x/%08x\n",
xd->edx_enc_algorithm, tdb->tdb_dst, ntohl(tdb->tdb_spi));
m_freem(m);
return NULL;
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index af76cd76140..806fffdd506 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipsp.c,v 1.19 1997/09/23 21:42:21 angelos Exp $ */
+/* $OpenBSD: ip_ipsp.c,v 1.20 1997/09/28 22:57:50 deraadt Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -307,7 +307,7 @@ put_expiration(struct expiration *exp)
{
#ifdef ENCDEBUG
if (encdebug)
- log(LOG_WARNING, "put_expiration(): NULL argument");
+ log(LOG_WARNING, "put_expiration(): NULL argument\n");
#endif /* ENCDEBUG */
return;
}
@@ -510,8 +510,8 @@ tdb_init(struct tdb *tdbp, struct mbuf *m)
if (xsp->xf_type == alg)
return (*(xsp->xf_init))(tdbp, xsp, m);
- log(LOG_ERR, "tdb_init(): no alg %d for spi %08x, addr %x, proto %d", alg,
- ntohl(tdbp->tdb_spi), tdbp->tdb_dst.s_addr, tdbp->tdb_sproto);
+ log(LOG_ERR, "tdb_init(): no alg %d for spi %08x, addr %x, proto %d\n",
+ alg, ntohl(tdbp->tdb_spi), tdbp->tdb_dst.s_addr, tdbp->tdb_sproto);
return EINVAL;
}
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 14edb69ecd3..eef35d2cbb5 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_output.c,v 1.22 1997/08/26 20:07:38 deraadt Exp $ */
+/* $OpenBSD: ip_output.c,v 1.23 1997/09/28 22:57:50 deraadt Exp $ */
/* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */
/*
@@ -263,7 +263,7 @@ ip_output(m0, va_alist)
/* Check if the SPI is invalid */
if (tdb->tdb_flags & TDBF_INVALID) {
log(LOG_ALERT,
- "ip_output(): attempt to use invalid SA %08x/%x/%x",
+ "ip_output(): attempt to use invalid SA %08x/%x/%x\n",
ntohl(tdb->tdb_spi), tdb->tdb_dst,
tdb->tdb_sproto);
m_freem(m);
@@ -358,8 +358,7 @@ ip_output(m0, va_alist)
exp = get_expiration();
if (exp == NULL) {
expbail:
- log(LOG_WARNING, "ip_output()"
- ": no mem for exp timer");
+ log(LOG_WARNING, "ip_output(): no memory for exp timer\n");
m_freem(m);
RTFREE(re->re_rt);
return ENOBUFS;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 19:21:58 +0000