Module Name: src
Committed By: ozaki-r
Date: Mon May 15 09:55:29 UTC 2017
Modified Files:
src/sys/netipsec: ipsec.c key.c key.h
Log Message:
Show __func__ instead of __FILE__ in debug log messages
__func__ is shorter and more useful than __FILE__.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.124 -r1.125 src/sys/netipsec/key.c
cvs rdiff -u -r1.14 -r1.15 src/sys/netipsec/key.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.88 src/sys/netipsec/ipsec.c:1.89
--- src/sys/netipsec/ipsec.c:1.88 Thu May 11 05:55:14 2017
+++ src/sys/netipsec/ipsec.c Mon May 15 09:55:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.88 2017/05/11 05:55:14 ryo Exp $ */
+/* $NetBSD: ipsec.c,v 1.89 2017/05/15 09:55:29 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.88 2017/05/11 05:55:14 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.89 2017/05/15 09:55:29 ozaki-r Exp $");
/*
* IPsec controller part.
@@ -399,7 +399,7 @@ key_allocsp_default(int af, const char *
return sp;
}
#define KEY_ALLOCSP_DEFAULT(af) \
- key_allocsp_default((af),__FILE__, __LINE__)
+ key_allocsp_default((af), __func__, __LINE__)
/*
* For OUTBOUND packet having a socket. Searching SPD for packet,
Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.124 src/sys/netipsec/key.c:1.125
--- src/sys/netipsec/key.c:1.124 Mon May 15 09:52:05 2017
+++ src/sys/netipsec/key.c Mon May 15 09:55:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.124 2017/05/15 09:52:05 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.125 2017/05/15 09:55:29 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.124 2017/05/15 09:52:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.125 2017/05/15 09:55:29 ozaki-r Exp $");
/*
* This code is referd to RFC 2367
@@ -340,12 +340,12 @@ MALLOC_DEFINE(M_SECA, "key mgmt", "secur
do { \
((p) = malloc((unsigned long)(n), M_SECA, M_NOWAIT)); \
printf("%s %d: %p <- KMALLOC(%s, %d)\n", \
- __FILE__, __LINE__, (p), #t, n); \
+ __func__, __LINE__, (p), #t, n); \
} while (0)
#define KFREE(p) \
do { \
- printf("%s %d: %p -> KFREE()\n", __FILE__, __LINE__, (p)); \
+ printf("%s %d: %p -> KFREE()\n", __func__, __LINE__, (p)); \
free((p), M_SECA); \
} while (0)
#endif
@@ -421,7 +421,7 @@ static struct secasvar *key_newsav (stru
const struct sadb_msghdr *, struct secashead *, int *,
const char*, int);
#define KEY_NEWSAV(m, sadb, sah, e) \
- key_newsav(m, sadb, sah, e, __FILE__, __LINE__)
+ key_newsav(m, sadb, sah, e, __func__, __LINE__)
static void key_delsav (struct secasvar *);
static struct secashead *key_getsah (const struct secasindex *);
static struct secasvar *key_checkspidup (const struct secasindex *, u_int32_t);
Index: src/sys/netipsec/key.h
diff -u src/sys/netipsec/key.h:1.14 src/sys/netipsec/key.h:1.15
--- src/sys/netipsec/key.h:1.14 Mon Mar 30 03:51:50 2015
+++ src/sys/netipsec/key.h Mon May 15 09:55:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: key.h,v 1.14 2015/03/30 03:51:50 ozaki-r Exp $ */
+/* $NetBSD: key.h,v 1.15 2017/05/15 09:55:29 ozaki-r Exp $ */
/* $FreeBSD: src/sys/netipsec/key.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $ */
@@ -67,24 +67,24 @@ void _key_freesp(struct secpolicy **, co
* key_checkrequest were redone.
*/
#define KEY_ALLOCSP(spidx, dir) \
- key_allocsp(spidx, dir, __FILE__, __LINE__)
+ key_allocsp(spidx, dir, __func__, __LINE__)
#define KEY_ALLOCSP2(spi, dst, proto, dir) \
- key_allocsp2(spi, dst, proto, dir, __FILE__, __LINE__)
+ key_allocsp2(spi, dst, proto, dir, __func__, __LINE__)
#define KEY_NEWSP() \
- key_newsp(__FILE__, __LINE__)
+ key_newsp(__func__, __LINE__)
#define KEY_GETTUNNEL(osrc, odst, isrc, idst) \
- key_gettunnel(osrc, odst, isrc, idst, __FILE__, __LINE__)
+ key_gettunnel(osrc, odst, isrc, idst, __func__, __LINE__)
#define KEY_FREESP(spp) \
- _key_freesp(spp, __FILE__, __LINE__)
+ _key_freesp(spp, __func__, __LINE__)
struct secasvar *key_allocsa(const union sockaddr_union *,
u_int, u_int32_t, u_int16_t, u_int16_t, const char*, int);
void key_freesav(struct secasvar **, const char*, int);
#define KEY_ALLOCSA(dst, proto, spi, sport, dport) \
- key_allocsa(dst, proto, spi, sport, dport, __FILE__, __LINE__)
+ key_allocsa(dst, proto, spi, sport, dport, __func__, __LINE__)
#define KEY_FREESAV(psav) \
- key_freesav(psav, __FILE__, __LINE__)
+ key_freesav(psav, __func__, __LINE__)
void key_freeso (struct socket *);
int key_checktunnelsanity (struct secasvar *, u_int, void *, void *);
