[asterisk-commits] trunk r16600 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Thu Mar 30 17:05:58 2006
New Revision: 16600

URL: http://svn.digium.com/view/asterisk?rev=16600&view=rev
Log:
Merged revisions 16581 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r16581 | tilghman | 2006-03-30 16:56:35 -0600 (Thu, 30 Mar 2006) | 2 lines

Bug 6853 - Manager fixes: 1) extra ActionID, 2) missing colon

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=16600&r1=16599&r2=16600&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Mar 30 17:05:58 2006
@@ -8287,11 +8287,7 @@
 		ast_cli(fd,"\n");
 		ASTOBJ_UNREF(peer,sip_destroy_peer);
 	} else  if (peer && type == 1) { /* manager listing */
-		char *actionid = astman_get_header(m,"ActionID");
-
 		astman_append(s, "Channeltype: SIP\r\n");
-		if (actionid)
-			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");
@@ -8326,7 +8322,7 @@
 		astman_append(s, "SIP-VideoSupport: %s\r\n", (ast_test_flag(&peer->flags[1], SIP_PAGE2_VIDEOSUPPORT)?"Y":"N"));
 
 		/* - is enumerated */
-		astman_append(s, "SIP-DTMFmode %s\r\n", dtmfmode2str(ast_test_flag(&peer->flags[0], SIP_DTMF)));
+		astman_append(s, "SIP-DTMFmode: %s\r\n", dtmfmode2str(ast_test_flag(&peer->flags[0], 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));