aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authormnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-01 14:39:11 +0000
committermnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-01 14:39:11 +0000
commitb60bef9bcdf85035cd79b6ad82c6309f4290bbdf (patch)
tree950a5b6d447d5c74320165638e47710962bd5dcd /main
parent8e3facba87e95c8df50b8eea78f09c8b2f9a1d81 (diff)
Merged revisions 273352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r273352 | mnicholson | 2010-07-01 09:37:37 -0500 (Thu, 01 Jul 2010) | 2 lines Fixed whitespace problems ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273353 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/manager.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/main/manager.c b/main/manager.c
index d17fd1b3d..39296183d 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -3210,7 +3210,7 @@ static void *session_do(void *data)
struct mansession s = {.session = NULL, };
int flags;
int res;
- struct protoent *p;
+ struct protoent *p;
if (session == NULL)
goto done;
@@ -3218,15 +3218,15 @@ static void *session_do(void *data)
/* here we set TCP_NODELAY on the socket to disable Nagle's algorithm.
* This is necessary to prevent delays (caused by buffering) as we
* write to the socket in bits and peices. */
- 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");
- }
+ 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");
+ }
session->writetimeout = 100;
session->waiting_thread = AST_PTHREADT_NULL;