Set rsync connection timeout to 15 seconds.

OK sthen@

diff --git a/usr.sbin/rpki-client/extern.h b/usr.sbin/rpki-client/extern.h
index fc79967..611632d 100644 (file)
--- a/usr.sbin/rpki-client/extern.h
+++ b/usr.sbin/rpki-client/extern.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: extern.h,v 1.143 2022/06/27 10:18:27 job Exp $ */
+/*     $OpenBSD: extern.h,v 1.144 2022/08/08 14:10:10 job Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -727,6 +727,9 @@ int mkpathat(int, const char *);
 #define MAX_HTTP_REQUESTS      64
 #define MAX_RSYNC_REQUESTS     16
 
+/* How many seconds to wait for a connection to succeed. */
+#define MAX_CONTIMEOUT         15
+
 /* Maximum allowd repositories per tal */
 #define MAX_REPO_PER_TAL       1000
 

diff --git a/usr.sbin/rpki-client/rsync.c b/usr.sbin/rpki-client/rsync.c
index 537822f..996d481 100644 (file)
--- a/usr.sbin/rpki-client/rsync.c
+++ b/usr.sbin/rpki-client/rsync.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rsync.c,v 1.38 2022/05/24 09:20:49 claudio Exp $ */
+/*     $OpenBSD: rsync.c,v 1.39 2022/08/08 14:10:10 job Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -312,6 +312,7 @@ proc_rsync(char *prog, char *bind_addr, int fd)
                        args[i++] = "-rt";
                        args[i++] = "--no-motd";
                        args[i++] = "--max-size=" STRINGIFY(MAX_FILE_SIZE);
+                       args[i++] = "--contimeout=" STRINGIFY(MAX_CONTIMEOUT);
                        args[i++] = "--timeout=180";
                        args[i++] = "--include=*/";
                        args[i++] = "--include=*.cer";