never reduce socket buffers

diff --git a/clients/playrtp.c b/clients/playrtp.c
index 0b25c89e695c16d44e31b6580ba7bd15d9220c8e..fb897ce358e230c5e5852bdc5bf4c39e5663daae 100644 (file)
--- a/clients/playrtp.c
+++ b/clients/playrtp.c
@@ -920,7 +920,7 @@ int main(int argc, char **argv) {
   len = sizeof rcvbuf;
   if(getsockopt(rtpfd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, &len) < 0)
     fatal(errno, "error calling getsockopt SO_RCVBUF");
   len = sizeof rcvbuf;
   if(getsockopt(rtpfd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, &len) < 0)
     fatal(errno, "error calling getsockopt SO_RCVBUF");

-  if(target_rcvbuf) {
+  if(target_rcvbuf > rcvbuf) {

     if(setsockopt(rtpfd, SOL_SOCKET, SO_RCVBUF,
                   &target_rcvbuf, sizeof target_rcvbuf) < 0)
       error(errno, "error calling setsockopt SO_RCVBUF %d", 
     if(setsockopt(rtpfd, SOL_SOCKET, SO_RCVBUF,
                   &target_rcvbuf, sizeof target_rcvbuf) < 0)
       error(errno, "error calling setsockopt SO_RCVBUF %d", 

diff --git a/server/speaker.c b/server/speaker.c
index 5d203942bd31820902fe12e27977051ed6a1b915..37719f924d12f2d4f8a22f2991b693d8a64f15ee 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -965,12 +965,16 @@ int main(int argc, char **argv) {
     if(getsockopt(bfd, SOL_SOCKET, SO_SNDBUF,
                   &sndbuf, &len) < 0)
       fatal(errno, "error getting SO_SNDBUF");
     if(getsockopt(bfd, SOL_SOCKET, SO_SNDBUF,
                   &sndbuf, &len) < 0)
       fatal(errno, "error getting SO_SNDBUF");

-    if(setsockopt(bfd, SOL_SOCKET, SO_SNDBUF,
-                  &target_sndbuf, sizeof target_sndbuf) < 0)
-      error(errno, "error setting SO_SNDBUF to %d", target_sndbuf);
-    else
-      info("changed socket send buffer size from %d to %d",
-           sndbuf, target_sndbuf);
+    if(target_sndbuf > sndbuf) {
+      if(setsockopt(bfd, SOL_SOCKET, SO_SNDBUF,
+                    &target_sndbuf, sizeof target_sndbuf) < 0)
+        error(errno, "error setting SO_SNDBUF to %d", target_sndbuf);
+      else
+        info("changed socket send buffer size from %d to %d",
+             sndbuf, target_sndbuf);
+    } else
+        info("default socket send buffer is %d",
+             sndbuf);

     /* We might well want to set additional broadcast- or multicast-related
      * options here */
     if(sres && bind(bfd, sres->ai_addr, sres->ai_addrlen) < 0)
     /* We might well want to set additional broadcast- or multicast-related
      * options here */
     if(sres && bind(bfd, sres->ai_addr, sres->ai_addrlen) < 0)