April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13193 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Wed Apr 29 12:35:49 2009 New Revision: 13193 Log: add show channels like %foo% (no % in the string implies wrapped in %, no spaces allowed in match string Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Wed Apr 29 12:35:49 2009 @@ -2650,7 +2650,7 @@ return SWITCH_STATUS_SUCCESS; } -#define SHOW_SYNTAX "codec|application|api|dialplan|file|timer|calls [count]|channels [count]|aliases|complete|chat|endpoint|management|modules|say|interfaces|interface_types" +#define SHOW_SYNTAX "codec|endpoint|application|api|dialplan|file|timer|calls [count]|channels [count]|aliases|complete|chat|endpoint|management|modules|say|interfaces|interface_types" SWITCH_STANDARD_API(show_function) { char sql[1024]; @@ -2741,12 +2741,35 @@ as = argv[3]; } } + } else if (!strcasecmp(command, "channels") && argv[1] && !strcasecmp(argv[1], "like")) { + if (argv[2]) { + char *p; + for (p = argv[2]; p && *p; p++) { + if (*p == '\'' || *p == ';') { + *p = ' '; + } + } + if (strchr(argv[2], '%')) { + sprintf(sql, "select * from channels where name like '%s' or cid_name like '%s' or cid_num like '%s' order by created_epoch", + argv[2], argv[2], argv[2]); + } else { + sprintf(sql, "select * from channels where name like '%%%s%%' or cid_name like '%%%s%%' or cid_num like '%%%s%%' order by created_epoch", + argv[2], argv[2], argv[2]); + + } + + if (argv[4] && !strcasecmp(argv[3], "as")) { + as = argv[4]; + } + } else { + sprintf(sql, "select * from channels order by created_epoch"); + } } else if (!strcasecmp(command, "channels")) { sprintf(sql, "select * from channels order by created_epoch"); if (argv[1] && !strcasecmp(argv[1],"count")) { holder.justcount = 1; if (argv[3] && !strcasecmp(argv[2], "as")) { - as = argv[3]; + as = argv[3]; } } } else if (!strcasecmp(command, "aliases")) {

1 0

[commit] r13192 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Wed Apr 29 12:09:29 2009 New Revision: 13192 Log: too many commas Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Apr 29 12:09:29 2009 @@ -154,7 +154,7 @@ CFLAG_ENFORCE_MIN = (1 << 2), CFLAG_DESTRUCT = (1 << 3), CFLAG_LOCKED = (1 << 4), - CFLAG_ANSWERED = (1 << 5), + CFLAG_ANSWERED = (1 << 5) } conf_flag_t; typedef enum {

1 0

[commit] r13191 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Wed Apr 29 12:07:51 2009 New Revision: 13191 Log: dist-dtmf flag in conference Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Apr 29 12:07:51 2009 @@ -144,7 +144,8 @@ MFLAG_TALKING = (1 << 11), MFLAG_RESTART = (1 << 12), MFLAG_MINTWO = (1 << 13), - MFLAG_MUTE_DETECT = (1 << 14) + MFLAG_MUTE_DETECT = (1 << 14), + MFLAG_DIST_DTMF = (1 << 15) } member_flag_t; typedef enum { @@ -153,7 +154,7 @@ CFLAG_ENFORCE_MIN = (1 << 2), CFLAG_DESTRUCT = (1 << 3), CFLAG_LOCKED = (1 << 4), - CFLAG_ANSWERED = (1 << 5) + CFLAG_ANSWERED = (1 << 5), } conf_flag_t; typedef enum { @@ -358,6 +359,7 @@ static void conference_loop_output(conference_member_t *member); static uint32_t conference_stop_file(conference_obj_t *conference, file_stop_t stop); static switch_status_t conference_play_file(conference_obj_t *conference, char *file, uint32_t leadin, switch_channel_t *channel, uint8_t async); +static void conference_send_all_dtmf(conference_obj_t *conference, const char *dtmf); static switch_status_t conference_say(conference_obj_t *conference, const char *text, uint32_t leadin); static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim); static conference_obj_t *conference_find(char *name); @@ -1999,11 +2001,14 @@ if (switch_channel_has_dtmf(channel)) { switch_channel_dequeue_dtmf_string(channel, dtmf, sizeof(dtmf)); - if (member->conference->dtmf_parser != NULL) { - - for (digit = dtmf; *digit && caller_action == NULL; digit++) { - caller_action = (caller_control_action_t *) - switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, *digit); + if (switch_test_flag(member, MFLAG_DIST_DTMF)) { + conference_send_all_dtmf(member->conference, dtmf); + } else { + if (member->conference->dtmf_parser != NULL) { + for (digit = dtmf; *digit && caller_action == NULL; digit++) { + caller_action = (caller_control_action_t *) + switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, *digit); + } } } /* otherwise, clock the parser so that it can handle digit timeout detection */ @@ -2414,6 +2419,27 @@ return count; } +static void conference_send_all_dtmf(conference_obj_t *conference, const char *dtmf) +{ + conference_member_t *imember; + + switch_mutex_lock(conference->mutex); + switch_mutex_lock(conference->member_mutex); + + for (imember = conference->members; imember; imember = imember->next) { + if (imember->session) { + const char *p; + for (p = dtmf; p && *p; p++) { + switch_dtmf_t dtmf = { *p, SWITCH_DEFAULT_DTMF_DURATION}; + switch_channel_queue_dtmf(switch_core_session_get_channel(imember->session), &dtmf); + } + } + } + + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); +} + /* Play a file in the conference room */ static switch_status_t conference_play_file(conference_obj_t *conference, char *file, uint32_t leadin, switch_channel_t *channel, uint8_t async) { @@ -4431,6 +4457,8 @@ *f |= MFLAG_WASTE_BANDWIDTH; } else if (!strcasecmp(argv[i], "mute-detect")) { *f |= MFLAG_MUTE_DETECT; + } else if (!strcasecmp(argv[i], "dist-dtmf")) { + *f |= MFLAG_DIST_DTMF; } else if (!strcasecmp(argv[i], "endconf")) { *f |= MFLAG_ENDCONF; } else if (!strcasecmp(argv[i], "mintwo")) {

1 0

[commit] r13190 - freeswitch/trunk/src
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Wed Apr 29 10:08:53 2009 New Revision: 13190 Log: fix unint memory issue Modified: freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed Apr 29 10:08:53 2009 @@ -835,7 +835,7 @@ switch_size_t olen = 0, llen = 0; switch_frame_t write_frame = { 0 }; switch_timer_t timer = { 0 }; - switch_codec_t codec; + switch_codec_t codec = { 0 }; switch_memory_pool_t *pool = switch_core_session_get_pool(session); char *codec_name; switch_status_t status = SWITCH_STATUS_SUCCESS;

1 0

[commit] r13189 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Wed Apr 29 09:52:46 2009 New Revision: 13189 Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 29 09:52:46 2009 @@ -1029,7 +1029,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s activate passthru 2833 mode.\n", switch_channel_get_name(channel)); } - rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK); + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); } goto end; case SWITCH_MESSAGE_INDICATE_UNBRIDGE: @@ -1038,7 +1038,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s deactivate passthru 2833 mode.\n", switch_channel_get_name(channel)); switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833); } - rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_UNSTICK); + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); } goto end; case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC:

1 0

[commit] r13188 - in freeswitch/trunk: libs/esl/perl src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Tue Apr 28 23:15:52 2009 New Revision: 13188 Log: update last commit Added: freeswitch/trunk/libs/esl/perl/send_notify.pl Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Added: freeswitch/trunk/libs/esl/perl/send_notify.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/perl/send_notify.pl Tue Apr 28 23:15:52 2009 @@ -0,0 +1,21 @@ +#!/usr/bin/perl + +require ESL; + +ESL::eslSetLogLevel(7); + +my $con = ESL::ESLconnection->new("localhost", "8021", "ClueCon"); +my $e = ESL::ESLevent->new("NOTIFY"); + + +$e->addHeader("from-uri", "sip:1000\@dev.bkw.org"); +$e->addHeader("to-uri", "sip:1000\@dev.bkw.org"); +$e->addHeader("event-string", "message-summary"); +$e->addHeader("content-type", "application/simple-message-summary"); +$e->addHeader("profile", "internal"); + + +my $body ="Messages-Waiting: yes\nMessage-Account: me\(a)my.com\nVoice-Message: 0/0 (0/0)\n"; +$e->addBody($body); +$con->sendEvent($e); + 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 Tue Apr 28 23:15:52 2009 @@ -2807,30 +2807,62 @@ const char *from_uri = switch_event_get_header(event, "from-uri"); sofia_profile_t *profile; - if (to_uri && from_uri && ct && es && profile_name && (profile = sofia_glue_find_profile(profile_name))) { - nua_handle_t *nh = nua_handle(profile->nua, - NULL, - NUTAG_URL(to_uri), - SIPTAG_FROM_STR(from_uri), - SIPTAG_TO_STR(to_uri), - SIPTAG_CONTACT_STR(profile->url), - TAG_END()); - - nua_handle_bind(nh, &mod_sofia_globals.destroy_private); - - nua_info(nh, - NUTAG_WITH_THIS(profile->nua), - TAG_IF(ct, SIPTAG_CONTENT_TYPE_STR(ct)), - TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)), - TAG_END()); + + if (to_uri || from_uri) { + if (!to_uri) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing To-URI header\n"); + return; + } + + if (!from_uri) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing From-URI header\n"); + return; + } + + if (!es) { + es = "message-summary"; + } + + if (!ct) { + ct = "application/simple-message-summary"; + } + if (!profile_name) { + profile_name = "default"; + } + + if (!(profile = sofia_glue_find_profile(profile_name))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find profile %s\n", profile_name); + return; + } - sofia_glue_release_profile(profile); - return; + if (to_uri && from_uri && ct && es && profile_name && (profile = sofia_glue_find_profile(profile_name))) { + nua_handle_t *nh = nua_handle(profile->nua, + NULL, + NUTAG_URL(to_uri), + SIPTAG_FROM_STR(from_uri), + SIPTAG_TO_STR(to_uri), + SIPTAG_CONTACT_STR(profile->url), + TAG_END()); + + nua_handle_bind(nh, &mod_sofia_globals.destroy_private); + + nua_notify(nh, + NUTAG_NEWSUB(1), + NUTAG_WITH_THIS(profile->nua), + SIPTAG_EVENT_STR(es), + TAG_IF(ct, SIPTAG_CONTENT_TYPE_STR(ct)), + TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)), + TAG_END()); + + sofia_glue_release_profile(profile); + } + + return; } - + if (uuid && ct && es) { switch_core_session_t *session; private_object_t *tech_pvt; @@ -2944,28 +2976,27 @@ char buf[1024] = ""; char *p; - if (!profile_name) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing Profile Name\n"); - goto done; - } - - if (!to_uri && !local_user_full) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing To-URI header\n"); - goto done; - } - - if (!from_uri) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing From-URI header\n"); - goto done; - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing Profile Name\n"); + goto done; + } + + if (!to_uri && !local_user_full) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing To-URI header\n"); + goto done; + } + + if (!from_uri) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing From-URI header\n"); + goto done; + } + + + if (!(profile = sofia_glue_find_profile(profile_name))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find profile %s\n", profile_name); + goto done; + } - - if (!(profile = sofia_glue_find_profile(profile_name))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find profile %s\n", profile_name); - goto done; - } - if (local_user_full) { local_dup = strdup(local_user_full);

1 0

[commit] r13187 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Tue Apr 28 22:37:30 2009 New Revision: 13187 Log: arbitrary notify Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Tue Apr 28 22:37:30 2009 @@ -2803,8 +2803,34 @@ const char *call_id = switch_event_get_header(event, "call-id"); const char *uuid = switch_event_get_header(event, "uuid"); const char *body = switch_event_get_body(event); + const char *to_uri = switch_event_get_header(event, "to-uri"); + const char *from_uri = switch_event_get_header(event, "from-uri"); sofia_profile_t *profile; + if (to_uri && from_uri && ct && es && profile_name && (profile = sofia_glue_find_profile(profile_name))) { + nua_handle_t *nh = nua_handle(profile->nua, + NULL, + NUTAG_URL(to_uri), + SIPTAG_FROM_STR(from_uri), + SIPTAG_TO_STR(to_uri), + SIPTAG_CONTACT_STR(profile->url), + TAG_END()); + + nua_handle_bind(nh, &mod_sofia_globals.destroy_private); + + nua_info(nh, + NUTAG_WITH_THIS(profile->nua), + TAG_IF(ct, SIPTAG_CONTENT_TYPE_STR(ct)), + TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)), + TAG_END()); + + + + sofia_glue_release_profile(profile); + return; + + } + if (uuid && ct && es) { switch_core_session_t *session; private_object_t *tech_pvt;

1 0

[commit] r13186 - freeswitch/trunk/src/mod/formats/mod_local_stream
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Tue Apr 28 22:24:53 2009 New Revision: 13186 Log: fail over to default if desired stream is not found Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Tue Apr 28 22:24:53 2009 @@ -318,7 +318,7 @@ } } else { if (!switch_stristr("default", alt_path) && !switch_stristr("default", path)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown source %s, trying 'default'\n", path); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown source %s, trying 'default'\n", path); free(alt_path); path = "default"; goto top;

1 0

[commit] r13185 - freeswitch/trunk/src/mod/formats/mod_local_stream
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Tue Apr 28 22:23:26 2009 New Revision: 13185 Log: fail over to default if desired stream is not found Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Tue Apr 28 22:23:26 2009 @@ -301,11 +301,12 @@ return SWITCH_STATUS_FALSE; } + switch_mutex_lock(globals.mutex); + top: alt_path = switch_mprintf("%s/%d", path, handle->samplerate); - switch_mutex_lock(globals.mutex); if ((source = switch_core_hash_find(globals.source_hash, alt_path))) { path = alt_path; } else {

1 0

[commit] r13184 - freeswitch/trunk/src/mod/formats/mod_local_stream
by FreeSWITCH SVN 29 Apr '09

29 Apr '09

Author: anthm Date: Tue Apr 28 22:05:35 2009 New Revision: 13184 Log: fail over to default if desired stream is not found Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Tue Apr 28 22:05:35 2009 @@ -301,6 +301,8 @@ return SWITCH_STATUS_FALSE; } + top: + alt_path = switch_mprintf("%s/%d", path, handle->samplerate); switch_mutex_lock(globals.mutex); @@ -313,6 +315,13 @@ if (switch_thread_rwlock_tryrdlock(source->rwlock) != SWITCH_STATUS_SUCCESS) { source = NULL; } + } else { + if (!switch_stristr("default", alt_path) && !switch_stristr("default", path)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown source %s, trying 'default'\n", path); + free(alt_path); + path = "default"; + goto top; + } } switch_mutex_unlock(globals.mutex);

1 0