From c4f7609113a7734313d95f33774deb4b9c143b29 Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Mon, 16 Dec 2013 17:04:36 +0100

Subject: [PATCH] util: try harder to increase the send/recv buffers of sockets

If we have the priviliges we will try SO_SNDBUFFORCE/SO_RCVBUFFORCE and

only fall back to SO_SNDBUF/SO_RCVBUF if that fails.

(cherry picked from commit 92d75ca419994f3924dc14117b71f8706d9e1f57)

---

 src/shared/util.c | 25 ++++++++++++-------------

 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/shared/util.c b/src/shared/util.c

index 02bae9043c..8824b9b9a2 100644

--- a/src/shared/util.c

+++ b/src/shared/util.c

@@ -4928,15 +4928,15 @@ int fd_inc_sndbuf(int fd, size_t n) {

         socklen_t l = sizeof(value);

         r = getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, &l);

-        if (r >= 0 &&

-            l == sizeof(value) &&

-            (size_t) value >= n*2)

+        if (r >= 0 && l == sizeof(value) && (size_t) value >= n*2)

                 return 0;

+        /* If we have the privileges we will ignore the kernel limit. */

+

         value = (int) n;

-        r = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value));

-        if (r < 0)

-                return -errno;

+        if (setsockopt(fd, SOL_SOCKET, SO_SNDBUFFORCE, &value, sizeof(value)) < 0)

+                if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value)) < 0)

+                        return -errno;

         return 1;

 }

@@ -4946,16 +4946,15 @@ int fd_inc_rcvbuf(int fd, size_t n) {

         socklen_t l = sizeof(value);

         r = getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, &l);

-        if (r >= 0 &&

-            l == sizeof(value) &&

-            (size_t) value >= n*2)

+        if (r >= 0 && l == sizeof(value) && (size_t) value >= n*2)

                 return 0;

-        value = (int) n;

-        r = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof(value));

-        if (r < 0)

-                return -errno;

+        /* If we have the privileges we will ignore the kernel limit. */

+        value = (int) n;

+        if (setsockopt(fd, SOL_SOCKET, SO_RCVBUFFORCE, &value, sizeof(value)) < 0)

+                if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof(value)) < 0)

+                        return -errno;

         return 1;

 }