mod_rayo: some fixes for punchblock 2.0 compatibility

This commit is contained in:
Chris Rienzo 2013-06-13 15:28:53 -04:00
parent 0ee24a531f
commit dce5bbf88e
2 changed files with 9 additions and 3 deletions

View File

@ -42,8 +42,10 @@
#define RAYO_CALL_NS RAYO_BASE "call:" RAYO_VERSION #define RAYO_CALL_NS RAYO_BASE "call:" RAYO_VERSION
#define RAYO_MIXER_NS RAYO_BASE "mixer:" 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_UUID_IN_REF_URI
#define RAYO_INPUT_COMPLETE_WITHOUT_CONTENT_TYPE
struct rayo_actor; struct rayo_actor;
struct rayo_call; struct rayo_call;

View File

@ -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) 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); #ifdef RAYO_INPUT_COMPLETE_WITHOUT_CONTENT_TYPE
/* add content-type to <match>... */ 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 *match = iks_find(iks_find(event, "complete"), INPUT_MATCH_TAG);
iks_insert_attrib(match, "content-type", "application/nlsml+xml"); 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); rayo_component_send_complete_event(component, event);
#endif
} }
/** /**