ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 05:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v1.4.beta

Browse Source
This commit is contained in:
Ken Rice
2013-06-19 11:29:27 -05:00
parent d0622bdd8e 59a082c091
commit 814c9d53d7
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/event_handlers/mod_rayo/mod_rayo.c
+26 -3
View File
@@ -1838,6 +1838,7 @@ static void *SWITCH_THREAD_FUNC rayo_dial_thread(switch_thread_t *thread, void *
iks *response = NULL;
const char *dcp_jid = iks_find_attrib(iq, "from");
const char *dial_to = iks_find_attrib(dial, "to");
char *dial_to_dup = NULL;
const char *dial_from = iks_find_attrib(dial, "from");
const char *dial_timeout_ms = iks_find_attrib(dial, "timeout");
struct dial_gateway *gateway = NULL;
@@ -1855,6 +1856,24 @@ static void *SWITCH_THREAD_FUNC rayo_dial_thread(switch_thread_t *thread, void *
stream.write_function(&stream, "{origination_uuid=%s,rayo_dcp_jid=%s,rayo_call_jid=%s",
rayo_call_get_uuid(call), dcp_jid, RAYO_JID(call));
/* parse optional params from dialstring and append to */
if (*dial_to == '{') {
switch_event_t *params = NULL;
dial_to_dup = strdup(dial_to);
switch_event_create_brackets(dial_to_dup, '{', '}', ',', &params, (char **)&dial_to, SWITCH_FALSE);
if (params) {
switch_event_header_t *param;
for(param = params->headers; param; param = param->next) {
if (strchr(param->value, ',')) {
stream.write_function(&stream, ",%s=\\'%s\\'", param->name, param->value);
} else {
stream.write_function(&stream, ",%s=%s", param->name, param->value);
}
}
switch_event_destroy(&params);
}
}
/* set originate channel variables */
if (!zstr(dial_from)) {
/* caller ID */
@@ -1976,6 +1995,7 @@ done:
iks_delete(dial);
switch_safe_free(stream.data);
switch_safe_free(dial_to_dup);
return NULL;
}
@@ -1993,8 +2013,13 @@ static iks *on_rayo_dial(struct rayo_actor *client, struct rayo_actor *server, i
switch_threadattr_t *thd_attr = NULL;
iks *dial = iks_find(node, "dial");
iks *response = NULL;
const char *dial_to = iks_find_attrib(dial, "to");
if (!zstr(iks_find_attrib(dial, "to"))) {
if (zstr(dial_to)) {
response = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "missing dial to attribute");
} else if (strchr(dial_to, ' ')) {
response = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "malformed dial string");
} else {
iks *node_dup = iks_copy(node);
iks_insert_attrib(node_dup, "from", RAYO_JID(rclient)); /* save DCP jid in case it isn't specified */
@@ -2003,8 +2028,6 @@ static iks *on_rayo_dial(struct rayo_actor *client, struct rayo_actor *server, i
switch_threadattr_detach_set(thd_attr, 1);
switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
switch_thread_create(&thread, thd_attr, rayo_dial_thread, node_dup, RAYO_POOL(rclient));
} else {
response = iks_new_error_detailed(node, STANZA_ERROR_BAD_REQUEST, "missing dial to attribute");
}
return response;
src/switch_ivr_async.c
+2 -2
View File
@@ -1056,7 +1056,7 @@ static switch_bool_t is_silence_frame(switch_frame_t *frame, int silence_thresho
energy += abs(fdata[j]);
j += codec_impl->number_of_channels;
}
is_silence &= (uint32_t) (energy / (samples / divisor)) < silence_threshold;
is_silence &= (uint32_t) ((energy / (samples / divisor)) < silence_threshold);
}
return is_silence;
@@ -1259,7 +1259,7 @@ static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, s
rh->silence_time = switch_micro_time_now();
} else {
/* continuing silence */
int duration_ms = (switch_micro_time_now() - rh->silence_time) / 1000;
int duration_ms = (int)((switch_micro_time_now() - rh->silence_time) / 1000);
if (rh->silence_timeout_ms > 0 && duration_ms >= rh->silence_timeout_ms) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Recording file %s timeout: %i >= %i\n", rh->file, duration_ms, rh->silence_timeout_ms);
switch_core_media_bug_set_flag(bug, SMBF_PRUNE);