From: Martin Kletzander <mkletzan@redhat.com>
Date: Wed, 16 Jul 2014 17:26:16 +0000 (+0200)
Subject: rpc: set listen backlog on FDs as well as on other sockets
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e1f2ec67c2922f0d7c68296dea30fc11f61a9bf7;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

rpc: set listen backlog on FDs as well as on other sockets

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index e9219d5ec..02d77e39a 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -614,7 +614,7 @@ virLockDaemonSetupNetworkingSystemD(virNetServerPtr srv)
 #if WITH_GNUTLS
                                          NULL,
 #endif
-                                         false, 1)))
+                                         false, 0, 1)))
         return -1;
 
     if (virNetServerAddService(srv, svc, NULL) < 0) {
diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index e85889b78..fea05c3e4 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -133,6 +133,7 @@ virNetServerServiceNewFDOrUNIX(const char *path,
                                         tls,
 #endif
                                         readonly,
+                                        max_queued_clients,
                                         nrequests_client_max);
     }
 }
@@ -265,6 +266,7 @@ virNetServerServicePtr virNetServerServiceNewFD(int fd,
                                                 virNetTLSContextPtr tls,
 #endif
                                                 bool readonly,
+                                                size_t max_queued_clients,
                                                 size_t nrequests_client_max)
 {
     virNetServerServicePtr svc;
@@ -292,6 +294,9 @@ virNetServerServicePtr virNetServerServiceNewFD(int fd,
         goto error;
 
     for (i = 0; i < svc->nsocks; i++) {
+        if (virNetSocketListen(svc->socks[i], max_queued_clients) < 0)
+            goto error;
+
         /* IO callback is initially disabled, until we're ready
          * to deal with incoming clients */
         if (virNetSocketAddIOCallback(svc->socks[i],
diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h
index a1c89605a..b1d6c2d3c 100644
--- a/src/rpc/virnetserverservice.h
+++ b/src/rpc/virnetserverservice.h
@@ -74,6 +74,7 @@ virNetServerServicePtr virNetServerServiceNewFD(int fd,
                                                 virNetTLSContextPtr tls,
 # endif
                                                 bool readonly,
+                                                size_t max_queued_clients,
                                                 size_t nrequests_client_max);
 
 virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr object);