Make it possible to specify the timeout for WaitForIncoming

Instead of always using the hardcoded magic number 60.

Author: vpodzime

cf-serverd/cf-serverd-functions.c

@@ -49,6 +49,7 @@
 #include <loading.h>
 #include <printsize.h>
 
+#define WAIT_INCOMING_TIMEOUT 10
 
 static const size_t QUEUESIZE = 50;
 int NO_FORK = false; /* GLOBAL_A */
@@ -717,7 +718,7 @@ int StartServer(EvalContext *ctx, Policy **policy, GenericAgentConfig *config)
     {
         CollectCallIfDue(ctx);
 
-        int selected = WaitForIncoming(sd);
+        int selected = WaitForIncoming(sd, WAIT_INCOMING_TIMEOUT);
 
         Log(LOG_LEVEL_DEBUG, "select(): %d", selected);
         if (selected == -1)

cf-testd/cf-testd.c

@@ -59,6 +59,7 @@
 #include <arpa/inet.h>
 
 #define CFTESTD_QUEUE_SIZE 10
+#define WAIT_CHECK_TIMEOUT 10
 
 // ============================= CFTestD_Config ==============================
 typedef struct
@@ -532,7 +533,7 @@ int CFTestD_StartServer(CFTestD_Config *config)
     int selected = 0;
     while (selected != -1)
     {
-        selected = WaitForIncoming(sd);
+        selected = WaitForIncoming(sd, WAIT_CHECK_TIMEOUT);
 
         if (selected > 0)
         {

libcfnet/server_code.c

@@ -10,15 +10,16 @@
 /* Wait up to a minute for an in-coming connection.
  *
  * @param sd The listening socket or -1.
+ * @param tm_sec timeout in seconds
  * @retval > 0 In-coming connection.
  * @retval 0 No in-coming connection.
  * @retval -1 Error (other than interrupt).
  * @retval < -1 Interrupted while waiting.
  */
-int WaitForIncoming(int sd)
+int WaitForIncoming(int sd, time_t tm_sec)
 {
     Log(LOG_LEVEL_DEBUG, "Waiting at incoming select...");
-    struct timeval timeout = { .tv_sec = 60 };
+    struct timeval timeout = { .tv_sec = tm_sec };
     int signal_pipe = GetSignalPipe();
     fd_set rset;
     FD_ZERO(&rset);

libcfnet/server_code.h

@@ -4,6 +4,6 @@
 #include <platform.h>
 
 int InitServer(size_t queue_size, char *bind_address);
-int WaitForIncoming(int sd);
+int WaitForIncoming(int sd, time_t tm_sec);
 
 #endif