[asterisk-commits] mnicholson: branch 1.6.2 r273353 - in /branches/1.6.2: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Jul  1 09:39:11 2010
New Revision: 273353

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273353
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/manager.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/manager.c?view=diff&rev=273353&r1=273352&r2=273353
==============================================================================
--- branches/1.6.2/main/manager.c (original)
+++ branches/1.6.2/main/manager.c Thu Jul  1 09:39:11 2010
@@ -3210,7 +3210,7 @@
 	struct mansession s = {.session = NULL, };
 	int flags;
 	int res;
- 	struct protoent *p;
+	struct protoent *p;
 
 	if (session == NULL)
 		goto done;
@@ -3218,15 +3218,15 @@
 	/* 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;