April 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

03 Apr '08

Author: anthm Date: Thu Apr 3 17:33:16 2008 New Revision: 8014 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: tweak 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 Thu Apr 3 17:33:16 2008 @@ -509,6 +509,7 @@ if ((other_session = switch_core_session_locate(uuid))) { switch_channel_t *other_channel = switch_core_session_get_channel(other_session); switch_caller_profile_t *cloned_profile; + const char *o_announce = NULL; if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(other_channel, event); @@ -524,15 +525,14 @@ switch_event_fire(&event); } + if ((o_announce = switch_channel_get_variable(other_channel, "fifo_override_announce"))) { + announce = o_announce; + } + if (announce) { switch_ivr_play_file(session, NULL, announce, NULL); } else { - const char *o_announce = switch_channel_get_variable(other_channel, "fifo_override_announce"); - if (o_announce) { - switch_ivr_play_file(session, NULL, o_announce, NULL); - } else { - switch_ivr_sleep(session, 500); - } + switch_ivr_sleep(session, 500); }

1 0

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

03 Apr '08

Author: anthm Date: Thu Apr 3 17:31:04 2008 New Revision: 8013 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: tweak 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 Thu Apr 3 17:31:04 2008 @@ -84,7 +84,10 @@ case SWITCH_INPUT_TYPE_DTMF: { switch_dtmf_t *dtmf = (switch_dtmf_t *) input; - if (dtmf->digit == '*') { + switch_channel_t *channel = switch_core_session_get_channel(session); + const char *caller_exit_key = switch_channel_get_variable(channel, "fifo_caller_exit_key"); + + if (caller_exit_key && dtmf->digit == *caller_exit_key) { char *bp = buf; *bp = dtmf->digit; return SWITCH_STATUS_BREAK; @@ -312,10 +315,11 @@ while(switch_channel_ready(channel)) { switch_input_args_t args = { 0 }; char buf[25] = ""; + const char *caller_exit_key = switch_channel_get_variable(channel, "fifo_caller_exit_key"); args.input_callback = moh_on_dtmf; args.buf = buf; args.buflen = sizeof(buf); - + if ((serviced_uuid = switch_channel_get_variable(channel, "fifo_serviced_uuid"))) { break; @@ -327,7 +331,7 @@ switch_ivr_collect_digits_callback(session, &args, 0); } - if (*buf == '*') { + if (caller_exit_key && *buf == *caller_exit_key) { aborted = 1; goto abort; }

1 0

[commit] r8012 - in freeswitch/trunk/src: . mod/applications/mod_fifo
by Freeswitch SVN 03 Apr '08

03 Apr '08

Author: anthm Date: Thu Apr 3 17:27:16 2008 New Revision: 8012 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/switch_ivr.c Log: tweak 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 Thu Apr 3 17:27:16 2008 @@ -76,6 +76,28 @@ return SWITCH_STATUS_SUCCESS; } + +static switch_status_t moh_on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) +{ + + switch (itype) { + case SWITCH_INPUT_TYPE_DTMF: + { + switch_dtmf_t *dtmf = (switch_dtmf_t *) input; + if (dtmf->digit == '*') { + char *bp = buf; + *bp = dtmf->digit; + return SWITCH_STATUS_BREAK; + } + } + break; + default: + break; + } + + return SWITCH_STATUS_SUCCESS; +} + #define check_string(s) if (!switch_strlen_zero(s) && !strcasecmp(s, "undef")) { s = NULL; } static switch_status_t read_frame_callback(switch_core_session_t *session, switch_frame_t *frame, void *user_data) @@ -206,6 +228,7 @@ switch_time_exp_t tm; switch_time_t ts = switch_timestamp_now(); switch_size_t retsize; + const char *serviced_uuid = NULL; if (!globals.running) { return; @@ -233,9 +256,12 @@ announce = switch_channel_get_variable(channel, "fifo_announce"); if (!strcasecmp(argv[1], "in")) { + switch_core_session_t *other_session; + switch_channel_t *other_channel; const char *uuid = strdup(switch_core_session_get_uuid(session)); const char *pri; int p = 0; + int aborted = 0; switch_channel_answer(channel); @@ -250,12 +276,6 @@ check_string(announce); check_string(moh); - if (moh) { - switch_ivr_broadcast(uuid, moh, SMF_LOOP | SMF_ECHO_ALEG); - } - - switch_channel_set_flag(channel, CF_TAGGED); - switch_mutex_lock(node->mutex); node->caller_count++; node->waiting_count++; @@ -287,7 +307,45 @@ switch_event_fire(&event); } - switch_ivr_park(session, NULL); + switch_channel_set_flag(channel, CF_TAGGED); + + while(switch_channel_ready(channel)) { + switch_input_args_t args = { 0 }; + char buf[25] = ""; + args.input_callback = moh_on_dtmf; + args.buf = buf; + args.buflen = sizeof(buf); + + + if ((serviced_uuid = switch_channel_get_variable(channel, "fifo_serviced_uuid"))) { + break; + } + + if (moh) { + switch_ivr_play_file(session, NULL, moh, &args); + } else { + switch_ivr_collect_digits_callback(session, &args, 0); + } + + if (*buf == '*') { + aborted = 1; + goto abort; + } + + } + + if (!serviced_uuid && switch_channel_ready(channel)) { + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + } else if ((other_session = switch_core_session_locate(serviced_uuid))) { + int ready; + other_channel = switch_core_session_get_channel(other_session); + ready = switch_channel_ready(other_channel); + switch_core_session_rwunlock(other_session); + if (!ready) { + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + } + } + if (switch_channel_ready(channel)) { if (announce) { @@ -296,8 +354,10 @@ } switch_channel_clear_flag(channel, CF_TAGGED); - - if (switch_channel_ready(channel)) { + + abort: + + if (!aborted && switch_channel_ready(channel)) { switch_channel_set_state(channel, CS_HIBERNATE); } else { ts = switch_timestamp_now(); @@ -335,9 +395,14 @@ char *pop_list[MAX_PRI] = { 0 }; const char *fifo_consumer_wrapup_sound = NULL; const char *fifo_consumer_wrapup_key = NULL; + const char *my_id; char buf[5] = ""; + if (!(my_id = switch_channel_get_variable(channel, "fifo_consumer_id"))) { + my_id = switch_core_session_get_uuid(session); + } + if (argc > 2) { if (!strcasecmp(argv[2], "nowait")) { nowait++; @@ -458,21 +523,32 @@ if (announce) { switch_ivr_play_file(session, NULL, announce, NULL); } else { - switch_ivr_sleep(session, 500); + const char *o_announce = switch_channel_get_variable(other_channel, "fifo_override_announce"); + if (o_announce) { + switch_ivr_play_file(session, NULL, o_announce, NULL); + } else { + switch_ivr_sleep(session, 500); + } } + + + switch_channel_set_variable(other_channel, "fifo_serviced_by", my_id); + switch_channel_set_variable(other_channel, "fifo_serviced_uuid", switch_core_session_get_uuid(session)); + switch_channel_set_flag(other_channel, CF_BREAK); + + while (switch_channel_ready(channel) && switch_channel_ready(other_channel) && switch_channel_test_flag(other_channel, CF_TAGGED)) { + status = switch_core_session_read_frame(session, &read_frame, -1, 0); + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + } + + if (!(switch_channel_ready(channel))) { + switch_channel_hangup(other_channel, SWITCH_CAUSE_NORMAL_CLEARING); + switch_core_session_rwunlock(other_session); + break; + } - if (switch_channel_test_flag(other_channel, CF_TAGGED)) { - switch_channel_clear_flag(other_channel, CF_CONTROLLED); - switch_core_session_flush_private_events(other_session); - switch_channel_stop_broadcast(other_channel); - switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK); - while (switch_channel_test_flag(other_channel, CF_TAGGED)) { - status = switch_core_session_read_frame(session, &read_frame, -1, 0); - if (!SWITCH_READ_ACCEPTABLE(status)) { - break; - } - } - } switch_channel_answer(channel); cloned_profile = switch_caller_profile_clone(other_session, switch_channel_get_caller_profile(channel)); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Apr 3 17:27:16 2008 @@ -576,6 +576,12 @@ switch_event_t *event; switch_dtmf_t dtmf = {0}; + if (switch_channel_test_flag(channel, CF_BREAK)) { + switch_channel_clear_flag(channel, CF_BREAK); + status = SWITCH_STATUS_BREAK; + break; + } + if (timeout) { elapsed = (uint32_t) ((switch_timestamp_now() - started) / 1000); if (elapsed >= timeout) {

1 0

[commit] r8011 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 03 Apr '08

03 Apr '08

Author: cparker Date: Thu Apr 3 16:12:26 2008 New Revision: 8011 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml Log: Fix typo in seqfile paramter Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml Thu Apr 3 16:12:26 2008 @@ -3,7 +3,7 @@  <param name="dictionary" value="/usr/local/freeswitch/conf/radius/dictionary"/>  - <param name="dictionary" value="/var/run/radius.seq"/> + <param name="seqfile" value="/var/run/radius.seq"/>

1 0

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

03 Apr '08

Author: anthm Date: Thu Apr 3 16:08:39 2008 New Revision: 8010 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 Thu Apr 3 16:08:39 2008 @@ -232,15 +232,6 @@ moh = switch_channel_get_variable(channel, "fifo_music"); announce = switch_channel_get_variable(channel, "fifo_announce"); - if (argc > 2) { - if (!strcasecmp(argv[2], "nowait")) { - nowait++; - } else if (strcasecmp(argv[2], "wait")) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); - return; - } - } - if (!strcasecmp(argv[1], "in")) { const char *uuid = strdup(switch_core_session_get_uuid(session)); const char *pri; @@ -346,6 +337,16 @@ const char *fifo_consumer_wrapup_key = NULL; char buf[5] = ""; + + if (argc > 2) { + if (!strcasecmp(argv[2], "nowait")) { + nowait++; + } else if (strcasecmp(argv[2], "wait")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); + return; + } + } + if (argc > 3) { announce = argv[3]; }

1 0

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

03 Apr '08

Author: anthm Date: Thu Apr 3 16:01:59 2008 New Revision: 8009 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: enforce wait/nowait arg on out 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 Thu Apr 3 16:01:59 2008 @@ -233,7 +233,12 @@ announce = switch_channel_get_variable(channel, "fifo_announce"); if (argc > 2) { - nowait = !strcasecmp(argv[2], "nowait"); + if (!strcasecmp(argv[2], "nowait")) { + nowait++; + } else if (strcasecmp(argv[2], "wait")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); + return; + } } if (!strcasecmp(argv[1], "in")) {

1 0

[commit] r8008 - freeswitch/trunk
by Freeswitch SVN 03 Apr '08

03 Apr '08

Author: anthm Date: Thu Apr 3 10:31:47 2008 New Revision: 8008 Modified: freeswitch/trunk/Makefile.am Log: add make sync Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu Apr 3 10:31:47 2008 @@ -307,6 +307,10 @@ $(MAKE) -j modules $(MAKE) install +sync: + svn update + $(MAKE) -j install + libs/openzap/Makefile: cd libs/openzap && autoconf cd libs/openzap && ./configure

1 0

[commit] r8007 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 03 Apr '08

03 Apr '08

Author: mikej Date: Thu Apr 3 01:40:27 2008 New Revision: 8007 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Log: try linking directly to the nspr lib Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Thu Apr 3 01:40:27 2008 @@ -3,7 +3,7 @@ JSLA=$(JS_DIR)/libjs.la LOCAL_CFLAGS+=-I$(JS_DIR)/src -I$(JS_DIR)/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUPPORT=1 -LOCAL_LDFLAGS+=-L$(JS_DIR)/nsprpub/pr/src -L$(JS_DIR)/nsprpub/dist/lib -lnspr4 +LOCAL_LDFLAGS+=$(JS_DIR)/nsprpub/pr/src/libnspr4.* LOCAL_LIBADD+=$(JSLA) include $(switch_srcdir)/build/modmake.rules

1 0

[commit] r8006 - in freeswitch/trunk/src: . include
by Freeswitch SVN 02 Apr '08

02 Apr '08

Author: anthm Date: Wed Apr 2 16:53:13 2008 New Revision: 8006 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Apr 2 16:53:13 2008 @@ -398,7 +398,8 @@ SWITCH_RTP_FLAG_AUTO_CNG = (1 << 15), SWITCH_RTP_FLAG_SECURE_SEND_RESET = (1 << 16), SWITCH_RTP_FLAG_SECURE_RECV_RESET = (1 << 17), - SWITCH_RTP_FLAG_PROXY_MEDIA = (1 << 18) + SWITCH_RTP_FLAG_PROXY_MEDIA = (1 << 18), + SWITCH_RTP_FLAG_SHUTDOWN = (1 << 19) } switch_rtp_flag_t; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Apr 2 16:53:13 2008 @@ -862,13 +862,12 @@ { uint8_t ret; - if (!rtp_session || !rtp_session->flag_mutex) { + if (!rtp_session || !rtp_session->flag_mutex || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SHUTDOWN)) { return 0; } switch_mutex_lock(rtp_session->flag_mutex); - ret = (rtp_session != NULL && - switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) && rtp_session->sock && rtp_session->remote_addr && rtp_session->ready == 2) ? 1 : 0; + ret = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) && rtp_session->sock && rtp_session->remote_addr && rtp_session->ready == 2) ? 1 : 0; switch_mutex_unlock(rtp_session->flag_mutex); return ret; @@ -883,7 +882,7 @@ return; } - switch_mutex_lock((*rtp_session)->flag_mutex); + switch_set_flag_locked((*rtp_session), SWITCH_RTP_FLAG_SHUTDOWN); READ_INC((*rtp_session)); WRITE_INC((*rtp_session)); @@ -893,6 +892,7 @@ READ_DEC((*rtp_session)); WRITE_DEC((*rtp_session)); + switch_mutex_lock((*rtp_session)->flag_mutex); switch_rtp_kill_socket(*rtp_session);

1 0

[commit] r8005 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Apr '08

02 Apr '08

Author: mikej Date: Wed Apr 2 16:49:42 2008 New Revision: 8005 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix sip session timers on inbound calls when setting from profile param. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Apr 2 16:49:42 2008 @@ -326,7 +326,7 @@ private_object_t *tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status; - uint32_t session_timeout = 0; + uint32_t session_timeout = tech_pvt->profile->session_timeout; const char *val; if (switch_test_flag(tech_pvt, TFLAG_ANS) || switch_channel_test_flag(channel, CF_OUTBOUND)) {

1 0