mod_rayo: Remove compensation for Punchblock Rayo spec incompatibility

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;
 	}

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;

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);
 }