Add backlog parameter to virNetSocketListen

So that callers can change the default value.

diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 8c9ed1eb55f30dc92736a10fe252e91e427c2ec3..e63603f288fbb609ebd1d9af09e89d24bf82165c 100644 (file)
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -127,7 +127,7 @@ virNetServerServicePtr virNetServerServiceNewTCP(const char *nodename,
         goto error;
 
     for (i = 0 ; i < svc->nsocks ; i++) {
-        if (virNetSocketListen(svc->socks[i]) < 0)
+        if (virNetSocketListen(svc->socks[i], 0) < 0)
             goto error;
 
         /* IO callback is initially disabled, until we're ready
@@ -187,7 +187,7 @@ virNetServerServicePtr virNetServerServiceNewUNIX(const char *path,
         goto error;
 
     for (i = 0 ; i < svc->nsocks ; i++) {
-        if (virNetSocketListen(svc->socks[i]) < 0)
+        if (virNetSocketListen(svc->socks[i], 0) < 0)
             goto error;
 
         /* IO callback is initially disabled, until we're ready

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 73ff5eef11a9114738beff54f6202e12e05aac0b..d040aed212adcdad771679760daac1fcfa6bbc5b 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -1076,10 +1076,10 @@ ssize_t virNetSocketWrite(virNetSocketPtr sock, const char *buf, size_t len)
 }
 
 
-int virNetSocketListen(virNetSocketPtr sock)
+int virNetSocketListen(virNetSocketPtr sock, int backlog)
 {
     virMutexLock(&sock->lock);
-    if (listen(sock->fd, 30) < 0) {
+    if (listen(sock->fd, backlog > 0 ? backlog : 30) < 0) {
         virReportSystemError(errno, "%s", _("Unable to listen on socket"));
         virMutexUnlock(&sock->lock);
         return -1;

diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index d6c85d28d7a32fb16e23031e01f6eadc19e2a821..24110a6d4742fb97c51961e9b704037b5e0464b6 100644 (file)
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -105,7 +105,7 @@ void virNetSocketFree(virNetSocketPtr sock);
 const char *virNetSocketLocalAddrString(virNetSocketPtr sock);
 const char *virNetSocketRemoteAddrString(virNetSocketPtr sock);
 
-int virNetSocketListen(virNetSocketPtr sock);
+int virNetSocketListen(virNetSocketPtr sock, int backlog);
 int virNetSocketAccept(virNetSocketPtr sock,
                        virNetSocketPtr *clientsock);
 

diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index e72b9a01ba6486a2454055afd3b92e48525a904c..fba7e15be711571ab08e1c43732a43c454a83c74 100644 (file)
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -159,7 +159,7 @@ static int testSocketTCPAccept(const void *opaque)
         goto cleanup;
 
     for (i = 0 ; i < nlsock ; i++) {
-        if (virNetSocketListen(lsock[i]) < 0)
+        if (virNetSocketListen(lsock[i], 0) < 0)
             goto cleanup;
     }
 
@@ -217,7 +217,7 @@ static int testSocketUNIXAccept(const void *data ATTRIBUTE_UNUSED)
     if (virNetSocketNewListenUNIX(path, 0700, getgid(), &lsock) < 0)
         goto cleanup;
 
-    if (virNetSocketListen(lsock) < 0)
+    if (virNetSocketListen(lsock, 0) < 0)
         goto cleanup;
 
     if (virNetSocketNewConnectUNIX(path, false, NULL, &csock) < 0)
@@ -276,7 +276,7 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED)
         goto cleanup;
     }
 
-    if (virNetSocketListen(lsock) < 0)
+    if (virNetSocketListen(lsock, 0) < 0)
         goto cleanup;
 
     if (virNetSocketNewConnectUNIX(path, false, NULL, &csock) < 0)