[asterisk-commits] alecdavis: branch 10 r352705 - in /branches/10: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Thu Jan 26 00:33:11 2012
New Revision: 352705

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=352705
Log:
Merged revisions 352704 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r352704 | alecdavis | 2012-01-26 19:27:07 +1300 (Thu, 26 Jan 2012) | 20 lines
  
  Cleanup dialog-info+xml Notify dialog
  
  Make similar to other Notify messages.
  
  sample output:
  
  <?xml version="1.0"?>
  <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="715" state="full" entity="sip:8523 at 192.168.x.xx">
  <dialog id="8523">
  <state>terminated</state>
  </dialog>
  </dialog-info>
  
  Tested with Asterisk 1.8.8.2 with Grandstream phones.
   
  alecdavis (license 585)
  Tested by: alecdavis
   
  Review: https://reviewboard.asterisk.org/r/1693/
........

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_sip.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_sip.c?view=diff&rev=352705&r1=352704&r2=352705
==============================================================================
--- branches/10/channels/chan_sip.c (original)
+++ branches/10/channels/chan_sip.c Thu Jan 26 00:33:11 2012
@@ -12875,8 +12875,8 @@
 		ast_str_append(tmp, 0, "</tuple>\n</presence>\n");
 		break;
 	case DIALOG_INFO_XML: /* SNOM subscribes in this format */
-		ast_str_append(tmp, 0, "<?xml version=\"1.0\"?>");
-		ast_str_append(tmp, 0, "<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"%d\" state=\"%s\" entity=\"%s\">", p->dialogver, full ? "full" : "partial", mto);
+		ast_str_append(tmp, 0, "<?xml version=\"1.0\"?>\n");
+		ast_str_append(tmp, 0, "<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"%d\" state=\"%s\" entity=\"%s\">\n", p->dialogver, full ? "full" : "partial", mto);
 		if ((state & AST_EXTENSION_RINGING) && sip_cfg.notifyringing) {
 			const char *local_display = exten;
 			char *local_target = ast_strdupa(mto);
@@ -12929,7 +12929,7 @@
 			}
 
 		} else {
-			ast_str_append(tmp, 0, "<dialog id=\"%s\">", exten);
+			ast_str_append(tmp, 0, "<dialog id=\"%s\">\n", exten);
 		}
 		ast_str_append(tmp, 0, "<state>%s</state>\n", statestring);
 		if (state == AST_EXTENSION_ONHOLD) {