Module Name: src
Committed By: tteras
Date: Tue Apr 21 18:38:32 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: grabmyaddr.c grabmyaddr.h
session.c
Log Message:
Fix strict_address to work again. The lists needs to be initialized
before configuration is read, which happens before my_addr_init() call.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h
cvs rdiff -u -r1.24 -r1.25 src/crypto/dist/ipsec-tools/src/racoon/session.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.21 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.22
--- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.21 Fri Jan 23 08:05:58 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Tue Apr 21 18:38:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: grabmyaddr.c,v 1.21 2009/01/23 08:05:58 tteras Exp $ */
+/* $NetBSD: grabmyaddr.c,v 1.22 2009/04/21 18:38:31 tteras Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2008 Timo Teras <[email protected]>.
@@ -288,13 +288,17 @@
return bestmatch_port;
}
-int
-myaddr_init()
+void
+myaddr_init_lists()
{
LIST_INIT(&configured);
LIST_INIT(&opened);
+}
- if (!lcconf->strict_address) {
+int
+myaddr_init()
+{
+ if (!lcconf->strict_address) {
lcconf->rtsock = kernel_open_socket();
if (lcconf->rtsock < 0)
return -1;
Index: src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h
diff -u src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h:1.5 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h:1.6
--- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h:1.5 Tue Dec 23 14:03:12 2008
+++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h Tue Apr 21 18:38:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: grabmyaddr.h,v 1.5 2008/12/23 14:03:12 tteras Exp $ */
+/* $NetBSD: grabmyaddr.h,v 1.6 2009/04/21 18:38:32 tteras Exp $ */
/* Id: grabmyaddr.h,v 1.5 2004/06/11 16:00:16 ludvigm Exp */
@@ -34,6 +34,7 @@
#ifndef _GRABMYADDR_H
#define _GRABMYADDR_H
+extern void myaddr_init_lists __P((void));
extern int myaddr_init __P((void));
extern void myaddr_close __P((void));
Index: src/crypto/dist/ipsec-tools/src/racoon/session.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/session.c:1.24 src/crypto/dist/ipsec-tools/src/racoon/session.c:1.25
--- src/crypto/dist/ipsec-tools/src/racoon/session.c:1.24 Fri Jan 23 08:05:58 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/session.c Tue Apr 21 18:38:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: session.c,v 1.24 2009/01/23 08:05:58 tteras Exp $ */
+/* $NetBSD: session.c,v 1.25 2009/04/21 18:38:32 tteras Exp $ */
/* $KAME: session.c,v 1.32 2003/09/24 02:01:17 jinmei Exp $ */
@@ -193,6 +193,8 @@
errx(1, "could not initialize radius config");
#endif
+ myaddr_init_lists();
+
/*
* in order to prefer the parameters by command line,
* saving some parameters before parsing configuration file.
