CVS commit: src/crypto/dist/ipsec-tools/src/racoon

[Timo Teräs]

Module Name:    src
Committed By:   tteras
Date:           Wed Oct 20 10:56:40 UTC 2010

Modified Files:
        src/crypto/dist/ipsec-tools/src/racoon: grabmyaddr.c

Log Message:
Fix address comparison so we actually close sockets which were bound to
IP-address that got deconfigured.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
    src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.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.23 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.24
--- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.23	Fri Jul  3 06:41:46 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c	Wed Oct 20 10:56:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: grabmyaddr.c,v 1.23 2009/07/03 06:41:46 tteras Exp $	*/
+/*	$NetBSD: grabmyaddr.c,v 1.24 2010/10/20 10:56:39 tteras Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * Copyright (C) 2008 Timo Teras <timo.te...@iki.fi>.
@@ -187,8 +187,9 @@
 	for (my = LIST_FIRST(&opened); my; my = next) {
 		next = LIST_NEXT(my, chain);
 
-		if (!cmpsaddr((struct sockaddr *) &addr,
-			      (struct sockaddr *) &my->addr))
+		if (cmpsaddr((struct sockaddr *) addr,
+			     (struct sockaddr *) &my->addr)
+		    <= CMPSADDR_WOP_MATCH)
 			myaddr_delete(my);
 	}
 }