[Ipsec-tools-commits] ipsec-tools/src/racoon isakmp_cfg.c,1.16,1.17

[Emmanuel D. <ma...@us...>]

Update of /cvsroot/ipsec-tools/ipsec-tools/src/racoon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23859/src/racoon

Modified Files:
	isakmp_cfg.c 
Log Message:
get the internal IPv4 address in script hooks event if we are a server


Index: isakmp_cfg.c
===================================================================
RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp_cfg.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- isakmp_cfg.c	9 Nov 2004 15:56:00 -0000	1.16
+++ isakmp_cfg.c	11 Nov 2004 12:26:10 -0000	1.17
@@ -1399,8 +1399,15 @@
 #define IP_MAX 40
 	char addrstr[IP_MAX];
 
-	/* Internal IPv4 address */
-	if (iph1->mode_cfg->flags & ISAKMP_CFG_GOT_ADDR4) {
+	/* 
+	 * Internal IPv4 address, either if 
+	 * we are a client or a server.
+	 */
+	if ((iph1->mode_cfg->flags & ISAKMP_CFG_GOT_ADDR4) ||
+#ifdef HAVE_LIBRADIUS
+	    (iph1->mode_cfg->flags & ISAKMP_CFG_ADDR4_RADIUS) ||
+#endif
+	    (iph1->mode_cfg->flags & ISAKMP_CFG_ADDR4_LOCAL)) {
 		inet_ntop(AF_INET, &iph1->mode_cfg->addr4, 
 		    addrstr, IP_MAX);
 	} else