mod_rayo: Remove compensation for Punchblock Rayo spec incompatibility

diff --git a/src/mod/event_handlers/mod_rayo/mod_rayo.c b/src/mod/event_handlers/mod_rayo/mod_rayo.c
index be66fe877c6c5e67c750ddf24e5b9b50a5cdb27f..dc2e4aafcea5c0679569978a38207701ff9e9559 100644 (file)
--- a/src/mod/event_handlers/mod_rayo/mod_rayo.c
+++ b/src/mod/event_handlers/mod_rayo/mod_rayo.c
@@ -2556,11 +2556,7 @@ static void on_call_originate_event(struct rayo_client *rclient, switch_event_t
                ref = iks_insert(response, "ref");
                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));
-#endif
                RAYO_SEND_MESSAGE(call, RAYO_JID(rclient), response);
                call->dial_id = NULL;
        }

diff --git a/src/mod/event_handlers/mod_rayo/mod_rayo.h b/src/mod/event_handlers/mod_rayo/mod_rayo.h
index 260c811a45f8e835d006a0d897540dce675e8190..dd0adb31929efdbf840fefacd54231fc222a2b26 100644 (file)
--- a/src/mod/event_handlers/mod_rayo/mod_rayo.h
+++ b/src/mod/event_handlers/mod_rayo/mod_rayo.h
@@ -51,9 +51,6 @@
 #define RAT_PEER_SERVER "PEER_SERVER"
 #define RAT_CLIENT "CLIENT"
 
-/* these are support punchblock.. undefine once punchblock is fixed */
-#define RAYO_UUID_IN_REF_URI
-
 struct rayo_actor;
 struct rayo_call;
 struct rayo_mixer;

diff --git a/src/mod/event_handlers/mod_rayo/rayo_components.c b/src/mod/event_handlers/mod_rayo/rayo_components.c
index b376e977709450f604d7255d421b7265ced84b3f..b5137d9459f553caac4ac837f8089d4fd89f63d7 100644 (file)
--- a/src/mod/event_handlers/mod_rayo/rayo_components.c
+++ b/src/mod/event_handlers/mod_rayo/rayo_components.c
@@ -58,11 +58,7 @@ void rayo_component_send_start(struct rayo_component *component, iks *iq)
        iks *response = iks_new_iq_result(iq);
        iks *ref = iks_insert(response, "ref");
        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));
-#endif
        RAYO_SEND_REPLY(component, iks_find_attrib(response, "to"), response);
 }