kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mod_rayo: Remove compensation for Punchblock Rayo spec incompatibility

This commit is contained in:
Ben Langfeld 2013-08-20 17:11:27 -03:00 committed by Chris Rienzo
parent 1d30a502b8
commit 93fec8dd75
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/event_handlers/mod_rayo/mod_rayo.c
View File

@ -2556,11 +2556,7 @@ static void on_call_originate_event(struct rayo_client *rclient, switch_event_t
ref = iks_insert(response, "ref"); ref = iks_insert(response, "ref");
iks_insert_attrib(ref, "xmlns", RAYO_NS); iks_insert_attrib(ref, "xmlns", RAYO_NS);
#ifdef RAYO_UUID_IN_REF_URI
iks_insert_attrib(ref, "uri", uuid);
#else
iks_insert_attrib_printf(ref, "uri", "xmpp:%s", RAYO_JID(call)); iks_insert_attrib_printf(ref, "uri", "xmpp:%s", RAYO_JID(call));
#endif
RAYO_SEND_MESSAGE(call, RAYO_JID(rclient), response); RAYO_SEND_MESSAGE(call, RAYO_JID(rclient), response);
call->dial_id = NULL; call->dial_id = NULL;
} }

3
src/mod/event_handlers/mod_rayo/mod_rayo.h
View File

@ -51,9 +51,6 @@
#define RAT_PEER_SERVER "PEER_SERVER" #define RAT_PEER_SERVER "PEER_SERVER"
#define RAT_CLIENT "CLIENT" #define RAT_CLIENT "CLIENT"
/* these are support punchblock.. undefine once punchblock is fixed */
#define RAYO_UUID_IN_REF_URI
struct rayo_actor; struct rayo_actor;
struct rayo_call; struct rayo_call;
struct rayo_mixer; struct rayo_mixer;

4
src/mod/event_handlers/mod_rayo/rayo_components.c
View File

@ -58,11 +58,7 @@ void rayo_component_send_start(struct rayo_component *component, iks *iq)
iks *response = iks_new_iq_result(iq); iks *response = iks_new_iq_result(iq);
iks *ref = iks_insert(response, "ref"); iks *ref = iks_insert(response, "ref");
iks_insert_attrib(ref, "xmlns", RAYO_NS); iks_insert_attrib(ref, "xmlns", RAYO_NS);
#ifdef RAYO_UUID_IN_REF_URI
iks_insert_attrib(ref, "uri", component->ref);
#else
iks_insert_attrib_printf(ref, "uri", "xmpp:%s", RAYO_JID(component)); iks_insert_attrib_printf(ref, "uri", "xmpp:%s", RAYO_JID(component));
#endif
RAYO_SEND_REPLY(component, iks_find_attrib(response, "to"), response); RAYO_SEND_REPLY(component, iks_find_attrib(response, "to"), response);
} }