Set TCP_NODELAY on manager TCP sockets to prevent delays on outgoing packets. This...

AST-359

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@273270 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/manager.c b/main/manager.c
index 9c9c5aa84e25378a163267e3ee3109d66a7b1665..54d9760d265881124452397240a78b9b9c76dbf9 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -4604,11 +4604,26 @@ static void *session_do(void *data)
        };
        int flags;
        int res;
+       struct protoent *p;
 
        if (session == NULL) {
                goto done;
        }
 
+       /* XXX here we set TCP_NODELAY on the socket to disable Nagle's
+        * algorithm.  A better solution might be to buffer outgoing messages
+        * until they are complete then write them to the socket in one burst
+        * rather than sending them in bits and pieces. */
+       p = getprotobyname("tcp");
+       if (p) {
+               int arg = 1;
+               if( setsockopt(ser->fd, p->p_proto, TCP_NODELAY, (char *)&arg, sizeof(arg) ) < 0 ) {
+                       ast_log(LOG_WARNING, "Failed to set manager tcp connection to TCP_NODELAY mode: %s\nSome manager actions may be slow to respond.\n", strerror(errno));
+               }
+       } else {
+               ast_log(LOG_WARNING, "Failed to set manager tcp connection to TCP_NODELAY, getprotobyname(\"tcp\") failed\nSome manager actions may be slow to respond.\n");
+       }
+
        flags = fcntl(ser->fd, F_GETFL);
        if (!block_sockets) { /* make sure socket is non-blocking */
                flags |= O_NONBLOCK;