ipsec-164.9.tar.gz

[apple/ipsec.git] / ipsec-tools / racoon / localconf.h

diff --git a/ipsec-tools/racoon/localconf.h b/ipsec-tools/racoon/localconf.h
index f2671be73db4f1c1c17f637375c8db4bd3bfa8e2..43135154ae51560c5196b01a8ae1b830c7a0c606 100644 (file)
--- a/ipsec-tools/racoon/localconf.h
+++ b/ipsec-tools/racoon/localconf.h
@@ -55,7 +55,7 @@
 #define LC_DEFAULT_PAD_STRICT          FALSE
 #define LC_DEFAULT_PAD_EXCLTAIL                TRUE
 #define LC_DEFAULT_RETRY_COUNTER       5
 #define LC_DEFAULT_PAD_STRICT          FALSE
 #define LC_DEFAULT_PAD_EXCLTAIL                TRUE
 #define LC_DEFAULT_RETRY_COUNTER       5

-#define LC_DEFAULT_RETRY_INTERVAL      10
+#define LC_DEFAULT_RETRY_INTERVAL      2

 #define LC_DEFAULT_COUNT_PERSEND       1
 #define LC_DEFAULT_RETRY_CHECKPH1      30
 #define LC_DEFAULT_WAIT_PH2COMPLETE    30
 #define LC_DEFAULT_COUNT_PERSEND       1
 #define LC_DEFAULT_RETRY_CHECKPH1      30
 #define LC_DEFAULT_WAIT_PH2COMPLETE    30


@@ -173,8 +173,8 @@ extern struct localconf *lcconf;
 extern void initlcconf __P((void));
 extern void flushlcconf __P((void));
 extern vchar_t *getpskbyname __P((vchar_t *));
 extern void initlcconf __P((void));
 extern void flushlcconf __P((void));
 extern vchar_t *getpskbyname __P((vchar_t *));

-extern vchar_t *getpskbyaddr __P((struct sockaddr *));
-#if defined(__APPLE__) && HAVE_KEYCHAIN
+extern vchar_t *getpskbyaddr __P((struct sockaddr_storage *));
+#if HAVE_KEYCHAIN

 extern vchar_t *getpskfromkeychain __P((const char *, u_int8_t, int, vchar_t *));
 #endif
 extern void getpathname __P((char *, int, int, const char *));
 extern vchar_t *getpskfromkeychain __P((const char *, u_int8_t, int, vchar_t *));
 #endif
 extern void getpathname __P((char *, int, int, const char *));