X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/ff05a229397c75142725f45cad191ce4a00625ce..4f5e39ecfaa49376b0a5c3a4c384e91a828c1105:/site.c

diff --git a/site.c b/site.c
index 2b51a5d..55efa4d 100644
--- a/site.c
+++ b/site.c
@@ -28,7 +28,7 @@
 #define DEFAULT_KEY_LIFETIME 3600000 /* One hour */
 #define DEFAULT_KEY_RENEGOTIATE_GAP 300000 /* Five minutes */
 #define DEFAULT_SETUP_RETRIES 5
-#define DEFAULT_SETUP_TIMEOUT 1000
+#define DEFAULT_SETUP_TIMEOUT 2000
 #define DEFAULT_WAIT_TIME 20000
 
 /* Each site can be in one of several possible states. */
@@ -763,7 +763,7 @@ static void delete_key(struct site *st, string_t reason, uint32_t loglevel)
 
 static void state_assert(struct site *st, bool_t ok)
 {
-    if (!ok) fatal("state_assert\n");
+    if (!ok) fatal("site:state_assert");
 }
 
 static void enter_state_stop(struct site *st)
@@ -853,7 +853,7 @@ static bool_t enter_new_state(struct site *st, uint32_t next)
 	break;
     default:
 	gen=NULL;
-	fatal("enter_new_state(%s): invalid new state\n",state_name(next));
+	fatal("enter_new_state(%s): invalid new state",state_name(next));
 	break;
     }