Mon Oct 27 06:18:09 2008 UTC ()

From Arnaud Ebalard:
initfds() needs to be called only if monitored file descriptor numbers
have changed


(tteras)

diff -r1.186 -r1.187 src/crypto/dist/ipsec-tools/ChangeLog
diff -r1.17 -r1.18 src/crypto/dist/ipsec-tools/src/racoon/session.c

--- src/crypto/dist/ipsec-tools/Attic/ChangeLog 2008/10/27 06:14:04	1.186
+++ src/crypto/dist/ipsec-tools/Attic/ChangeLog 2008/10/27 06:18:08	1.187

 @@ -1,16 +1,18 @@
 -08-27  Timo Teras  <timo.teras@iki.fi>
 	From Arnaud Ebalard <arno@natisbad.org>:
 	* src/racoon/isakmp_var.h: remove duplicate declaration
 	* src/racoon/session.c: initfds() needs to be called only if
 	  monitored file descriptor numbers have changed
 -08-06  Timo Teras  <timo.teras@iki.fi>
 	From Krzysztof Piotr Oledzki <olel@ans.pl>:
 	* src/racoon/{privsep.c|session.c|session.h}: revert parts of
 -08-06 commit; the problem those changes address are already
 	  handled in a sensible way by Cyrus Rahman's patch from 2008-03-06
 -10-09  Timo Teras  <timo.teras@iki.fi>
 	From Arnaud Ebalard <arno@natisbad.org>:
 	* src/racoon/isakmp_quick.c: remove unbindph12() call that is
 	  now done also in remph2()
 -09-25  Yvan Vanhullebus  <vanhu@netasq.com>

--- src/crypto/dist/ipsec-tools/src/racoon/session.c 2008/10/23 10:56:10	1.17
+++ src/crypto/dist/ipsec-tools/src/racoon/session.c 2008/10/27 06:18:09	1.18

 @@ -1,14 +1,14 @@
-/*	$NetBSD: session.c,v 1.17 2008/10/23 10:56:10 tteras Exp $	*/
+/*	$NetBSD: session.c,v 1.18 2008/10/27 06:18:09 tteras Exp $	*/
 /*	$KAME: session.c,v 1.32 2003/09/24 02:01:17 jinmei Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -224,28 +224,26 @@ session(void)
 		for (p = lcconf->myaddrs; p; p = p->next) {
 			if (!p->addr)
 				continue;
 			if (FD_ISSET(p->sock, &rfds))
 				isakmp_handler(p->sock);
+		}
 		if (FD_ISSET(lcconf->sock_pfkey, &rfds))
 			pfkey_handler();
 		if (lcconf->rtsock >= 0 && FD_ISSET(lcconf->rtsock, &rfds)) {
 			if (update_myaddrs() && lcconf->autograbaddr)
 				check_rtsock(NULL);
 			else
 				initfds();
+		}
+	}
+}
 /* clear all status and exit program. */
 static void
 close_session()
+{
 #ifdef ENABLE_FASTQUIT
 	flushph2();
 #endif
 	flushph1();
 	close_sockets();