- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7138 - freeswitch/trunk/src
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: mikej Date: Tue Jan 8 11:20:00 2008 New Revision: 7138 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: don't set blank vars, and handle them in error cases. Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Jan 8 11:20:00 2008 @@ -454,7 +454,7 @@ if (!switch_strlen_zero(varname)) { switch_mutex_lock(channel->profile_mutex); switch_event_del_header(channel->variables, varname); - if (value) { + if (!switch_strlen_zero(value)) { switch_event_add_header(channel->variables, SWITCH_STACK_BOTTOM, varname, "%s", value); } switch_mutex_unlock(channel->profile_mutex); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Jan 8 11:20:00 2008 @@ -1323,7 +1323,7 @@ if (!hi) return off; for (; hi; hi = hi->next) { - if (hi->name && hi->value && ((variable = switch_xml_add_child_d(xml, hi->name, off++)))) { + if (!switch_strlen_zero(hi->name) && !switch_strlen_zero(hi->value) && ((variable = switch_xml_add_child_d(xml, hi->name, off++)))) { char *data; switch_size_t dlen = strlen(hi->value) * 3;

1 0

[commit] r7137 - freeswitch/trunk/src
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: stkn Date: Tue Jan 8 05:57:42 2008 New Revision: 7137 Modified: freeswitch/trunk/src/switch.c Log: Look! A whitespace fix snuck into the tree! Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Jan 8 05:57:42 2008 @@ -451,7 +451,7 @@ pid_len = sizeof(pid_buffer); apr_pool_create(&pool, NULL); - if (switch_file_open(&fd, + if (switch_file_open(&fd, pid_path, SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE,

1 0

[commit] r7136 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: mikej Date: Tue Jan 8 00:24:49 2008 New Revision: 7136 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: add \n Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Jan 8 00:24:49 2008 @@ -538,7 +538,7 @@ if ((status = switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) { reply = stream.data; } else { - freply = switch_mprintf("%s: Command not found!", acs->api_cmd); + freply = switch_mprintf("%s: Command not found!\n", acs->api_cmd); reply = freply; }

1 0

[commit] r7135 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: mikej Date: Mon Jan 7 22:00:57 2008 New Revision: 7135 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: avoid file handle leak 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 Mon Jan 7 22:00:57 2008 @@ -984,7 +984,8 @@ if (switch_test_flag(conference, CFLAG_DESTRUCT)) { switch_mutex_lock(conference->mutex); - + conference_stop_file(conference, FILE_STOP_ASYNC); + conference_stop_file(conference, FILE_STOP_ALL); /* Close Unused Handles */ if (conference->fnode) { conference_file_node_t *fnode, *cur; @@ -1005,6 +1006,14 @@ conference->fnode = NULL; } + if (conference->async_fnode) { + switch_memory_pool_t *pool; + switch_core_file_close(&conference->async_fnode->fh); + pool = conference->async_fnode->pool; + conference->async_fnode = NULL; + switch_core_destroy_memory_pool(&pool); + } + switch_mutex_lock(conference->member_mutex); for (imember = conference->members; imember; imember = imember->next) { switch_channel_t *channel; @@ -2782,7 +2791,7 @@ static switch_status_t conf_api_sub_list(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) { int ret_status = SWITCH_STATUS_GENERR; - + int count = 0; switch_hash_index_t *hi; void *val; char *d = ";"; @@ -2816,6 +2825,7 @@ stream->write_function(stream, "Conference %s (%u member%s%s)\n", conference->name, conference->count, conference->count == 1 ? "" : "s", switch_test_flag(conference, CFLAG_LOCKED) ? " locked" : ""); + count++; if (pretty) { conference_list_pretty(conference, stream); } else { @@ -2823,6 +2833,7 @@ } } } else { + count++; if (pretty) { conference_list_pretty(conference, stream); } else { @@ -2830,6 +2841,10 @@ } } + if (!count) { + stream->write_function(stream, "No active conferences.\n"); + } + ret_status = SWITCH_STATUS_SUCCESS; return ret_status;

1 0

[commit] r7134 - freeswitch/trunk/src
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: anthm Date: Mon Jan 7 16:47:32 2008 New Revision: 7134 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: add pre_answer calls to some funcs in the ivr lib to ensure media for obvious situations that require it 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 Mon Jan 7 16:47:32 2008 @@ -356,6 +356,8 @@ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); + switch_channel_pre_answer(channel); + read_codec = switch_core_session_get_read_codec(session); switch_assert(read_codec != NULL); @@ -691,6 +693,8 @@ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); + switch_channel_pre_answer(channel); + prefix = switch_channel_get_variable(channel, "sound_prefix"); timer_name = switch_channel_get_variable(channel, "timer_name"); @@ -1130,7 +1134,7 @@ switch_assert(channel != NULL); //Answer the channel if it hasn't already been answered - switch_channel_answer(channel); + switch_channel_pre_answer(channel); //Start pestering the user for input for (; (switch_channel_get_state(channel) == CS_EXECUTE) && max_tries > 0; max_tries--) { @@ -1250,7 +1254,7 @@ return SWITCH_STATUS_FALSE; } - switch_channel_answer(channel); + switch_channel_pre_answer(channel); write_frame.data = abuf; write_frame.buflen = sizeof(abuf); @@ -1531,6 +1535,8 @@ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); + switch_channel_pre_answer(channel); + sh = &lsh; codec = &lcodec; timer = &ltimer;

1 0

[commit] r7133 - freeswitch/trunk/src
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: anthm Date: Mon Jan 7 16:14:24 2008 New Revision: 7133 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: update Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Jan 7 16:14:24 2008 @@ -568,6 +568,8 @@ ok = 1; } else if (!strcasecmp((char *)hi->name, "group_confirm_file")) { ok = 1; + } else if (!strcasecmp((char *)hi->name, "forked_dial")) { + ok = 1; } else if (!strcasecmp((char *)hi->name, "fail_on_single_reject")) { ok = 1; } else if (!strcasecmp((char *)hi->name, "ignore_early_media")) { @@ -810,8 +812,16 @@ peer_sessions[i] = NULL; new_session = NULL; + + + if (and_argc > 1 || or_argc > 1) { myflags |= SOF_FORKED_DIAL; + } else if (var_event) { + const char *vvar; + if ((vvar = switch_event_get_header(var_event, "forked_dial")) && switch_true(vvar)) { + myflags |= SOF_FORKED_DIAL; + } } if ((reason = switch_core_session_outgoing_channel(session, chan_type, new_profile, &new_session, &pool, myflags)) != SWITCH_CAUSE_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! cause: %s\n", switch_channel_cause2str(reason));

1 0

[commit] r7132 - in freeswitch/trunk/src: . include
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: anthm Date: Mon Jan 7 15:40:59 2008 New Revision: 7132 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c Log: fix FSCORE-82 Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Jan 7 15:40:59 2008 @@ -1531,6 +1531,7 @@ SWITCH_DECLARE(void) switch_core_memory_reclaim_events(void); SWITCH_DECLARE(void) switch_core_memory_reclaim_logger(void); SWITCH_DECLARE(void) switch_core_memory_reclaim_all(void); +SWITCH_DECLARE(void) switch_core_setrlimits(void); ///\} Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Mon Jan 7 15:40:59 2008 @@ -430,6 +430,8 @@ set_high_priority(); } + switch_core_setrlimits(); + #ifndef WIN32 if (runas_user || runas_group) { if(change_user_group(runas_user, runas_group) < 0) { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jan 7 15:40:59 2008 @@ -661,6 +661,44 @@ } + +SWITCH_DECLARE(void) switch_core_setrlimits(void) +{ +#ifdef HAVE_SETRLIMIT + struct rlimit rlp; + + /* + Setting the stack size on FreeBSD results in an instant crash. + + If anyone knows how to fix this, + feel free to submit a patch to http://jira.freeswitch.org + */ + +#ifndef __FreeBSD__ + memset(&rlp, 0, sizeof(rlp)); + rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; + rlp.rlim_max = SWITCH_THREAD_STACKSIZE; + setrlimit(RLIMIT_STACK, &rlp); +#endif + + memset(&rlp, 0, sizeof(rlp)); + rlp.rlim_cur = 999999; + rlp.rlim_max = 999999; + setrlimit(RLIMIT_NOFILE, &rlp); + + memset(&rlp, 0, sizeof(rlp)); + rlp.rlim_cur = RLIM_INFINITY; + rlp.rlim_max = RLIM_INFINITY; + + setrlimit(RLIMIT_CPU, &rlp); + setrlimit(RLIMIT_DATA, &rlp); + setrlimit(RLIMIT_FSIZE, &rlp); + setrlimit(RLIMIT_AS, &rlp); +#endif + return; +} + + SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switch_bool_t console, const char **err) { switch_xml_t xml = NULL, cfg = NULL; @@ -702,41 +740,6 @@ switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir); -#ifdef HAVE_SETRLIMIT - { - struct rlimit rlp; - - /* - Setting the stack size on FreeBSD results in an instant crash. - - If anyone knows how to fix this, - feel free to submit a patch to http://jira.freeswitch.org - */ - -#ifndef __FreeBSD__ - memset(&rlp, 0, sizeof(rlp)); - rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; - rlp.rlim_max = SWITCH_THREAD_STACKSIZE; - setrlimit(RLIMIT_STACK, &rlp); -#endif - - memset(&rlp, 0, sizeof(rlp)); - rlp.rlim_cur = 999999; - rlp.rlim_max = 999999; - setrlimit(RLIMIT_NOFILE, &rlp); - - memset(&rlp, 0, sizeof(rlp)); - rlp.rlim_cur = RLIM_INFINITY; - rlp.rlim_max = RLIM_INFINITY; - - setrlimit(RLIMIT_CPU, &rlp); - setrlimit(RLIMIT_DATA, &rlp); - setrlimit(RLIMIT_FSIZE, &rlp); - setrlimit(RLIMIT_AS, &rlp); - } - -#endif - if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) { apr_terminate();

1 0

[commit] r7131 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: mikej Date: Mon Jan 7 15:27:48 2008 New Revision: 7131 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: handle cli from the following headers (in order of preference) - Thanks Jason. P-Preferred-Identity P-Asserted-Identity Remote-Party-ID >From Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Jan 7 15:27:48 2008 @@ -2232,6 +2232,8 @@ char key[128] = ""; sip_unknown_t *un; sip_remote_party_id_t *rpid = NULL; + sip_p_asserted_identity_t *passerted = NULL; + sip_p_preferred_identity_t *ppreferred = NULL; sip_alert_info_t *alert_info = NULL; private_object_t *tech_pvt = NULL; switch_channel_t *channel = NULL; @@ -2324,8 +2326,6 @@ from_host = sip->sip_from->a_url->url_host; channel_name = url_set_chanvars(session, sip->sip_from->a_url, sip_from); - check_decode(from_user, session); - if (!switch_strlen_zero(from_user)) { if (*from_user == '+') { switch_channel_set_variable(channel, "sip_from_user_stripped", (const char *) (from_user + 1)); @@ -2346,14 +2346,34 @@ if ((rpid = sip_remote_party_id(sip))) { if (rpid->rpid_url && rpid->rpid_url->url_user) { from_user = rpid->rpid_url->url_user; - check_decode(from_user, session); } - if (rpid->rpid_display) { displayname = rpid->rpid_display; } } + if ((passerted = sip_p_asserted_identity(sip))) { + if (passerted->paid_url && passerted->paid_url->url_user) { + from_user = passerted->paid_url->url_user; + } + if (passerted->paid_display) { + displayname = passerted->paid_display; + } + } + + if ((ppreferred = sip_p_preferred_identity(sip))) { + if (ppreferred->ppid_url && ppreferred->ppid_url->url_user) { + from_user = ppreferred->ppid_url->url_user; + } + if (ppreferred->ppid_display) { + displayname = ppreferred->ppid_display; + } + } + + if (from_user) { + check_decode(from_user, session); + } + if (sip->sip_request->rq_url) { const char *req_uri = url_set_chanvars(session, sip->sip_request->rq_url, sip_req); if (profile->pflags & PFLAG_FULL_ID) {

1 0

[commit] r7130 - freeswitch/trunk/scripts/socket
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: anthm Date: Mon Jan 7 13:21:34 2008 New Revision: 7130 Modified: freeswitch/trunk/scripts/socket/sock.pl Log: update Modified: freeswitch/trunk/scripts/socket/sock.pl ============================================================================== --- freeswitch/trunk/scripts/socket/sock.pl (original) +++ freeswitch/trunk/scripts/socket/sock.pl Mon Jan 7 13:21:34 2008 @@ -22,7 +22,7 @@ $o = $fs->call_command("answer"); #to turn on events when in async mode $o = $fs->raw_command("myevents"); -$o = $fs->call_command("echo"); +$o = $fs->call_command("playback", "/ram/swimp.raw"); #comment exit in async mode @@ -37,8 +37,7 @@ print Dumper $r->{event}; } if ($r->{event}->{'event-name'} !~ /execute/i) { - printf "wtf $data->{'unique-id'}\n"; - print "."; + printf "uuid: $data->{'unique-id'}\n"; $o = $fs->call_command("break"); $o = $fs->call_command("hangup"); }

1 0

[commit] r7129 - freeswitch/trunk/src
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: anthm Date: Mon Jan 7 13:03:39 2008 New Revision: 7129 Modified: freeswitch/trunk/src/switch_rtp.c Log: possible fix for FSCORE-83 Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Jan 7 13:03:39 2008 @@ -848,7 +848,7 @@ if (rtp_session->timer.timer_interface) { rtp_session->dtmf_data.timestamp_dtmf = rtp_session->timer.samplecount; } else { - rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts; + rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts + samples; } rtp_session->sending_dtmf = 1; @@ -869,7 +869,6 @@ rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, 0, rtp_session->seq); } - rtp_session->dtmf_data.timestamp_dtmf += samples; free(rdigit); } }

1 0