[asterisk-commits] mmichelson: branch group/v6-new r273426 - in /team/group/v6-new: ./ addons/ a...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jul  1 11:21:20 2010
New Revision: 273426

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273426
Log:
Resolve conflicts and reset automerge.


Modified:
    team/group/v6-new/   (props changed)
    team/group/v6-new/addons/chan_mobile.c
    team/group/v6-new/apps/app_meetme.c
    team/group/v6-new/main/manager.c
    team/group/v6-new/res/res_rtp_asterisk.c

Propchange: team/group/v6-new/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/v6-new/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/v6-new/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul  1 11:21:20 2010
@@ -1,1 +1,1 @@
-/trunk:1-270973,270975-273203
+/trunk:1-270973,270975-273424

Modified: team/group/v6-new/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/team/group/v6-new/addons/chan_mobile.c?view=diff&rev=273426&r1=273425&r2=273426
==============================================================================
--- team/group/v6-new/addons/chan_mobile.c (original)
+++ team/group/v6-new/addons/chan_mobile.c Thu Jul  1 11:21:20 2010
@@ -1154,7 +1154,6 @@
 
 	while ((f = ast_smoother_read(pvt->smoother))) {
 		sco_write(pvt->sco_socket, f->data.ptr, f->datalen);
-		ast_frfree(f);
 	}
 
 	ast_mutex_unlock(&pvt->lock);

Modified: team/group/v6-new/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/group/v6-new/apps/app_meetme.c?view=diff&rev=273426&r1=273425&r2=273426
==============================================================================
--- team/group/v6-new/apps/app_meetme.c (original)
+++ team/group/v6-new/apps/app_meetme.c Thu Jul  1 11:21:20 2010
@@ -3439,6 +3439,18 @@
 					}
 				} else if (f->frametype == AST_FRAME_NULL) {
 					/* Ignore NULL frames. It is perfectly normal to get these if the person is muted. */
+				} else if (f->frametype == AST_FRAME_CONTROL) {
+					switch (f->subclass.integer) {
+					case AST_CONTROL_BUSY:
+					case AST_CONTROL_CONGESTION:
+						ast_frfree(f);
+						goto outrun;
+						break;
+					default:
+						ast_debug(1, 
+							"Got ignored control frame on channel %s, f->frametype=%d,f->subclass=%d\n",
+							chan->name, f->frametype, f->subclass.integer);
+					}
 				} else {
 					ast_debug(1, 
 						"Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",

Modified: team/group/v6-new/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/group/v6-new/main/manager.c?view=diff&rev=273426&r1=273425&r2=273426
==============================================================================
--- team/group/v6-new/main/manager.c (original)
+++ team/group/v6-new/main/manager.c Thu Jul  1 11:21:20 2010
@@ -4606,12 +4606,26 @@
 	int flags;
 	int res;
 	struct sockaddr_in ser_remote_address_tmp;
+	struct protoent *p;
 
 	ast_sockaddr_to_sin(&ser->remote_address, &ser_remote_address_tmp);
 	session = build_mansession(ser_remote_address_tmp);
 
 	if (session == NULL) {
 		goto done;
+	}
+
+	/* 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");
 	}
 
 	flags = fcntl(ser->fd, F_GETFL);

Modified: team/group/v6-new/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/group/v6-new/res/res_rtp_asterisk.c?view=diff&rev=273426&r1=273425&r2=273426
==============================================================================
--- team/group/v6-new/res/res_rtp_asterisk.c (original)
+++ team/group/v6-new/res/res_rtp_asterisk.c Thu Jul  1 11:21:20 2010
@@ -2560,7 +2560,7 @@
 
 static char *rtcp_do_debug_ip(struct ast_cli_args *a)
 {
-	char *arg = ast_strdupa(a->argv[3]);
+	char *arg = ast_strdupa(a->argv[4]);
 
 	if (!ast_sockaddr_parse(&rtcpdebugaddr, arg, 0)) {
 		ast_cli(a->fd, "Lookup failed for '%s'\n", arg);