From: Matthew Nicholson <mnicholson@digium.com>
Date: Thu, 1 Jul 2010 14:39:11 +0000 (+0000)
Subject: Merged revisions 273352 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21f9f5f9daca4f668b8fde520d68f59a625e5373;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273353 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index d17fd1b3d4..39296183d1 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;