Module Name: src
Committed By: tteras
Date: Mon Aug 10 08:22:13 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: pfkey.c
Log Message:
Don't print EAGAIN error from pfkey_handler(), it can occur normally
under some code paths and is not a hard error in any case.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/crypto/dist/ipsec-tools/src/racoon/pfkey.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/pfkey.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.49 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.50
--- src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.49 Wed Aug 5 13:16:01 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/pfkey.c Mon Aug 10 08:22:13 2009
@@ -1,6 +1,6 @@
-/* $NetBSD: pfkey.c,v 1.49 2009/08/05 13:16:01 tteras Exp $ */
+/* $NetBSD: pfkey.c,v 1.50 2009/08/10 08:22:13 tteras Exp $ */
-/* $Id: pfkey.c,v 1.49 2009/08/05 13:16:01 tteras Exp $ */
+/* $Id: pfkey.c,v 1.50 2009/08/10 08:22:13 tteras Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -214,6 +214,13 @@
msg = (struct sadb_msg *) pk_recv(fd, &len);
if (msg == NULL) {
if (len < 0) {
+ /* do not report EAGAIN as error; well get
+ * called from main loop later. and it's normal
+ * when spd dump is received during reload and
+ * this function is called in loop. */
+ if (errno == EAGAIN)
+ goto end;
+
plog(LLV_ERROR, LOCATION, NULL,
"failed to recv from pfkey (%s)\n",
strerror(errno));
