- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8040 - freeswitch/trunk/src
by Freeswitch SVN 06 Apr '08

06 Apr '08

Author: anthm Date: Sun Apr 6 19:47:33 2008 New Revision: 8040 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Apr 6 19:47:33 2008 @@ -1123,6 +1123,10 @@ goto end; } + if (bytes > 0) { + rtp_session->missed_count = 0; + } + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); do_2833(rtp_session); @@ -1347,10 +1351,6 @@ } } - if (bytes > 0) { - rtp_session->missed_count = 0; - } - if (status == SWITCH_STATUS_BREAK || bytes == 0) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DATAWAIT)) { goto do_continue;

1 0

[commit] r8039 - in freeswitch/trunk/src: include mod/applications/mod_fifo
by Freeswitch SVN 05 Apr '08

05 Apr '08

Author: anthm Date: Sat Apr 5 11:48:12 2008 New Revision: 8039 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: add fifo_record_template Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Sat Apr 5 11:48:12 2008 @@ -91,6 +91,13 @@ } session_flag_t; +class switchEvent { + protected: + switch_event_t *event; + public: + switchEvent(switch_event_types_t event_id, const char *subclass_name); +}; + class CoreSession { protected: switch_input_args_t args; // holds ptr to cb function and input_callback_state struct Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Sat Apr 5 11:48:12 2008 @@ -797,7 +797,9 @@ switch_channel_t *other_channel = switch_core_session_get_channel(other_session); switch_caller_profile_t *cloned_profile; const char *o_announce = NULL; - + const char *record_template = switch_channel_get_variable(channel, "fifo_record_template"); + char *expanded = NULL; + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(other_channel, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "FIFO-Name", "%s", argv[0]); @@ -864,8 +866,21 @@ switch_mutex_lock(node->mutex); send_presence(node); switch_mutex_unlock(node->mutex); + + if (record_template) { + expanded = switch_channel_expand_variables(other_channel, record_template); + switch_ivr_record_session(session, expanded, 0, NULL); + } + switch_ivr_multi_threaded_bridge(session, other_session, on_dtmf, other_session, session); + if (record_template) { + switch_ivr_stop_record_session(session, expanded); + if (expanded != record_template) { + switch_safe_free(expanded); + } + } + ts = switch_timestamp_now(); switch_time_exp_lt(&tm, ts); switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm);

1 0

[commit] r8038 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 05 Apr '08

05 Apr '08

Author: anthm Date: Fri Apr 4 23:20:06 2008 New Revision: 8038 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Apr 4 23:20:06 2008 @@ -117,7 +117,7 @@ static void node_remove_uuid(fifo_node_t *node, const char *uuid) { - int i, len = 0; + int i, len = 0, done = 0; void *pop = NULL; for (i = 0; i < MAX_PRI; i++) { @@ -126,18 +126,17 @@ } while(len) { if (switch_queue_trypop(node->fifo_list[i], &pop) == SWITCH_STATUS_SUCCESS && pop) { - if (!strcmp((char *)pop, uuid)) { + if (!done && !strcmp((char *)pop, uuid)) { free(pop); - goto end; + done++; + } else { + switch_queue_push(node->fifo_list[i], pop); } - switch_queue_push(node->fifo_list[i], pop); } len--; } } - end: - if (!node_consumer_wait_count(node)) { node->start_waiting = 0; }

1 0

[commit] r8037 - freeswitch/trunk/src
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: anthm Date: Fri Apr 4 18:58:34 2008 New Revision: 8037 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: fix cpp wrapper Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Fri Apr 4 18:58:34 2008 @@ -71,12 +71,11 @@ CoreSession::CoreSession(char *nuuid) { - + memset(&caller_profile, 0, sizeof(caller_profile)); + init_vars(); if (session = switch_core_session_locate(nuuid)) { channel = switch_core_session_get_channel(session); - init_vars(); uuid = strdup(nuuid); - memset(&caller_profile, 0, sizeof(caller_profile)); allocated = 1; } } @@ -162,6 +161,8 @@ void CoreSession::setDTMFCallback(void *cbfunc, char *funcargs) { + sanity_check_noreturn; + cb_state.funcargs = funcargs; cb_state.function = cbfunc; @@ -466,6 +467,8 @@ void CoreSession::setHangupHook(void *hangup_func) { + sanity_check_noreturn; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::seHangupHook, hangup_func: %p\n", hangup_func); on_hangup = hangup_func; switch_channel_t *channel = switch_core_session_get_channel(session);

1 0

[commit] r8036 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: stkn Date: Fri Apr 4 18:17:06 2008 New Revision: 8036 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: Fix typo in log message: Invaid -> Invalid Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Apr 4 18:17:06 2008 @@ -641,7 +641,7 @@ } else if (!strcasecmp(strat_str, "waiting_longer")) { strat = STRAT_WAITING_LONGER; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid strategy\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid strategy\n"); return; } }

1 0

[commit] r8035 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: mikej Date: Fri Apr 4 18:04:10 2008 New Revision: 8035 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: match type. Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Apr 4 18:04:10 2008 @@ -2857,7 +2857,7 @@ if (profile->acl_count) { for (x = 0; x < len; x++) { - int y = 0; + uint32_t y = 0; for (y = 0; y < profile->acl_count; y++) { if (switch_check_network_list_ip(candidates[x].address, profile->acl[y])) { choice = x;

1 0

[commit] r8034 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: mikej Date: Fri Apr 4 18:03:41 2008 New Revision: 8034 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: code before declaration. Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Apr 4 18:03:41 2008 @@ -697,8 +697,9 @@ } for (x = 0; x < custom_pop; x++) { + int temp; switch_assert(pop_list[x]); - int temp = atoi(pop_list[x]); + temp = atoi(pop_list[x]); if (temp > -1 && temp < MAX_PRI) { pop_array[x] = temp; }

1 0

[commit] r8033 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: anthm Date: Fri Apr 4 18:02:08 2008 New Revision: 8033 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Apr 4 18:02:08 2008 @@ -165,7 +165,11 @@ { fifo_chime_data_t *cd = (fifo_chime_data_t *) user_data; - if (cd && cd->total && switch_timestamp(NULL) >= cd->next) { + if (!cd) { + return SWITCH_STATUS_SUCCESS; + } + + if (cd->total && switch_timestamp(NULL) >= cd->next) { if (cd->index == MAX_CHIME || cd->index == cd->total || !cd->list[cd->index]) { cd->index = 0; } @@ -361,7 +365,7 @@ arg_fifo_name = argv[0]; arg_inout = argv[1]; - if (!arg_fifo_name && arg_inout) { + if (!(arg_fifo_name && arg_inout)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); return; } @@ -693,6 +697,7 @@ } for (x = 0; x < custom_pop; x++) { + switch_assert(pop_list[x]); int temp = atoi(pop_list[x]); if (temp > -1 && temp < MAX_PRI) { pop_array[x] = temp;

1 0

[commit] r8032 - in freeswitch/trunk/conf: autoload_configs jingle_profiles
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: anthm Date: Fri Apr 4 18:01:53 2008 New Revision: 8032 Modified: freeswitch/trunk/conf/autoload_configs/acl.conf.xml freeswitch/trunk/conf/jingle_profiles/client.xml freeswitch/trunk/conf/jingle_profiles/server.xml Log: update Modified: freeswitch/trunk/conf/autoload_configs/acl.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/acl.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/acl.conf.xml Fri Apr 4 18:01:53 2008 @@ -1,5 +1,10 @@ <configuration name="acl.conf" description="Network Lists"> <network-lists> + <list name="dl-candidates" default="allow"> + <node type="deny" cidr="10.0.0.0/8"/> + <node type="deny" cidr="172.16.0.0/12"/> + <node type="deny" cidr="192.168.0.0/16"/> + </list> <list name="rfc1918" default="deny"> <node type="allow" cidr="10.0.0.0/8"/> <node type="allow" cidr="172.16.0.0/12"/> Modified: freeswitch/trunk/conf/jingle_profiles/client.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/client.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/client.xml Fri Apr 4 18:01:53 2008 @@ -25,5 +25,6 @@  <param name="vad" value="both"/>  +  </x-profile> </include> Modified: freeswitch/trunk/conf/jingle_profiles/server.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/server.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/server.xml Fri Apr 4 18:01:53 2008 @@ -15,5 +15,6 @@    +  </x-profile> </include>

1 0

[commit] r8031 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 04 Apr '08

04 Apr '08

Author: anthm Date: Fri Apr 4 17:53:45 2008 New Revision: 8031 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: add some goodies to mod_fifo Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Apr 4 17:53:45 2008 @@ -407,6 +407,26 @@ moh = switch_channel_get_variable(channel, "fifo_music"); announce = switch_channel_get_variable(channel, "fifo_announce"); + + if (consumer) { + if (argc > 3) { + announce = argv[3]; + } + + if (argc > 4) { + moh = argv[4]; + } + + } else { + if (argc > 2) { + announce = argv[2]; + } + + if (argc > 3) { + moh = argv[3]; + } + } + check_string(announce); check_string(moh);

1 0