[svn-commits] russell: branch russell/chan_refcount r99964 - in /team/russell/chan_refcount...

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Jan 23 12:23:28 2008
New Revision: 99964

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99964
Log:
resolve, reset

Modified:
    team/russell/chan_refcount/   (props changed)
    team/russell/chan_refcount/apps/app_chanspy.c
    team/russell/chan_refcount/channels/chan_zap.c
    team/russell/chan_refcount/main/tcptls.c

Change Statistics:
 0 files changed

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 23 12:23:28 2008
@@ -1,1 +1,1 @@
-/trunk:1-99915
+/trunk:1-99963

Modified: team/russell/chan_refcount/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_chanspy.c?view=diff&rev=99964&r1=99963&r2=99964
==============================================================================
--- team/russell/chan_refcount/apps/app_chanspy.c (original)
+++ team/russell/chan_refcount/apps/app_chanspy.c Wed Jan 23 12:23:28 2008
@@ -388,6 +388,7 @@
 	char *ptr;
 	int num;
 	struct ast_channel_iterator *iter = NULL;
+	int num_spyed_upon = 1;
 
 	if (ast_test_flag(flags, OPTION_EXIT)) {
 		const char *c;
@@ -407,7 +408,7 @@
 	waitms = 100;
 
 	for (;;) {
-		if (!ast_test_flag(flags, OPTION_QUIET)) {
+		if (!ast_test_flag(flags, OPTION_QUIET) && num_spyed_upon) {
 			res = ast_streamfile(chan, "beep", chan->language);
 			if (!res)
 				res = ast_waitstream(chan, "");
@@ -444,6 +445,7 @@
 		/* reset for the next loop around, unless overridden later */
 		waitms = 100;
 		peer = prev = next = NULL;
+		num_spyed_upon = 0;
 
 		if (spec)
 			iter = ast_channel_iterator_by_name_new(spec, strlen(spec));
@@ -525,7 +527,8 @@
 			
 			waitms = 5000;
 			res = channel_spy(chan, peer, &volfactor, fd, flags, exitcontext);
-			
+			num_spyed_upon++;	
+
 			if (res == -1) {
 				goto exit;
 			} else if (res == -2) {

Modified: team/russell/chan_refcount/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_zap.c?view=diff&rev=99964&r1=99963&r2=99964
==============================================================================
--- team/russell/chan_refcount/channels/chan_zap.c (original)
+++ team/russell/chan_refcount/channels/chan_zap.c Wed Jan 23 12:23:28 2008
@@ -13090,7 +13090,7 @@
 		strcpy(confp->chan.echocancel.params[confp->chan.echocancel.head.param_count].name, param.name);
 
 		if (param.value) {
-			if (sscanf(param.value, "%ud", &confp->chan.echocancel.params[confp->chan.echocancel.head.param_count].value) != 1) {
+			if (sscanf(param.value, "%d", &confp->chan.echocancel.params[confp->chan.echocancel.head.param_count].value) != 1) {
 				ast_log(LOG_WARNING, "Invalid echocancel parameter value supplied at line %d: '%s'\n", line, param.value);
 				continue;
 			}

Modified: team/russell/chan_refcount/main/tcptls.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/main/tcptls.c?view=diff&rev=99964&r1=99963&r2=99964
==============================================================================
--- team/russell/chan_refcount/main/tcptls.c (original)
+++ team/russell/chan_refcount/main/tcptls.c Wed Jan 23 12:23:28 2008
@@ -83,22 +83,20 @@
 
 HOOK_T server_read(struct server_instance *ser, void *buf, size_t count)
 {
-	if (!ser->ssl) 
-		return read(ser->fd, buf, count);
 #ifdef DO_SSL
-	else
+	if (ser->ssl)
 		return ssl_read(ser->ssl, buf, count);
 #endif
+	return read(ser->fd, buf, count);
 }
 
 HOOK_T server_write(struct server_instance *ser, void *buf, size_t count)
 {
-	if (!ser->ssl) 
-		return write(ser->fd, buf, count);
 #ifdef DO_SSL
-	else
+	if (ser->ssl)
 		return ssl_write(ser->ssl, buf, count);
 #endif
+	return write(ser->fd, buf, count);
 }
 
 void *server_root(void *data)
@@ -356,9 +354,11 @@
 void *ast_make_file_from_fd(void *data)
 {
 	struct server_instance *ser = data;
+#ifdef DO_SSL
 	int (*ssl_setup)(SSL *) = (ser->client) ? SSL_connect : SSL_accept;
 	int ret;
 	char err[256];
+#endif
 
 	/*
 	* open a FILE * as appropriate.