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@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/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@352705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
10-digiumphones
Alec L Davis 14 years ago
parent f55ee58b5f
commit 048a00bbaf

@ -12875,8 +12875,8 @@ static void state_notify_build_xml(int state, int full, const char *exten, const
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 @@ static void state_notify_build_xml(int state, int full, const char *exten, const
}
} 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) {

Loading…
Cancel
Save