Module: sip-router Branch: lazedo/kazoo Commit: 3d8082cf1a1c0a24ab2693fd881a1beea87a7755 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d8082c… Author: lazedo &lt;luis.azedo(a)factorlusitano.com&gt; Committer: lazedo &lt;luis.azedo(a)factorlusitano.com&gt; Date: Fri Sep 12 20:43:46 2014 +0100 kazoo : remove spaces between xml elements --- modules/kazoo/defs.h | 78 +++++++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/kazoo/defs.h b/modules/kazoo/defs.h index 850cf4d..c4627d8 100644 --- a/modules/kazoo/defs.h +++ b/modules/kazoo/defs.h @@ -48,53 +48,53 @@ #define PRESENCE_BODY_BUFFER_SIZE 4096 #define MWI_BODY "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: %.*s/%.*s (%.*s/%.*s)\r\n" -#define PRESENCE_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \ +#define PRESENCE_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <presence xmlns=\"urn:ietf:params:xml:ns:pidf\" xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" xmlns:c=\"urn:ietf:params:xml:ns:pidf:cipid\" entity=\"%s\"> \ - <tuple xmlns=\"urn:ietf:params:xml:ns:pidf\" id=\"%s\"> \ - <status> \ - <basic>%s</basic> \ - </status> \ - </tuple> \ - <note xmlns=\"urn:ietf:params:xml:ns:pidf\">%s</note> \ - <dm:person xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" id=\"1\"> \ - <rpid:activities>%s</rpid:activities> \ - <dm:note>%s</dm:note> \ - </dm:person> \ +<tuple xmlns=\"urn:ietf:params:xml:ns:pidf\" id=\"%s\">\ +<status>\ +<basic>%s</basic>\ +</status>\ +</tuple>\ +<note xmlns=\"urn:ietf:params:xml:ns:pidf\">%s</note>\ +<dm:person xmlns:dm=\"urn:ietf:params:xml:ns:pidf:data-model\" xmlns:rpid=\"urn:ietf:params:xml:ns:pidf:rpid\" id=\"1\">\ +<rpid:activities>%s</rpid:activities>\ +<dm:note>%s</dm:note>\ +</dm:person>\ </presence>" -#define DIALOGINFO_EMPTY_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \ +#define DIALOGINFO_EMPTY_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\"> \ - <dialog direction=\"initiator\"> \ - <state>terminated</state> \ - </dialog> \ +<dialog direction=\"initiator\">\ +<state>terminated</state>\ +</dialog>\ </dialog-info>" -#define DIALOGINFO_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \ -<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\"> \ - <dialog id=\"%.*s\" call-id=\"%.*s\" local-tag=\"%.*s\" remote-tag=\"%.*s\" direction=\"%.*s\"> \ - <state>%.*s</state> \ - <local> \ - <identity>%.*s</identity> \ - <target uri=\"sip:%.*s\"/> \ - </local> \ - <remote> \ - <identity>%.*s</identity> \ - <target uri=\"sip:%.*s\"/> \ - </remote> \ - </dialog> \ +#define DIALOGINFO_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ +<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\">\ +<dialog id=\"%.*s\" call-id=\"%.*s\" local-tag=\"%.*s\" remote-tag=\"%.*s\" direction=\"%.*s\">\ +<state>%.*s</state>\ +<local>\ +<identity>%.*s</identity>\ +<target uri=\"sip:%.*s\"/>\ +</local>\ +<remote>\ +<identity>%.*s</identity>\ +<target uri=\"sip:%.*s\"/>\ +</remote>\ +</dialog>\ </dialog-info>" -#define DIALOGINFO_BODY_2 "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \ -<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\"> \ - <dialog id=\"%.*s\" call-id=\"%.*s\" local-tag=\"%.*s\" remote-tag=\"%.*s\" direction=\"%.*s\"> \ - <state>%.*s</state> \ - <local> \ - <identity>%.*s</identity> \ - </local> \ - <remote> \ - <identity>%.*s</identity> \ - </remote> \ - </dialog> \ +#define DIALOGINFO_BODY_2 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ +<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\">\ +<dialog id=\"%.*s\" call-id=\"%.*s\" local-tag=\"%.*s\" remote-tag=\"%.*s\" direction=\"%.*s\">\ +<state>%.*s</state>\ +<local>\ +<identity>%.*s</identity>\ +</local>\ +<remote>\ +<identity>%.*s</identity>\ +</remote>\ +</dialog>\ </dialog-info>" #define json_extract_field(json_name, field) do { \