diff options
author | ume <ume@FreeBSD.org> | 2001-11-05 16:46:24 +0000 |
---|---|---|
committer | ume <ume@FreeBSD.org> | 2001-11-05 16:46:24 +0000 |
commit | 6bd8569386ec2b38860d87ad7c895761dfaf1f26 (patch) | |
tree | edacd5d28a81025f98f90683d86d84e15c2ab02f /sys/netkey/keysock.c | |
parent | 11bc0f4ff10912570e2db4262efd20900854573e (diff) | |
download | FreeBSD-src-6bd8569386ec2b38860d87ad7c895761dfaf1f26.zip FreeBSD-src-6bd8569386ec2b38860d87ad7c895761dfaf1f26.tar.gz |
- net.inet.ipsec.esp_auth hasn't been there
- nuke all debug printfs, which are unneeded by now.
- get rid of #ifdef IPSEC_DEBUG in headers
- now that key_debug_level is always defined, there's no need for
#ifdef IPSEC_DEBUG around sysctl MIB code (net.key.debug).
- switch all debug printf() to ipseclog().
Obtained from: KAME
MFC after: 1 week
Diffstat (limited to 'sys/netkey/keysock.c')
-rw-r--r-- | sys/netkey/keysock.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c index 76f6482..db074be 100644 --- a/sys/netkey/keysock.c +++ b/sys/netkey/keysock.c @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $KAME: keysock.c,v 1.24 2000/12/03 00:41:48 itojun Exp $ */ +/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -97,9 +97,6 @@ key_output(m, va_alist) len = m->m_pkthdr.len; if (len < sizeof(struct sadb_msg)) { -#ifdef IPSEC_DEBUG - printf("key_output: Invalid message length.\n"); -#endif pfkeystat.out_tooshort++; error = EINVAL; goto end; @@ -107,9 +104,6 @@ key_output(m, va_alist) if (m->m_len < sizeof(struct sadb_msg)) { if ((m = m_pullup(m, sizeof(struct sadb_msg))) == 0) { -#ifdef IPSEC_DEBUG - printf("key_output: can't pullup mbuf\n"); -#endif pfkeystat.out_nomem++; error = ENOBUFS; goto end; @@ -119,16 +113,11 @@ key_output(m, va_alist) if ((m->m_flags & M_PKTHDR) == 0) panic("key_output: not M_PKTHDR ??"); -#ifdef IPSEC_DEBUG KEYDEBUG(KEYDEBUG_KEY_DUMP, kdebug_mbuf(m)); -#endif msg = mtod(m, struct sadb_msg *); pfkeystat.out_msgtype[msg->sadb_msg_type]++; if (len != PFKEY_UNUNIT64(msg->sadb_msg_len)) { -#ifdef IPSEC_DEBUG - printf("key_output: Invalid message length.\n"); -#endif pfkeystat.out_invlen++; error = EINVAL; goto end; @@ -163,9 +152,6 @@ key_sendup0(rp, m, promisc) if (m && m->m_len < sizeof(struct sadb_msg)) m = m_pullup(m, sizeof(struct sadb_msg)); if (!m) { -#ifdef IPSEC_DEBUG - printf("key_sendup0: cannot pullup\n"); -#endif pfkeystat.in_nomem++; m_freem(m); return ENOBUFS; @@ -184,9 +170,6 @@ key_sendup0(rp, m, promisc) if (!sbappendaddr(&rp->rcb_socket->so_rcv, (struct sockaddr *)&key_src, m, NULL)) { -#ifdef IPSEC_DEBUG - printf("key_sendup0: sbappendaddr failed\n"); -#endif pfkeystat.in_nomem++; m_freem(m); error = ENOBUFS; @@ -366,9 +349,6 @@ key_sendup_mbuf(so, m, target) continue; if ((n = m_copy(m, 0, (int)M_COPYALL)) == NULL) { -#ifdef IPSEC_DEBUG - printf("key_sendup: m_copy fail\n"); -#endif m_freem(m); pfkeystat.in_nomem++; return ENOBUFS; @@ -438,7 +418,6 @@ key_attach(struct socket *so, int proto, struct thread *td) free(kp, M_PCB); so->so_pcb = (caddr_t) 0; splx(s); - printf("key_usrreq: key_usrreq results %d\n", error); return error; } |