From dce5bbf88efbbff9ca4709baba626797be9b3495 Mon Sep 17 00:00:00 2001 From: Chris Rienzo Date: Thu, 13 Jun 2013 15:28:53 -0400 Subject: [PATCH] mod_rayo: some fixes for punchblock 2.0 compatibility --- src/mod/event_handlers/mod_rayo/mod_rayo.h | 4 +++- src/mod/event_handlers/mod_rayo/rayo_input_component.c | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/mod/event_handlers/mod_rayo/mod_rayo.h b/src/mod/event_handlers/mod_rayo/mod_rayo.h index 05b5f23771..fb197ef915 100644 --- a/src/mod/event_handlers/mod_rayo/mod_rayo.h +++ b/src/mod/event_handlers/mod_rayo/mod_rayo.h @@ -42,8 +42,10 @@ #define RAYO_CALL_NS RAYO_BASE "call:" RAYO_VERSION #define RAYO_MIXER_NS RAYO_BASE "mixer:" RAYO_VERSION -/* this is to support punchblock.. undefine once punchblock is fixed */ + +/* these are support punchblock.. undefine once punchblock is fixed */ #define RAYO_UUID_IN_REF_URI +#define RAYO_INPUT_COMPLETE_WITHOUT_CONTENT_TYPE struct rayo_actor; struct rayo_call; diff --git a/src/mod/event_handlers/mod_rayo/rayo_input_component.c b/src/mod/event_handlers/mod_rayo/rayo_input_component.c index 8b59029e36..4bebb35e8c 100644 --- a/src/mod/event_handlers/mod_rayo/rayo_input_component.c +++ b/src/mod/event_handlers/mod_rayo/rayo_input_component.c @@ -169,11 +169,15 @@ static int digit_mask_set_from_digits(int digit_mask, const char *digits) */ static void send_match_event(struct rayo_component *component, iks *result) { - iks *event = rayo_component_create_complete_event_with_metadata(RAYO_COMPONENT(component), INPUT_MATCH, result, 0); - /* add content-type to ... */ +#ifdef RAYO_INPUT_COMPLETE_WITHOUT_CONTENT_TYPE + rayo_component_send_complete_with_metadata(RAYO_COMPONENT(component), INPUT_MATCH, result, 0); +#else + iks *event = rayo_component_create_complete_event(RAYO_COMPONENT(component), INPUT_MATCH); iks *match = iks_find(iks_find(event, "complete"), INPUT_MATCH_TAG); iks_insert_attrib(match, "content-type", "application/nlsml+xml"); + iks_insert_cdata(match, iks_string(iks_stack(result), result), 0); rayo_component_send_complete_event(component, event); +#endif } /**