[asterisk-commits] branch oej/test-this-branch r15068 - in /team/oej/test-this-branch: ./ apps/ ...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sun Mar 26 16:48:22 MST 2006


Author: oej
Date: Sun Mar 26 17:48:14 2006
New Revision: 15068

URL: http://svn.digium.com/view/asterisk?rev=15068&view=rev
Log:
Reset automerge, resolve conflict

Added:
    team/oej/test-this-branch/configs/http.conf.sample
      - copied unchanged from r15026, trunk/configs/http.conf.sample
    team/oej/test-this-branch/http.c
      - copied unchanged from r15026, trunk/http.c
    team/oej/test-this-branch/include/asterisk/http.h
      - copied unchanged from r15026, trunk/include/asterisk/http.h
Modified:
    team/oej/test-this-branch/   (props changed)
    team/oej/test-this-branch/Makefile
    team/oej/test-this-branch/apps/app_queue.c
    team/oej/test-this-branch/asterisk.c
    team/oej/test-this-branch/cdr.c
    team/oej/test-this-branch/channels/chan_agent.c
    team/oej/test-this-branch/channels/chan_iax2.c
    team/oej/test-this-branch/channels/chan_sip.c
    team/oej/test-this-branch/channels/chan_zap.c
    team/oej/test-this-branch/codecs/codec_a_mu.c
    team/oej/test-this-branch/codecs/codec_adpcm.c
    team/oej/test-this-branch/codecs/codec_alaw.c
    team/oej/test-this-branch/codecs/codec_g723_1.c
    team/oej/test-this-branch/codecs/codec_g726.c
    team/oej/test-this-branch/codecs/codec_gsm.c
    team/oej/test-this-branch/codecs/codec_ilbc.c
    team/oej/test-this-branch/codecs/codec_lpc10.c
    team/oej/test-this-branch/codecs/codec_speex.c
    team/oej/test-this-branch/codecs/codec_ulaw.c
    team/oej/test-this-branch/db.c
    team/oej/test-this-branch/include/asterisk/manager.h
    team/oej/test-this-branch/include/asterisk/module.h
    team/oej/test-this-branch/loader.c
    team/oej/test-this-branch/manager.c
    team/oej/test-this-branch/res/res_features.c
    team/oej/test-this-branch/res/res_smdi.c
    team/oej/test-this-branch/res/res_snmp.c

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
    automerge = http://www.voip-forum.com/

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Mar 26 17:48:14 2006
@@ -1,1 +1,1 @@
-/trunk:1-14943
+/trunk:1-15065

Modified: team/oej/test-this-branch/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/Makefile?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/Makefile (original)
+++ team/oej/test-this-branch/Makefile Sun Mar 26 17:48:14 2006
@@ -368,7 +368,7 @@
 	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
 	utils.o plc.o jitterbuf.o scx_jitterbuf.o abstract_jb.o dnsmgr.o devicestate.o \
 	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
-	cryptostub.o sha1.o
+	cryptostub.o sha1.o http.o
 
 # we need to link in the objects statically, not as a library, because
 # otherwise modules will not have them available if none of the static

Modified: team/oej/test-this-branch/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/apps/app_queue.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/apps/app_queue.c (original)
+++ team/oej/test-this-branch/apps/app_queue.c Sun Mar 26 17:48:14 2006
@@ -3357,7 +3357,7 @@
 	AST_LIST_UNLOCK(&queues);
 }
 
-static int __queues_show(int manager, int fd, int argc, char **argv, int queue_show)
+static int __queues_show(struct mansession *s, int manager, int fd, int argc, char **argv, int queue_show)
 {
 	struct ast_call_queue *q;
 	struct queue_ent *qe;
@@ -3381,10 +3381,17 @@
 	AST_LIST_LOCK(&queues);
 	if (AST_LIST_EMPTY(&queues)) {
 		AST_LIST_UNLOCK(&queues);
-		if (queue_show)
-			ast_cli(fd, "No such queue: %s.%s",argv[2], term);
-		else
-			ast_cli(fd, "No queues.%s", term);
+		if (queue_show) {
+			if (s)
+				astman_append(s, "No such queue: %s.%s",argv[2], term);
+			else
+				ast_cli(fd, "No such queue: %s.%s",argv[2], term);
+		} else {
+			if (s)
+				astman_append(s, "No queues.%s", term);
+			else
+				ast_cli(fd, "No queues.%s", term);
+		}
 		return RESULT_SUCCESS;
 	}
 	AST_LIST_TRAVERSE(&queues, q, list) {
@@ -3409,10 +3416,17 @@
 		sl = 0;
 		if(q->callscompleted > 0)
 			sl = 100*((float)q->callscompletedinsl/(float)q->callscompleted);
-		ast_cli(fd, "%-12.12s has %d calls (max %s) in '%s' strategy (%ds holdtime), W:%d, C:%d, A:%d, SL:%2.1f%% within %ds%s",
-			q->name, q->count, max_buf, int2strat(q->strategy), q->holdtime, q->weight, q->callscompleted, q->callsabandoned,sl,q->servicelevel, term);
+		if (s)
+			astman_append(s, "%-12.12s has %d calls (max %s) in '%s' strategy (%ds holdtime), W:%d, C:%d, A:%d, SL:%2.1f%% within %ds%s",
+				q->name, q->count, max_buf, int2strat(q->strategy), q->holdtime, q->weight, q->callscompleted, q->callsabandoned,sl,q->servicelevel, term);
+		else
+			ast_cli(fd, "%-12.12s has %d calls (max %s) in '%s' strategy (%ds holdtime), W:%d, C:%d, A:%d, SL:%2.1f%% within %ds%s",
+				q->name, q->count, max_buf, int2strat(q->strategy), q->holdtime, q->weight, q->callscompleted, q->callsabandoned,sl,q->servicelevel, term);
 		if (q->members) {
-			ast_cli(fd, "   Members: %s", term);
+			if (s)
+				astman_append(s, "   Members: %s", term);
+			else
+				ast_cli(fd, "   Members: %s", term);
 			for (mem = q->members; mem; mem = mem->next) {
 				max_buf[0] = '\0';
 				max = max_buf;
@@ -3429,19 +3443,37 @@
 							 mem->calls, (long)(time(NULL) - mem->lastcall));
 				} else
 					ast_build_string(&max, &max_left, " has taken no calls yet");
-				ast_cli(fd, "      %s%s%s", mem->interface, max_buf, term);
-			}
-		} else
+				if (s)
+					astman_append(s, "      %s%s%s", mem->interface, max_buf, term);
+				else
+					ast_cli(fd, "      %s%s%s", mem->interface, max_buf, term);
+			}
+		} else if (s)
+			astman_append(s, "   No Members%s", term);
+		else	
 			ast_cli(fd, "   No Members%s", term);
 		if (q->head) {
 			pos = 1;
-			ast_cli(fd, "   Callers: %s", term);
-			for (qe = q->head; qe; qe = qe->next) 
-				ast_cli(fd, "      %d. %s (wait: %ld:%2.2ld, prio: %d)%s", pos++, qe->chan->name,
-					(long)(now - qe->start) / 60, (long)(now - qe->start) % 60, qe->prio, term);
-		} else
+			if (s)
+				astman_append(s, "   Callers: %s", term);
+			else
+				ast_cli(fd, "   Callers: %s", term);
+			for (qe = q->head; qe; qe = qe->next) {
+				if (s)
+					astman_append(s, "      %d. %s (wait: %ld:%2.2ld, prio: %d)%s", pos++, qe->chan->name,
+						(long)(now - qe->start) / 60, (long)(now - qe->start) % 60, qe->prio, term);
+				else
+					ast_cli(fd, "      %d. %s (wait: %ld:%2.2ld, prio: %d)%s", pos++, qe->chan->name,
+						(long)(now - qe->start) / 60, (long)(now - qe->start) % 60, qe->prio, term);
+			}
+		} else if (s)
+			astman_append(s, "   No Callers%s", term);
+		else
 			ast_cli(fd, "   No Callers%s", term);
-		ast_cli(fd, "%s", term);
+		if (s)
+			astman_append(s, "%s", term);
+		else
+			ast_cli(fd, "%s", term);
 		ast_mutex_unlock(&q->lock);
 		if (queue_show)
 			break;
@@ -3452,12 +3484,12 @@
 
 static int queues_show(int fd, int argc, char **argv)
 {
-	return __queues_show(0, fd, argc, argv, 0);
+	return __queues_show(NULL, 0, fd, argc, argv, 0);
 }
 
 static int queue_show(int fd, int argc, char **argv)
 {
-	return __queues_show(0, fd, argc, argv, 1);
+	return __queues_show(NULL, 0, fd, argc, argv, 1);
 }
 
 static char *complete_queue(const char *line, const char *word, int pos, int state)
@@ -3485,8 +3517,8 @@
 static int manager_queues_show( struct mansession *s, struct message *m )
 {
 	char *a[] = { "show", "queues" };
-	__queues_show(1, s->fd, 2, a, 0);
-	ast_cli(s->fd, "\r\n\r\n");	/* Properly terminate Manager output */
+	__queues_show(s, 1, -1, 2, a, 0);
+	astman_append(s, "\r\n\r\n");	/* Properly terminate Manager output */
 
 	return RESULT_SUCCESS;
 } 
@@ -3518,7 +3550,7 @@
 		if (ast_strlen_zero(queuefilter) || !strcmp(q->name, queuefilter)) {
 			if(q->callscompleted > 0)
 				sl = 100*((float)q->callscompletedinsl/(float)q->callscompleted);
-			ast_cli(s->fd, "Event: QueueParams\r\n"
+			astman_append(s, "Event: QueueParams\r\n"
 						"Queue: %s\r\n"
 						"Max: %d\r\n"
 						"Calls: %d\r\n"
@@ -3535,7 +3567,7 @@
 			/* List Queue Members */
 			for (mem = q->members; mem; mem = mem->next) {
 				if (ast_strlen_zero(memberfilter) || !strcmp(mem->interface, memberfilter)) {
-					ast_cli(s->fd, "Event: QueueMember\r\n"
+					astman_append(s, "Event: QueueMember\r\n"
 						"Queue: %s\r\n"
 						"Location: %s\r\n"
 						"Membership: %s\r\n"
@@ -3553,7 +3585,7 @@
 			/* List Queue Entries */
 			pos = 1;
 			for (qe = q->head; qe; qe = qe->next) {
-				ast_cli(s->fd, "Event: QueueEntry\r\n"
+				astman_append(s, "Event: QueueEntry\r\n"
 					"Queue: %s\r\n"
 					"Position: %d\r\n"
 					"Channel: %s\r\n"
@@ -3572,7 +3604,7 @@
 	}
 	AST_LIST_UNLOCK(&queues);
 
-	ast_cli(s->fd,
+	astman_append(s,
 		"Event: QueueStatusComplete\r\n"
 		"%s"
 		"\r\n",idText);

Modified: team/oej/test-this-branch/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/asterisk.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/asterisk.c (original)
+++ team/oej/test-this-branch/asterisk.c Sun Mar 26 17:48:14 2006
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
  *
  * Mark Spencer <markster at digium.com>
  *
@@ -107,6 +107,7 @@
 #include "asterisk/pbx.h"
 #include "asterisk/enum.h"
 #include "asterisk/rtp.h"
+#include "asterisk/http.h"
 #include "asterisk/udptl.h"
 #include "asterisk/app.h"
 #include "asterisk/lock.h"
@@ -988,11 +989,11 @@
 	if (ast_socket > -1) {
 		close(ast_socket);
 		ast_socket = -1;
+		unlink(ast_config_AST_SOCKET);
+		pthread_cancel(lthread);
 	}
 	if (ast_consock > -1)
 		close(ast_consock);
-	if (ast_socket > -1)
-		unlink(ast_config_AST_SOCKET);
 	if (!ast_opt_remote)
 		unlink(ast_config_AST_PID);
 	printf(term_quit());
@@ -1955,7 +1956,8 @@
 	return 0;
 }
 
-static void ast_readconfig(void) {
+static void ast_readconfig(void) 
+{
 	struct ast_config *cfg;
 	struct ast_variable *v;
 	char *config = AST_CONFIG_FILE;
@@ -2435,6 +2437,7 @@
 		printf(term_quit());
 		exit(1);
 	}
+	ast_http_init();
 	ast_channels_init();
 	if (init_manager()) {
 		printf(term_quit());

Modified: team/oej/test-this-branch/cdr.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/cdr.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/cdr.c (original)
+++ team/oej/test-this-branch/cdr.c Sun Mar 26 17:48:14 2006
@@ -439,7 +439,7 @@
 
 	while (cdr) {
 		next = cdr->next;
-		chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
+		chan = S_OR(cdr->channel, "<unknown>");
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_POSTED) && !ast_test_flag(cdr, AST_CDR_FLAG_POST_DISABLED))
 			ast_log(LOG_WARNING, "CDR on channel '%s' not posted\n", chan);
 		if (ast_tvzero(cdr->end))
@@ -464,7 +464,7 @@
 
 	while (cdr) {
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
-			chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
+			chan = S_OR(cdr->channel, "<unknown>");
 			if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
 				ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
 			if (!ast_tvzero(cdr->start))
@@ -480,7 +480,7 @@
 	char *chan; 
 
 	while (cdr) {
-		chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
+		chan = S_OR(cdr->channel, "<unknown>");
 		if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
 			ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
 		if (cdr->disposition < AST_CDR_ANSWERED)
@@ -497,7 +497,7 @@
 
 	while (cdr) {
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
-			chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
+			chan = S_OR(cdr->channel, "<unknown>");
 			if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
 				ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
 			if (cdr->disposition < AST_CDR_BUSY)
@@ -512,7 +512,7 @@
 	char *chan; 
 
 	while (cdr) {
-		chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
+		chan = S_OR(cdr->channel, "<unknown>");
 		if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
 			ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
@@ -554,7 +554,7 @@
 	char *chan; 
 
 	while (cdr) {
-		chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
+		chan = S_OR(cdr->channel, "<unknown>");
 		if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
 			ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
@@ -569,7 +569,7 @@
 
 	while (cdr) {
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
-			chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
+			chan = S_OR(cdr->channel, "<unknown>");
 			if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
 				ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
 			if (!app)
@@ -617,7 +617,7 @@
 
 	while (cdr) {
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
-			chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
+			chan = S_OR(cdr->channel, "<unknown>");
 			if (!ast_strlen_zero(cdr->channel)) 
 				ast_log(LOG_WARNING, "CDR already initialized on '%s'\n", chan); 
 			ast_copy_string(cdr->channel, c->name, sizeof(cdr->channel));
@@ -652,7 +652,7 @@
 	char *chan;
 
 	while (cdr) {
-		chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
+		chan = S_OR(cdr->channel, "<unknown>");
 		if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
 			ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
 		if (ast_tvzero(cdr->end))
@@ -778,8 +778,8 @@
 			/* Copy account code et-al */	
 			ast_copy_string(cdr->accountcode, c->accountcode, sizeof(cdr->accountcode));
 			/* Destination information */
-			ast_copy_string(cdr->dst, (ast_strlen_zero(c->macroexten)) ? c->exten : c->macroexten, sizeof(cdr->dst));
-			ast_copy_string(cdr->dcontext, (ast_strlen_zero(c->macrocontext)) ? c->context : c->macrocontext, sizeof(cdr->dcontext));
+			ast_copy_string(cdr->dst, S_OR(c->macroexten, c->exten), sizeof(cdr->dst));
+			ast_copy_string(cdr->dcontext, S_OR(c->macrocontext, c->context), sizeof(cdr->dcontext));
 		}
 		cdr = cdr->next;
 	}
@@ -806,7 +806,7 @@
 	struct ast_cdr_beitem *i;
 
 	while (cdr) {
-		chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
+		chan = S_OR(cdr->channel, "<unknown>");
 		if (ast_test_flag(cdr, AST_CDR_FLAG_POSTED))
 			ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
 		if (ast_tvzero(cdr->end))

Modified: team/oej/test-this-branch/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_agent.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_agent.c (original)
+++ team/oej/test-this-branch/channels/chan_agent.c Sun Mar 26 17:48:14 2006
@@ -1230,7 +1230,7 @@
 	if(!chan) 
 		return 0;
 
-	snprintf(loginchan, sizeof(loginchan), "%s@%s", chan, !ast_strlen_zero(context) ? context : "default");
+	snprintf(loginchan, sizeof(loginchan), "%s@%s", chan, S_OR(context,"default"));
 	
 	AST_LIST_TRAVERSE(&agents, p, list) {
 		if(!strcasecmp(chan, p->loginchan))
@@ -1411,7 +1411,7 @@
 			status = "AGENT_LOGGEDOFF";
 		}
 
-		ast_cli(s->fd, "Event: Agents\r\n"
+		astman_append(s, "Event: Agents\r\n"
 			"Agent: %s\r\n"
 			"Name: %s\r\n"
 			"Status: %s\r\n"
@@ -1424,7 +1424,7 @@
 		ast_mutex_unlock(&p->lock);
 	}
 	AST_LIST_UNLOCK(&agents);
-	ast_cli(s->fd, "Event: AgentsComplete\r\n"
+	astman_append(s, "Event: AgentsComplete\r\n"
 		"%s"
 		"\r\n",idText);
 	return 0;

Modified: team/oej/test-this-branch/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_iax2.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_iax2.c (original)
+++ team/oej/test-this-branch/channels/chan_iax2.c Sun Mar 26 17:48:14 2006
@@ -680,7 +680,7 @@
 static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in *sin);
 
 static void destroy_peer(struct iax2_peer *peer);
-static int ast_cli_netstats(int fd, int limit_fmt);
+static int ast_cli_netstats(struct mansession *s, int fd, int limit_fmt);
 
 #define IAX_IOSTATE_IDLE		0
 #define IAX_IOSTATE_READY		1
@@ -4338,7 +4338,7 @@
 #undef FORMAT2
 }
 
-static int __iax2_show_peers(int manager, int fd, int argc, char *argv[])
+static int __iax2_show_peers(int manager, int fd, struct mansession *s, int argc, char *argv[])
 {
 	regex_t regexbuf;
 	int havepattern = 0;
@@ -4390,7 +4390,10 @@
 	}
 
 	ast_mutex_lock(&peerl.lock);
-	ast_cli(fd, FORMAT2, "Name/Username", "Host", "   ", "Mask", "Port", "   ", "Status", term);
+	if (s)
+		astman_append(s, FORMAT2, "Name/Username", "Host", "   ", "Mask", "Port", "   ", "Status", term);
+	else
+		ast_cli(fd, FORMAT2, "Name/Username", "Host", "   ", "Mask", "Port", "   ", "Status", term);
 	for (peer = peerl.peers;peer;peer = peer->next) {
 		char nm[20];
 		char status[20];
@@ -4424,7 +4427,15 @@
 					ntohs(peer->addr.sin_port), ast_test_flag(peer, IAX_TRUNK) ? "(T)" : "   ",
 					peer->encmethods ? "(E)" : "   ", status, term);
 
-		ast_cli(fd, FORMAT, name, 
+		if (s)
+			astman_append(s, FORMAT, name, 
+					peer->addr.sin_addr.s_addr ? ast_inet_ntoa(iabuf, sizeof(iabuf), peer->addr.sin_addr) : "(Unspecified)",
+					ast_test_flag(peer, IAX_DYNAMIC) ? "(D)" : "(S)",
+					nm,
+					ntohs(peer->addr.sin_port), ast_test_flag(peer, IAX_TRUNK) ? "(T)" : "   ",
+					peer->encmethods ? "(E)" : "   ", status, term);
+		else
+			ast_cli(fd, FORMAT, name, 
 					peer->addr.sin_addr.s_addr ? ast_inet_ntoa(iabuf, sizeof(iabuf), peer->addr.sin_addr) : "(Unspecified)",
 					ast_test_flag(peer, IAX_DYNAMIC) ? "(D)" : "(S)",
 					nm,
@@ -4434,7 +4445,10 @@
 	}
 	ast_mutex_unlock(&peerl.lock);
 
-	ast_cli(fd,"%d iax2 peers [%d online, %d offline, %d unmonitored]%s", total_peers, online_peers, offline_peers, unmonitored_peers, term);
+	if (s)
+		astman_append(s,"%d iax2 peers [%d online, %d offline, %d unmonitored]%s", total_peers, online_peers, offline_peers, unmonitored_peers, term);
+	else
+		ast_cli(fd,"%d iax2 peers [%d online, %d offline, %d unmonitored]%s", total_peers, online_peers, offline_peers, unmonitored_peers, term);
 
 	if (havepattern)
 		regfree(&regexbuf);
@@ -4487,12 +4501,12 @@
 
 static int iax2_show_peers(int fd, int argc, char *argv[])
 {
-	return __iax2_show_peers(0, fd, argc, argv);
+	return __iax2_show_peers(0, fd, NULL, argc, argv);
 }
 static int manager_iax2_show_netstats( struct mansession *s, struct message *m )
 {
-	ast_cli_netstats(s->fd, 0);
-	ast_cli(s->fd, "\r\n");
+	ast_cli_netstats(s, -1, 0);
+	astman_append(s, "\r\n");
 	return RESULT_SUCCESS;
 }
 
@@ -4529,9 +4543,9 @@
 	char *id;
 	id = astman_get_header(m,"ActionID");
 	if (!ast_strlen_zero(id))
-		ast_cli(s->fd, "ActionID: %s\r\n",id);
-	ret = __iax2_show_peers(1, s->fd, 3, a );
-	ast_cli(s->fd, "\r\n\r\n" );
+		astman_append(s, "ActionID: %s\r\n",id);
+	ret = __iax2_show_peers(1, -1, s, 3, a );
+	astman_append(s, "\r\n\r\n" );
 	return ret;
 } /* /JDG */
 
@@ -4665,7 +4679,7 @@
 #undef FORMATB
 }
 
-static int ast_cli_netstats(int fd, int limit_fmt)
+static int ast_cli_netstats(struct mansession *s, int fd, int limit_fmt)
 {
 	int x;
 	int numchans = 0;
@@ -4674,13 +4688,21 @@
 		if (iaxs[x]) {
 #ifdef BRIDGE_OPTIMIZATION
 			if (iaxs[x]->bridgecallno) {
-				if (limit_fmt)	
-					ast_cli(fd, "%-25.25s <NATIVE BRIDGED>",
-						iaxs[x]->owner ? iaxs[x]->owner->name : "(None)");
-				else
-					ast_cli(fd, "%s <NATIVE BRIDGED>",
-						iaxs[x]->owner ? iaxs[x]->owner->name : "(None)");
-                        } else
+				if (limit_fmt)	 {
+					if (s)
+						astman_append(s, "%-25.25s <NATIVE BRIDGED>",
+							iaxs[x]->owner ? iaxs[x]->owner->name : "(None)");
+					else
+						ast_cli(fd, "%-25.25s <NATIVE BRIDGED>",
+							iaxs[x]->owner ? iaxs[x]->owner->name : "(None)");
+			 	} else {
+					if (s)
+						astman_append(s, "%s <NATIVE BRIDGED>",
+							iaxs[x]->owner ? iaxs[x]->owner->name : "(None)");
+					else
+						ast_cli(fd, "%s <NATIVE BRIDGED>",
+							iaxs[x]->owner ? iaxs[x]->owner->name : "(None)");
+				} else
 #endif
 			{
 				int localjitter, localdelay, locallost, locallosspct, localdropped, localooo;
@@ -4719,7 +4741,27 @@
 					fmt = "%-25.25s %4d %4d %4d %5d %3d %5d %4d %6d %4d %4d %5d %3d %5d %4d %6d\n";
 				else
 					fmt = "%s %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n";
-				ast_cli(fd, fmt,
+				if (s)
+				
+					astman_append(s, fmt,
+						iaxs[x]->owner ? iaxs[x]->owner->name : "(None)",
+						iaxs[x]->pingtime,
+						localjitter, 
+						localdelay,
+						locallost,
+						locallosspct,
+						localdropped,
+						localooo,
+						iaxs[x]->frames_received/1000,
+						iaxs[x]->remote_rr.jitter,
+						iaxs[x]->remote_rr.delay,
+						iaxs[x]->remote_rr.losscnt,
+						iaxs[x]->remote_rr.losspct,
+						iaxs[x]->remote_rr.dropped,
+						iaxs[x]->remote_rr.ooo,
+						iaxs[x]->remote_rr.packets/1000);
+				else
+					ast_cli(fd, fmt,
 						iaxs[x]->owner ? iaxs[x]->owner->name : "(None)",
 						iaxs[x]->pingtime,
 						localjitter, 
@@ -4752,7 +4794,7 @@
 		return RESULT_SHOWUSAGE;
 	ast_cli(fd, "                                -------- LOCAL ---------------------  -------- REMOTE --------------------\n");
 	ast_cli(fd, "Channel                    RTT  Jit  Del  Lost   %%  Drop  OOO  Kpkts  Jit  Del  Lost   %%  Drop  OOO  Kpkts\n");
-	numchans = ast_cli_netstats(fd, 1);
+	numchans = ast_cli_netstats(NULL, fd, 1);
 	ast_cli(fd, "%d active IAX channel%s\n", numchans, (numchans != 1) ? "s" : "");
 	return RESULT_SUCCESS;
 }

Modified: team/oej/test-this-branch/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_sip.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_sip.c (original)
+++ team/oej/test-this-branch/channels/chan_sip.c Sun Mar 26 17:48:14 2006
@@ -8320,9 +8320,9 @@
 
 	astman_send_ack(s, m, "Peer status list will follow");
 	/* List the peers in separate manager events */
-	_sip_show_peers(s->fd, &total, s, m, 3, a);
+	_sip_show_peers(-1, &total, s, m, 3, a);
 	/* Send final confirmation */
-	ast_cli(s->fd,
+	astman_append(s,
 	"Event: PeerlistComplete\r\n"
 	"ListItems: %d\r\n"
 	"%s"
@@ -8433,7 +8433,7 @@
 			realtimepeers ? (ast_test_flag(iterator, SIP_REALTIME) ? "Cached RT":"") : "");
 		} else {	/* Manager format */
 			/* The names here need to be the same as other channels */
-			ast_cli(fd, 
+			astman_append(s, 
 			"Event: PeerEntry\r\n%s"
 			"Channeltype: SIP\r\n"
 			"ObjectName: %s\r\n"
@@ -8761,9 +8761,9 @@
 	a[3] = peer;
 
 	if (!ast_strlen_zero(id))
-		ast_cli(s->fd, "ActionID: %s\r\n",id);
-	ret = _sip_show_peer(1, s->fd, s, m, 4, a );
-	ast_cli( s->fd, "\r\n\r\n" );
+		astman_append(s, "ActionID: %s\r\n",id);
+	ret = _sip_show_peer(1, -1, s, m, 4, a );
+	astman_append(s, "\r\n\r\n" );
 	return ret;
 }
 
@@ -8797,7 +8797,7 @@
 	peer = find_peer(argv[3], NULL, load_realtime);
 	if (s) { 	/* Manager */
 		if (peer)
-			ast_cli(s->fd, "Response: Success\r\n");
+			astman_append(s, "Response: Success\r\n");
 		else {
 			snprintf (cbuf, sizeof(cbuf), "Peer %s not found.\n", argv[3]);
 			astman_send_error(s, m, cbuf);
@@ -8899,78 +8899,78 @@
 	} else  if (peer && type == 1) { /* manager listing */
 		char *actionid = astman_get_header(m,"ActionID");
 
-		ast_cli(fd, "Channeltype: SIP\r\n");
+		astman_append(s, "Channeltype: SIP\r\n");
 		if (actionid)
-			ast_cli(fd, "ActionID: %s\r\n", actionid);
-		ast_cli(fd, "ObjectName: %s\r\n", peer->name);
-		ast_cli(fd, "ChanObjectType: peer\r\n");
-		ast_cli(fd, "SecretExist: %s\r\n", ast_strlen_zero(peer->secret)?"N":"Y");
-		ast_cli(fd, "MD5SecretExist: %s\r\n", ast_strlen_zero(peer->md5secret)?"N":"Y");
-		ast_cli(fd, "Context: %s\r\n", peer->context);
-		ast_cli(fd, "Language: %s\r\n", peer->language);
+			astman_append(s, "ActionID: %s\r\n", actionid);
+		astman_append(s, "ObjectName: %s\r\n", peer->name);
+		astman_append(s, "ChanObjectType: peer\r\n");
+		astman_append(s, "SecretExist: %s\r\n", ast_strlen_zero(peer->secret)?"N":"Y");
+		astman_append(s, "MD5SecretExist: %s\r\n", ast_strlen_zero(peer->md5secret)?"N":"Y");
+		astman_append(s, "Context: %s\r\n", peer->context);
+		astman_append(s, "Language: %s\r\n", peer->language);
 		if (!ast_strlen_zero(peer->accountcode))
-			ast_cli(fd, "Accountcode: %s\r\n", peer->accountcode);
-		ast_cli(fd, "AMAflags: %s\r\n", ast_cdr_flags2str(peer->amaflags));
-		ast_cli(fd, "CID-CallingPres: %s\r\n", ast_describe_caller_presentation(peer->callingpres));
+			astman_append(s, "Accountcode: %s\r\n", peer->accountcode);
+		astman_append(s, "AMAflags: %s\r\n", ast_cdr_flags2str(peer->amaflags));
+		astman_append(s, "CID-CallingPres: %s\r\n", ast_describe_caller_presentation(peer->callingpres));
 		if (!ast_strlen_zero(peer->fromuser))
-			ast_cli(fd, "SIP-FromUser: %s\r\n", peer->fromuser);
+			astman_append(s, "SIP-FromUser: %s\r\n", peer->fromuser);
 		if (!ast_strlen_zero(peer->fromdomain))
-			ast_cli(fd, "SIP-FromDomain: %s\r\n", peer->fromdomain);
-		ast_cli(fd, "Callgroup: ");
+			astman_append(s, "SIP-FromDomain: %s\r\n", peer->fromdomain);
+		astman_append(s, "Callgroup: ");
 		print_group(fd, peer->callgroup, 1);
-		ast_cli(fd, "Pickupgroup: ");
+		astman_append(s, "Pickupgroup: ");
 		print_group(fd, peer->pickupgroup, 1);
-		ast_cli(fd, "VoiceMailbox: %s\r\n", peer->mailbox);
-		ast_cli(fd, "LastMsgsSent: %d\r\n", peer->lastmsgssent);
-		ast_cli(fd, "Call limit: %d\r\n", peer->call_limit);
-		ast_cli(fd, "MaxCallBR: %dkbps\r\n", peer->maxcallbitrate);
-		ast_cli(fd, "Dynamic: %s\r\n", (ast_test_flag((&peer->flags_page2), SIP_PAGE2_DYNAMIC)?"Y":"N"));
-		ast_cli(fd, "Callerid: %s\r\n", ast_callerid_merge(cbuf, sizeof(cbuf), peer->cid_name, peer->cid_num, ""));
-		ast_cli(fd, "RegExpire: %ld seconds\r\n", ast_sched_when(sched,peer->expire));
-		ast_cli(fd, "SIP-AuthInsecure: %s\r\n", insecure2str(ast_test_flag(peer, SIP_INSECURE_PORT), ast_test_flag(peer, SIP_INSECURE_INVITE)));
-		ast_cli(fd, "SIP-NatSupport: %s\r\n", nat2str(ast_test_flag(peer, SIP_NAT)));
-		ast_cli(fd, "ACL: %s\r\n", (peer->ha?"Y":"N"));
-		ast_cli(fd, "SIP-CanReinvite: %s\r\n", (ast_test_flag(peer, SIP_CAN_REINVITE)?"Y":"N"));
-		ast_cli(fd, "SIP-PromiscRedir: %s\r\n", (ast_test_flag(peer, SIP_PROMISCREDIR)?"Y":"N"));
-		ast_cli(fd, "SIP-UserPhone: %s\r\n", (ast_test_flag(peer, SIP_USEREQPHONE)?"Y":"N"));
-		ast_cli(fd, "SIP-T38pt-support-udptl: %s\r\n", (ast_test_flag((&peer->flags_page2), SIP_PAGE2_T38SUPPORT_UDPTL)?"Y":"N"));
-		ast_cli(fd, "SIP-T38pt-support-rtp: %s\r\n", (ast_test_flag((&peer->flags_page2), SIP_PAGE2_T38SUPPORT_RTP)?"Y":"N"));
-		ast_cli(fd, "SIP-T38pt-support-tcp: %s\r\n", (ast_test_flag((&peer->flags_page2), SIP_PAGE2_T38SUPPORT_TCP)?"Y":"N"));
-		ast_cli(fd, "SIP-VideoSupport: %s\r\n", (ast_test_flag((&peer->flags_page2), SIP_PAGE2_VIDEOSUPPORT)?"Y":"N"));
+		astman_append(s, "VoiceMailbox: %s\r\n", peer->mailbox);
+		astman_append(s, "LastMsgsSent: %d\r\n", peer->lastmsgssent);
+		astman_append(s, "Call limit: %d\r\n", peer->call_limit);
+		astman_append(s, "MaxCallBR: %dkbps\r\n", peer->maxcallbitrate);
+		astman_append(s, "Dynamic: %s\r\n", (ast_test_flag((&peer->flags_page2), SIP_PAGE2_DYNAMIC)?"Y":"N"));
+		astman_append(s, "Callerid: %s\r\n", ast_callerid_merge(cbuf, sizeof(cbuf), peer->cid_name, peer->cid_num, ""));
+		astman_append(s, "RegExpire: %ld seconds\r\n", ast_sched_when(sched,peer->expire));
+		astman_append(s, "SIP-AuthInsecure: %s\r\n", insecure2str(ast_test_flag(peer, SIP_INSECURE_PORT), ast_test_flag(peer, SIP_INSECURE_INVITE)));
+		astman_append(s, "SIP-NatSupport: %s\r\n", nat2str(ast_test_flag(peer, SIP_NAT)));
+		astman_append(s, "ACL: %s\r\n", (peer->ha?"Y":"N"));
+		astman_append(s, "SIP-CanReinvite: %s\r\n", (ast_test_flag(peer, SIP_CAN_REINVITE)?"Y":"N"));
+		astman_append(s, "SIP-PromiscRedir: %s\r\n", (ast_test_flag(peer, SIP_PROMISCREDIR)?"Y":"N"));
+		astman_append(s, "SIP-UserPhone: %s\r\n", (ast_test_flag(peer, SIP_USEREQPHONE)?"Y":"N"));
+		astman_append(s, "SIP-T38pt-support-udptl: %s\r\n", (ast_test_flag((&peer->flags_page2), SIP_PAGE2_T38SUPPORT_UDPTL)?"Y":"N"));
+		astman_append(s, "SIP-T38pt-support-rtp: %s\r\n", (ast_test_flag((&peer->flags_page2), SIP_PAGE2_T38SUPPORT_RTP)?"Y":"N"));
+		astman_append(s, "SIP-T38pt-support-tcp: %s\r\n", (ast_test_flag((&peer->flags_page2), SIP_PAGE2_T38SUPPORT_TCP)?"Y":"N"));
+		astman_append(s, "SIP-VideoSupport: %s\r\n", (ast_test_flag((&peer->flags_page2), SIP_PAGE2_VIDEOSUPPORT)?"Y":"N"));
 
 		/* - is enumerated */
-		ast_cli(fd, "SIP-DTMFmode %s\r\n", dtmfmode2str(ast_test_flag(peer, SIP_DTMF)));
-		ast_cli(fd, "SIPLastMsg: %d\r\n", peer->lastmsg);
-		ast_cli(fd, "ToHost: %s\r\n", peer->tohost);
-		ast_cli(fd, "Address-IP: %s\r\nAddress-Port: %d\r\n",  peer->addr.sin_addr.s_addr ? ast_inet_ntoa(iabuf, sizeof(iabuf), peer->addr.sin_addr) : "", ntohs(peer->addr.sin_port));
-		ast_cli(fd, "Default-addr-IP: %s\r\nDefault-addr-port: %d\r\n", ast_inet_ntoa(iabuf, sizeof(iabuf), peer->defaddr.sin_addr), ntohs(peer->defaddr.sin_port));
-		ast_cli(fd, "Default-Username: %s\r\n", peer->username);
+		astman_append(s, "SIP-DTMFmode %s\r\n", dtmfmode2str(ast_test_flag(peer, SIP_DTMF)));
+		astman_append(s, "SIPLastMsg: %d\r\n", peer->lastmsg);
+		astman_append(s, "ToHost: %s\r\n", peer->tohost);
+		astman_append(s, "Address-IP: %s\r\nAddress-Port: %d\r\n",  peer->addr.sin_addr.s_addr ? ast_inet_ntoa(iabuf, sizeof(iabuf), peer->addr.sin_addr) : "", ntohs(peer->addr.sin_port));
+		astman_append(s, "Default-addr-IP: %s\r\nDefault-addr-port: %d\r\n", ast_inet_ntoa(iabuf, sizeof(iabuf), peer->defaddr.sin_addr), ntohs(peer->defaddr.sin_port));
+		astman_append(s, "Default-Username: %s\r\n", peer->username);
 		if (!ast_strlen_zero(global_regcontext))
-			ast_cli(fd, "RegExtension: %s\r\n", peer->regexten);
-		ast_cli(fd, "Codecs: ");
+			astman_append(s, "RegExtension: %s\r\n", peer->regexten);
+		astman_append(s, "Codecs: ");
 		ast_getformatname_multiple(codec_buf, sizeof(codec_buf) -1, peer->capability);
-		ast_cli(fd, "%s\r\n", codec_buf);
-		ast_cli(fd, "CodecOrder: ");
+		astman_append(s, "%s\r\n", codec_buf);
+		astman_append(s, "CodecOrder: ");
 		pref = &peer->prefs;
 		for(x = 0; x < 32 ; x++) {
 			codec = ast_codec_pref_index(pref,x);
 			if (!codec)
 				break;
-			ast_cli(fd, "%s", ast_getformatname(codec));
+			astman_append(s, "%s", ast_getformatname(codec));
 			if (x < 31 && ast_codec_pref_index(pref,x+1))
-				ast_cli(fd, ",");
-		}
-
-		ast_cli(fd, "\r\n");
-		ast_cli(fd, "Status: ");
+				astman_append(s, ",");
+		}
+
+		astman_append(s, "\r\n");
+		astman_append(s, "Status: ");
 		peer_status(peer, status, sizeof(status));
-		ast_cli(fd, "%s\r\n", status);
- 		ast_cli(fd, "SIP-Useragent: %s\r\n", peer->useragent);
- 		ast_cli(fd, "Reg-Contact : %s\r\n", peer->fullcontact);
+		astman_append(s, "%s\r\n", status);
+ 		astman_append(s, "SIP-Useragent: %s\r\n", peer->useragent);
+ 		astman_append(s, "Reg-Contact : %s\r\n", peer->fullcontact);
 		if (peer->chanvars) {
 			for (v = peer->chanvars ; v ; v = v->next) {
- 				ast_cli(fd, "ChanVariable:\n");
- 				ast_cli(fd, " %s,%s\r\n", v->name, v->value);
+ 				astman_append(s, "ChanVariable:\n");
+ 				astman_append(s, " %s,%s\r\n", v->name, v->value);
 			}
 		}
 

Modified: team/oej/test-this-branch/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_zap.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_zap.c (original)
+++ team/oej/test-this-branch/channels/chan_zap.c Sun Mar 26 17:48:14 2006
@@ -10383,7 +10383,7 @@
 	while (tmp) {
 		if (tmp->channel > 0) {
 			int alarm = get_alarms(tmp);
-			ast_cli(s->fd,
+			astman_append(s,
 				"Event: ZapShowChannels\r\n"
 				"Channel: %d\r\n"
 				"Signalling: %s\r\n"
@@ -10402,7 +10402,7 @@
 
 	ast_mutex_unlock(&iflock);
 	
-	ast_cli(s->fd, 
+	astman_append(s, 
 		"Event: ZapShowChannelsComplete\r\n"
 		"%s"
 		"\r\n", 

Modified: team/oej/test-this-branch/codecs/codec_a_mu.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/codecs/codec_a_mu.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/codecs/codec_a_mu.c (original)
+++ team/oej/test-this-branch/codecs/codec_a_mu.c Sun Mar 26 17:48:14 2006
@@ -316,7 +316,7 @@
 int usecount(void)
 {
 	int res;
-	OLD_STANDARD_USECOUNT(res);
+	STANDARD_USECOUNT(res);
 	return res;
 }
 

Modified: team/oej/test-this-branch/codecs/codec_adpcm.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/codecs/codec_adpcm.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/codecs/codec_adpcm.c (original)
+++ team/oej/test-this-branch/codecs/codec_adpcm.c Sun Mar 26 17:48:14 2006
@@ -616,7 +616,7 @@
 int usecount(void)
 {
 	int res;
-	OLD_STANDARD_USECOUNT(res);
+	STANDARD_USECOUNT(res);
 	return res;
 }
 

Modified: team/oej/test-this-branch/codecs/codec_alaw.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/codecs/codec_alaw.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/codecs/codec_alaw.c (original)
+++ team/oej/test-this-branch/codecs/codec_alaw.c Sun Mar 26 17:48:14 2006
@@ -416,7 +416,7 @@
 int usecount(void)
 {
 	int res;
-	OLD_STANDARD_USECOUNT(res);
+	STANDARD_USECOUNT(res);
 	return res;
 }
 

Modified: team/oej/test-this-branch/codecs/codec_g723_1.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/codecs/codec_g723_1.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/codecs/codec_g723_1.c (original)
+++ team/oej/test-this-branch/codecs/codec_g723_1.c Sun Mar 26 17:48:14 2006
@@ -407,7 +407,7 @@
 int usecount(void)
 {
 	int res;
-	OLD_STANDARD_USECOUNT(res);
+	STANDARD_USECOUNT(res);
 	return res;
 }
 

Modified: team/oej/test-this-branch/codecs/codec_g726.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/codecs/codec_g726.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/codecs/codec_g726.c (original)
+++ team/oej/test-this-branch/codecs/codec_g726.c Sun Mar 26 17:48:14 2006
@@ -1078,7 +1078,7 @@
 usecount (void)
 {
   int res;
-  OLD_STANDARD_USECOUNT (res);
+  STANDARD_USECOUNT (res);
   return res;
 }
 

Modified: team/oej/test-this-branch/codecs/codec_gsm.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/codecs/codec_gsm.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/codecs/codec_gsm.c (original)
+++ team/oej/test-this-branch/codecs/codec_gsm.c Sun Mar 26 17:48:14 2006
@@ -347,7 +347,7 @@
 int usecount(void)
 {
 	int res;
-	OLD_STANDARD_USECOUNT(res);
+	STANDARD_USECOUNT(res);
 	return res;
 }
 

Modified: team/oej/test-this-branch/codecs/codec_ilbc.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/codecs/codec_ilbc.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/codecs/codec_ilbc.c (original)
+++ team/oej/test-this-branch/codecs/codec_ilbc.c Sun Mar 26 17:48:14 2006
@@ -307,7 +307,7 @@
 int usecount(void)
 {
 	int res;
-	OLD_STANDARD_USECOUNT(res);
+	STANDARD_USECOUNT(res);
 	return res;
 }
 

Modified: team/oej/test-this-branch/codecs/codec_lpc10.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/codecs/codec_lpc10.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/codecs/codec_lpc10.c (original)
+++ team/oej/test-this-branch/codecs/codec_lpc10.c Sun Mar 26 17:48:14 2006
@@ -420,7 +420,7 @@
 int usecount(void)
 {
 	int res;
-	OLD_STANDARD_USECOUNT(res);
+	STANDARD_USECOUNT(res);
 	return res;
 }
 

Modified: team/oej/test-this-branch/codecs/codec_speex.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/codecs/codec_speex.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/codecs/codec_speex.c (original)
+++ team/oej/test-this-branch/codecs/codec_speex.c Sun Mar 26 17:48:14 2006
@@ -602,7 +602,7 @@
 int usecount(void)
 {
 	int res;
-	OLD_STANDARD_USECOUNT(res);
+	STANDARD_USECOUNT(res);
 	return res;
 }
 

Modified: team/oej/test-this-branch/codecs/codec_ulaw.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/codecs/codec_ulaw.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/codecs/codec_ulaw.c (original)
+++ team/oej/test-this-branch/codecs/codec_ulaw.c Sun Mar 26 17:48:14 2006
@@ -418,7 +418,7 @@
 int usecount(void)
 {
 	int res;
-	OLD_STANDARD_USECOUNT(res);
+	STANDARD_USECOUNT(res);
 	return res;
 }
 

Modified: team/oej/test-this-branch/db.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/db.c?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/db.c (original)
+++ team/oej/test-this-branch/db.c Sun Mar 26 17:48:14 2006
@@ -568,7 +568,7 @@
 		astman_send_error(s, m, "Database entry not found");
 	} else {
 		astman_send_ack(s, m, "Result will follow");
-		ast_cli(s->fd, "Event: DBGetResponse\r\n"
+		astman_append(s, "Event: DBGetResponse\r\n"
 				"Family: %s\r\n"
 				"Key: %s\r\n"
 				"Val: %s\r\n"

Modified: team/oej/test-this-branch/include/asterisk/manager.h
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/include/asterisk/manager.h?rev=15068&r1=15067&r2=15068&view=diff
==============================================================================
--- team/oej/test-this-branch/include/asterisk/manager.h (original)
+++ team/oej/test-this-branch/include/asterisk/manager.h Sun Mar 26 17:48:14 2006
@@ -176,7 +176,6 @@
 	struct mansession *next;
 };
 
-
 struct message {
 	int hdrcount;
 	char headers[AST_MAX_MANHEADERS][AST_MAX_MANHEADER_LEN];
@@ -242,6 +241,10 @@
 extern void astman_send_response(struct mansession *s, struct message *m, char *resp, char *msg);
 extern void astman_send_ack(struct mansession *s, struct message *m, char *msg);
 
+extern void astman_append(struct mansession *s, const char *fmt, ...)
+        __attribute__ ((format (printf, 2, 3)));
+
+
 /*! Called by Asterisk initialization */
 extern int init_manager(void);
 /*! Called by Asterisk initialization */

Modified: team/oej/test-this-branch/include/asterisk/module.h
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/include/asterisk/module.h?rev=15068&r1=15067&r2=15068&view=diff

[... 1412 lines stripped ...]


More information about the asterisk-commits mailing list