February 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4127 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Feb '07

05 Feb '07

Author: mikej Date: Mon Feb 5 18:48:12 2007 New Revision: 4127 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: make from use the external sip ip when it is set instead of the bind ip. 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 Mon Feb 5 18:48:12 2007 @@ -975,7 +975,7 @@ if ((tech_pvt->from_str = switch_mprintf("\"%s\" <sip:%s@%s>", cid_name, cid_num, - tech_pvt->profile->sipip + tech_pvt->profile->extsipip ? tech_pvt->profile->extsipip : tech_pvt->profile->sipip ))) { char *rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); @@ -1085,7 +1085,7 @@ if ((tech_pvt->from_str = switch_mprintf("\"%s\" <sip:%s@%s>", (char *) caller_profile->caller_id_name, (char *) caller_profile->caller_id_number, - tech_pvt->profile->sipip + tech_pvt->profile->extsipip ? tech_pvt->profile->extsipip : tech_pvt->profile->sipip ))) { char *rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER);

1 0

[commit] r4126 - freeswitch/trunk/src
by Freeswitch SVN 05 Feb '07

05 Feb '07

Author: anthm Date: Mon Feb 5 16:10:39 2007 New Revision: 4126 Modified: freeswitch/trunk/src/switch_ivr.c Log: doh Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 5 16:10:39 2007 @@ -2992,7 +2992,7 @@ *cause = SWITCH_CAUSE_UNALLOCATED; if (var_event) { - if (!caller_channel) { /* install the vars from the {} params */ + if (peer_channel && !caller_channel) { /* install the vars from the {} params */ switch_event_header_t *header; for (header = var_event->headers; header; header = header->next) { switch_channel_set_variable(peer_channel, header->name, header->value);

1 0

[commit] r4125 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Feb '07

05 Feb '07

Author: anthm Date: Mon Feb 5 14:42:02 2007 New Revision: 4125 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add absolute_codec_string 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 Mon Feb 5 14:42:02 2007 @@ -779,7 +779,7 @@ static void tech_set_codecs(private_object_t *tech_pvt) { switch_channel_t *channel; - char *codec_string = NULL; + char *abs, *codec_string = NULL; char *csdyn = NULL; char *ocodec = NULL; @@ -797,18 +797,22 @@ assert (channel != NULL); - if (!(codec_string = switch_channel_get_variable(channel, "codec_string"))) { - codec_string = tech_pvt->profile->codec_string; - } - - if ((ocodec = switch_channel_get_variable(channel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) { - if (!codec_string || (tech_pvt->profile->pflags & PFLAG_DISABLE_TRANSCODING)) { - codec_string = ocodec; - } else { - if ((csdyn = switch_mprintf("%s,%s", ocodec, codec_string))) { - codec_string = csdyn; - } else { + if ((abs = switch_channel_get_variable(channel, "absolute_codec_string"))) { + codec_string = abs; + } else { + if (!(codec_string = switch_channel_get_variable(channel, "codec_string"))) { + codec_string = tech_pvt->profile->codec_string; + } + + if ((ocodec = switch_channel_get_variable(channel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) { + if (!codec_string || (tech_pvt->profile->pflags & PFLAG_DISABLE_TRANSCODING)) { codec_string = ocodec; + } else { + if ((csdyn = switch_mprintf("%s,%s", ocodec, codec_string))) { + codec_string = csdyn; + } else { + codec_string = ocodec; + } } } }

1 0

[commit] r4124 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 05 Feb '07

05 Feb '07

Author: anthm Date: Mon Feb 5 14:35:31 2007 New Revision: 4124 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_channel.c Log: get rid of _ char in special vars and add an unset dialplan app for clarity sake Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Feb 5 14:35:31 2007 @@ -76,21 +76,21 @@ #define SWITCH_GRAMMAR_DIR SWITCH_PREFIX_DIR SWITCH_PATH_SEPARATOR "grammar" #endif -#define SWITCH_R_SDP_VARIABLE "_switch_r_sdp_" -#define SWITCH_L_SDP_VARIABLE "_switch_l_sdp_" -#define SWITCH_B_SDP_VARIABLE "_switch_m_sdp_" -#define SWITCH_BRIDGE_VARIABLE "_bridge_to_" -#define SWITCH_SIGNAL_BRIDGE_VARIABLE "_signal_bridge_to_" -#define SWITCH_ORIGINATOR_VARIABLE "_originator_" -#define SWITCH_ORIGINATOR_CODEC_VARIABLE "_originator_codec_" -#define SWITCH_LOCAL_MEDIA_IP_VARIABLE "_local_media_ip_" -#define SWITCH_LOCAL_MEDIA_PORT_VARIABLE "_local_media_port_" -#define SWITCH_REMOTE_MEDIA_IP_VARIABLE "_remote_media_ip_" -#define SWITCH_REMOTE_MEDIA_PORT_VARIABLE "_remote_media_port_" +#define SWITCH_R_SDP_VARIABLE "switch_r_sdp" +#define SWITCH_L_SDP_VARIABLE "switch_l_sdp" +#define SWITCH_B_SDP_VARIABLE "switch_m_sdp" +#define SWITCH_BRIDGE_VARIABLE "bridge_to" +#define SWITCH_SIGNAL_BRIDGE_VARIABLE "signal_bridge_to" +#define SWITCH_ORIGINATOR_VARIABLE "originator" +#define SWITCH_ORIGINATOR_CODEC_VARIABLE "originator_codec" +#define SWITCH_LOCAL_MEDIA_IP_VARIABLE "local_media_ip" +#define SWITCH_LOCAL_MEDIA_PORT_VARIABLE "local_media_port" +#define SWITCH_REMOTE_MEDIA_IP_VARIABLE "remote_media_ip" +#define SWITCH_REMOTE_MEDIA_PORT_VARIABLE "remote_media_port" #define SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE "hangup_after_bridge" -#define SWITCH_SPEECH_KEY "_speech_" -#define SWITCH_UUID_BRIDGE "_uuid_bridge_" +#define SWITCH_SPEECH_KEY "speech" +#define SWITCH_UUID_BRIDGE "uuid_bridge" #define SWITCH_BITS_PER_BYTE 8 typedef uint8_t switch_byte_t; Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Feb 5 14:35:31 2007 @@ -176,7 +176,6 @@ } - static void set_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; @@ -193,9 +192,9 @@ if (val) { *val++ = '\0'; - if (!strcmp(val, "_UNDEF_")) { - val = NULL; - } + if (switch_strlen_zero(val)) { + val = NULL; + } } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var, val ? val : "UNDEF"); @@ -203,6 +202,22 @@ } } + +static void unset_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "UNSET [%s]\n", (char *) data); + switch_channel_set_variable(channel, (char *) data, NULL); + } +} + static void log_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; @@ -524,13 +539,22 @@ /*.next */ &detect_speech_application_interface }; +static const switch_application_interface_t unset_application_interface = { + /*.interface_name */ "unset", + /*.application_function */ unset_function, + /* long_desc */ "Unset a channel varaible for the channel calling the application.", + /* short_desc */ "Unset a channel varaible", + /* syntax */ "<varname>", + /*.next */ &ringback_application_interface +}; + static const switch_application_interface_t set_application_interface = { /*.interface_name */ "set", /*.application_function */ set_function, /* long_desc */ "Set a channel varaible for the channel calling the application.", /* short_desc */ "Set a channel varaible", - /* syntax */ "<varname>=[<value>|_UNDEF_]", - /*.next */ &ringback_application_interface + /* syntax */ "<varname>=<value>", + /*.next */ &unset_application_interface }; static const switch_application_interface_t info_application_interface = { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Feb 5 14:35:31 2007 @@ -363,7 +363,7 @@ if (varname) { switch_core_hash_delete(channel->variables, varname); - if (value) { + if (!switch_strlen_zero(value)) { switch_core_hash_insert_dup(channel->variables, varname, switch_core_session_strdup(channel->session, value)); } else { switch_core_hash_delete(channel->variables, varname);

1 0

[commit] r4123 - freeswitch/trunk/src
by Freeswitch SVN 05 Feb '07

05 Feb '07

Author: anthm Date: Mon Feb 5 12:56:09 2007 New Revision: 4123 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: tweak Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Feb 5 12:56:09 2007 @@ -1567,8 +1567,14 @@ ecaller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"); ecaller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number"); - + if (ecaller_id_name || ecaller_id_number) { + if (!ecaller_id_name) { + ecaller_id_name = caller_profile->caller_id_name; + } + if (!ecaller_id_number) { + ecaller_id_number = caller_profile->caller_id_number; + } outgoing_profile = switch_caller_profile_new(switch_core_session_get_pool(session), caller_profile->username, caller_profile->dialplan, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 5 12:56:09 2007 @@ -2555,6 +2555,15 @@ early_ok = 0; } + if (!cid_name_override) { + cid_name_override = switch_event_get_header(var_event, "origination_caller_id_name"); + } + + if (!cid_num_override) { + cid_num_override = switch_event_get_header(var_event, "origination_caller_id_number"); + } + + or_argc = switch_separate_string(data, '|', pipe_names, (sizeof(pipe_names) / sizeof(pipe_names[0]))); if (caller_channel && or_argc > 1 && !ringback_data) { @@ -2603,7 +2612,7 @@ } caller_caller_profile = caller_profile_override ? caller_profile_override : switch_channel_get_caller_profile(caller_channel); - + if (!cid_name_override) { cid_name_override = caller_caller_profile->caller_id_name; } @@ -2616,9 +2625,9 @@ caller_caller_profile->dialplan, cid_name_override, cid_num_override, - caller_caller_profile->network_addr, + caller_caller_profile->network_addr, + NULL, NULL, - NULL, caller_caller_profile->rdnis, caller_caller_profile->source, caller_caller_profile->context, @@ -2983,15 +2992,22 @@ *cause = SWITCH_CAUSE_UNALLOCATED; if (var_event) { + if (!caller_channel) { /* install the vars from the {} params */ + switch_event_header_t *header; + for (header = var_event->headers; header; header = header->next) { + switch_channel_set_variable(peer_channel, header->name, header->value); + } + } switch_event_destroy(&var_event); } if (status == SWITCH_STATUS_SUCCESS) { if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); - } + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel)); *cause = SWITCH_CAUSE_SUCCESS; + } else { if (peer_channel) { *cause = switch_channel_get_cause(peer_channel);

1 0

[commit] r4122 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 05 Feb '07

05 Feb '07

Author: mikej Date: Sun Feb 4 21:52:34 2007 New Revision: 4122 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix segfault on failure to create file on conference record, and deref of null on conference record. 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 Sun Feb 4 21:52:34 2007 @@ -1677,12 +1677,13 @@ switch_file_handle_t fh = {0}; conference_member_t smember = {0}, *member; conference_record_t *rec = (conference_record_t *) obj; - uint32_t samples = switch_bytes_per_frame(rec->conference->rate, rec->conference->interval); + conference_obj_t *conference = rec->conference; + uint32_t samples = switch_bytes_per_frame(conference->rate, conference->interval); uint32_t bytes = samples * 2; uint32_t mux_used; char *vval; - if (switch_thread_rwlock_tryrdlock(rec->conference->rwlock) != SWITCH_STATUS_SUCCESS) { + if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); return NULL; } @@ -1697,13 +1698,12 @@ write_frame.data = data; write_frame.buflen = sizeof(data); - assert(rec->conference != NULL); - member->conference = rec->conference; - member->native_rate = rec->conference->rate; + member->conference = conference; + member->native_rate = conference->rate; member->rec_path = rec->path; fh.channels = 1; - fh.samplerate = rec->conference->rate; + fh.samplerate = conference->rate; member->id = next_member_id(); member->pool = rec->pool; @@ -1723,7 +1723,7 @@ goto end; } - if (conference_add_member(rec->conference, member) != SWITCH_STATUS_SUCCESS) { + if (conference_add_member(conference, member) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Joining Conference\n"); goto end; } @@ -1736,12 +1736,12 @@ goto end; } - if ((vval = switch_mprintf("Conference %s", rec->conference->name))) { + if ((vval = switch_mprintf("Conference %s", conference->name))) { switch_core_file_set_string(&fh, SWITCH_AUDIO_COL_STR_TITLE, vval); switch_safe_free(vval); } - while(switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(rec->conference, CFLAG_RUNNING) && rec->conference->count) { + while(switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(conference, CFLAG_RUNNING) && conference->count) { if ((mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer)) >= bytes) { /* Flush the output buffer and write all the data (presumably muxed) to the file */ switch_mutex_lock(member->audio_out_mutex); @@ -1758,15 +1758,17 @@ } } /* Rinse ... Repeat */ - conference_del_member(rec->conference, member); + end: + + conference_del_member(conference, member); switch_buffer_destroy(&member->audio_buffer); switch_buffer_destroy(&member->mux_buffer); switch_clear_flag_locked(member, MFLAG_RUNNING); - switch_core_file_close(&fh); + if (fh.fd) { + switch_core_file_close(&fh); + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording Stopped\n"); - end: - if (rec->pool) { switch_memory_pool_t *pool = rec->pool; rec = NULL; @@ -1777,7 +1779,7 @@ globals.threads--; switch_mutex_unlock(globals.hash_mutex); - switch_thread_rwlock_unlock(rec->conference->rwlock); + switch_thread_rwlock_unlock(conference->rwlock); return NULL; }

1 0

[commit] r4121 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: mikej Date: Sun Feb 4 18:04:16 2007 New Revision: 4121 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: don't depend on a session c= line in the sdp and use the one from the media if it's there. Patch via jira from Mikael Magnusson 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 Sun Feb 4 18:04:16 2007 @@ -2267,11 +2267,6 @@ channel = switch_core_session_get_channel(session); - if (!sdp->sdp_connection) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp!\n"); - return 0; - } - if ((tech_pvt->origin = switch_core_session_strdup(session, (char *) sdp->sdp_origin->o_username))) { if (strstr(tech_pvt->origin, "CiscoSystemsSIP-GW-UserAgent")) { switch_set_flag_locked(tech_pvt, TFLAG_BUGGY_2833); @@ -2290,6 +2285,19 @@ } for (m = sdp->sdp_media; m ; m = m->m_next) { + sdp_connection_t *connection; + + connection = sdp->sdp_connection; + if (m->m_connections) { + connection = m->m_connections; + } + + if (!connection) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n"); + match = 0; + break; + } + ptime = dptime; for (a = m->m_attributes; a; a = a->a_next) { if (!strcasecmp(a->a_name, "ptime")) { @@ -2362,7 +2370,7 @@ tech_pvt->pt = (switch_payload_t)map->rm_pt; tech_pvt->rm_rate = map->rm_rate; tech_pvt->codec_ms = mimp->microseconds_per_frame / 1000; - tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *)sdp->sdp_connection->c_address); + tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *)connection->c_address); tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *)map->rm_fmtp); tech_pvt->remote_sdp_audio_port = (switch_port_t)m->m_port; tech_pvt->agreed_pt = (switch_payload_t)map->rm_pt;

1 0

[commit] r4119 - freeswitch/trunk/src
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: mikej Date: Sun Feb 4 14:53:35 2007 New Revision: 4119 Modified: freeswitch/trunk/src/switch_ivr.c Log: small fix to dtmf handling in ivr menus Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sun Feb 4 14:53:35 2007 @@ -4121,6 +4121,7 @@ uint32_t len; char *ptr; switch_status_t status = SWITCH_STATUS_FALSE; + switch_input_args_t args= {0}; if (session != NULL && menu != NULL && !switch_strlen_zero(sound)) { memset(menu->buf, 0, menu->inlen); @@ -4133,17 +4134,13 @@ len = menu->inlen; ptr = menu->ptr; } + args.buf = ptr; + args.buflen = len; if (*sound == '/' || *sound == '\\') { - switch_input_args_t args = {0}; - args.buf = ptr; - args.buflen = need ? 1 : 0; status = switch_ivr_play_file(session, NULL, sound, &args); } else { if (menu->tts_engine && menu->tts_voice) { - switch_input_args_t args = {0}; - args.buf = ptr; - args.buflen = len; status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, sound, &args); } }

1 0

[commit] r4118 - freeswitch/trunk/src
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: mikej Date: Sun Feb 4 14:38:13 2007 New Revision: 4118 Modified: freeswitch/trunk/src/switch_ivr.c Log: menu->inlen is allways max bound size +1 (for terminating null) so we need to pass -1 to play or say. Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sun Feb 4 14:38:13 2007 @@ -4209,7 +4209,7 @@ memset(arg, 0, sizeof(arg)); memset(menu->buf, 0, menu->inlen); - status = play_or_say(session, menu, greeting_sound, menu->inlen); + status = play_or_say(session, menu, greeting_sound, menu->inlen - 1); if (!switch_strlen_zero(menu->buf)) { for(ap = menu->actions; ap ; ap = ap->next) {

1 0

[commit] r4117 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: mikej Date: Sun Feb 4 14:12:48 2007 New Revision: 4117 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: use same signedness var type for ptime. 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 Sun Feb 4 14:12:48 2007 @@ -684,7 +684,7 @@ { char buf[1024]; switch_time_t now = switch_time_now(); - uint32_t ptime = 0; + int ptime = 0; if (!force && !ip && !sr && switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { return;

1 0