February 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7498 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 03 Feb '08

03 Feb '08

Author: brian Date: Sat Feb 2 23:23:08 2008 New Revision: 7498 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix usage 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 Sat Feb 2 23:23:08 2008 @@ -1343,7 +1343,7 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; if (session || switch_strlen_zero(cmd)) { - stream->write_function(stream, "-ERR Illegal Usage\n"); + stream->write_function(stream, "-USAGE %s\n", ORIGINATE_SYNTAX); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7497 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 02 Feb '08

02 Feb '08

Author: mikej Date: Sat Feb 2 17:25:25 2008 New Revision: 7497 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix conference transfer of multiple participants when using @profile 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 Sat Feb 2 17:25:25 2008 @@ -3066,6 +3066,7 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; + char *conf_name = NULL, *profile_name; switch_event_t *params = NULL; switch_assert(conference != NULL); switch_assert(stream != NULL); @@ -3073,13 +3074,20 @@ if (argc > 3 && !switch_strlen_zero(argv[2])) { int x; + conf_name = strdup(argv[2]); + + if ((profile_name = strchr(conf_name, '@'))) { + *profile_name++ = '\0'; + } else { + profile_name = "default"; + } + for (x = 3; x < argc; x++) { conference_member_t *member = NULL; uint32_t id = atoi(argv[x]); conference_obj_t *new_conference = NULL; switch_channel_t *channel; switch_event_t *event; - char *profile_name; switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; if (!id || !(member = conference_member_get(conference, id))) { @@ -3090,9 +3098,8 @@ channel = switch_core_session_get_channel(member->session); /* build a new conference if it doesn't exist */ - if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[2]))) { + if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { switch_memory_pool_t *pool = NULL; - char *conf_name; conf_xml_cfg_t xml_cfg = { 0 }; /* Setup a memory pool to use. */ @@ -3101,14 +3108,6 @@ goto done; } - conf_name = switch_core_strdup(pool, argv[2]); - - if ((profile_name = strchr(conf_name, '@'))) { - *profile_name++ = '\0'; - } else { - profile_name = "default"; - } - switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name); @@ -3190,6 +3189,7 @@ if (params) { switch_event_destroy(&params); } + switch_safe_free(conf_name); return ret_status; }

1 0

[commit] r7496 - freeswitch/trunk/build
by Freeswitch SVN 02 Feb '08

02 Feb '08

Author: mikej Date: Sat Feb 2 17:05:33 2008 New Revision: 7496 Modified: freeswitch/trunk/build/modules.conf.in Log: add new beta module to the list Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Sat Feb 2 17:05:33 2008 @@ -56,6 +56,7 @@ xml_int/mod_xml_rpc #xml_int/mod_xml_curl xml_int/mod_xml_cdr +#xml_int/mod_xml_ldap say/mod_say_en #say/mod_say_de #say/mod_say_es

1 0

[commit] r7495 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 02 Feb '08

02 Feb '08

Author: anthm Date: Sat Feb 2 16:43:23 2008 New Revision: 7495 Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml freeswitch/trunk/conf/sip_profiles/outbound.xml Log: add timeouts to default Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Sat Feb 2 16:43:23 2008 @@ -85,7 +85,8 @@    - <param name="rtp-timeout-sec" value="1800"/> + <param name="rtp-timeout-sec" value="300"/> + <param name="rtp-hold-timeout-sec" value="1800"/>    Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Sat Feb 2 16:43:23 2008 @@ -25,5 +25,7 @@ <param name="sip-ip" value="$${local_ip_v4}"/> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> <param name="ext-sip-ip" value="$${external_sip_ip}"/> + <param name="rtp-timeout-sec" value="300"/> + <param name="rtp-hold-timeout-sec" value="1800"/> </settings> </profile> Modified: freeswitch/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound.xml Sat Feb 2 16:43:23 2008 @@ -30,5 +30,7 @@ <param name="sip-ip" value="$${local_ip_v4}"/> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> <param name="ext-sip-ip" value="$${external_sip_ip}"/> + <param name="rtp-timeout-sec" value="300"/> + <param name="rtp-hold-timeout-sec" value="1800"/> </settings> </profile>

1 0

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

02 Feb '08

Author: mikej Date: Sat Feb 2 15:55:15 2008 New Revision: 7494 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: use session_timeout when doing invites. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Feb 2 15:55:15 2008 @@ -865,6 +865,7 @@ extra_headers = stream.data; } + session_timeout = tech_pvt->profile->session_timeout; if ((val = switch_channel_get_variable(channel, SOFIA_SESSION_TIMEOUT))) { int v_session_timeout = atoi(val); if (v_session_timeout >= 0) {

1 0

[commit] r7493 - freeswitch/trunk
by Freeswitch SVN 02 Feb '08

02 Feb '08

Author: anthm Date: Sat Feb 2 12:55:08 2008 New Revision: 7493 Modified: freeswitch/trunk/Makefile.am Log: update Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sat Feb 2 12:55:08 2008 @@ -279,6 +279,12 @@ installall: install +up: clean + svn update + $(MAKE) -j core + $(MAKE) -j modules + $(MAKE) install + update-clean: clean modwipe uninstall cd libs/sofia-sip && $(MAKE) clean cd libs/openzap && $(MAKE) clean

1 0

[commit] r7492 - freeswitch/trunk/src/mod/applications/mod_esf
by Freeswitch SVN 02 Feb '08

02 Feb '08

Author: brian Date: Fri Feb 1 21:50:26 2008 New Revision: 7492 Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Log: cleanup Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Fri Feb 1 21:50:26 2008 @@ -204,12 +204,8 @@ bytes = 16; switch_socket_sendto(socket, control_packet_addr, 0, (void *)&control_packet, &bytes); - int fd; - fd = open("/tmp/wtf.ulaw", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); - for(;;) { - if (write(fd, read_frame->data, read_frame->datalen)); - + status = switch_core_session_read_frame(session, &read_frame, -1, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { @@ -226,8 +222,6 @@ } } - - control_packet.unique_id = htonl((u_long)switch_timestamp(NULL)); control_packet.command = htonl(LS_STOP_BCAST); bytes = 8;

1 0

[commit] r7491 - in freeswitch/trunk/src: . mod/applications/mod_esf
by Freeswitch SVN 02 Feb '08

02 Feb '08

Author: anthm Date: Fri Feb 1 20:46:11 2008 New Revision: 7491 Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c freeswitch/trunk/src/switch_core_io.c Log: fix esf for g722 Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Fri Feb 1 20:46:11 2008 @@ -63,7 +63,7 @@ switch_status_t status; switch_size_t bytes; ls_control_packet_t control_packet; - switch_codec_t *read_codec; + switch_codec_t codec = { 0}, *read_codec, *orig_codec = NULL; uint32_t flags = 0; const char *err; switch_rtp_t *rtp_session = NULL; @@ -139,15 +139,32 @@ goto fail; } - if (read_frame->packet && read_frame->packetlen) { + if (read_frame->packet && read_frame->packetlen && read_codec->implementation->ianacode == 0) { ready = SEND_TYPE_RAW; } else { ready = SEND_TYPE_RTP; } - } if (ready == SEND_TYPE_RTP) { + if (read_codec->implementation->ianacode != 0) { + if (switch_core_codec_init(&codec, + "PCMU", + NULL, + 8000, + 20, + 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + orig_codec = read_codec; + read_codec = &codec; + switch_core_session_set_read_codec(session, read_codec); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec Activation Success\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Activation Fail\n"); + goto fail; + } + } + switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET); if (!(rtp_port = switch_rtp_request_port(guess_ip))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP Port Error\n"); @@ -187,9 +204,14 @@ bytes = 16; switch_socket_sendto(socket, control_packet_addr, 0, (void *)&control_packet, &bytes); + int fd; + fd = open("/tmp/wtf.ulaw", O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); for(;;) { + if (write(fd, read_frame->data, read_frame->datalen)); + status = switch_core_session_read_frame(session, &read_frame, -1, 0); + if (!SWITCH_READ_ACCEPTABLE(status)) { break; } @@ -215,6 +237,11 @@ fail: + if (orig_codec) { + switch_core_session_set_read_codec(session, orig_codec); + switch_core_codec_destroy(&codec); + } + if (rtp_session && ready == SEND_TYPE_RTP && switch_rtp_ready(rtp_session)) { switch_rtp_destroy(&rtp_session); } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Feb 1 20:46:11 2008 @@ -241,23 +241,6 @@ goto done; } } -#if 0 - if (session->read_resampler) { - short *data = read_frame->data; - switch_mutex_lock(session->resample_mutex); - - session->read_resampler->from_len = switch_short_to_float(data, session->read_resampler->from, (int) read_frame->datalen / 2); - session->read_resampler->to_len = - switch_resample_process(session->read_resampler, session->read_resampler->from, - session->read_resampler->from_len, session->read_resampler->to, session->read_resampler->to_size, 0); - switch_float_to_short(session->read_resampler->to, data, read_frame->datalen); - read_frame->samples = session->read_resampler->to_len; - read_frame->datalen = session->read_resampler->to_len * 2; - read_frame->rate = session->read_resampler->to_rate; - switch_mutex_unlock(session->resample_mutex); - - } -#endif if (session->bugs) { switch_media_bug_t *bp, *dp, *last = NULL; @@ -311,6 +294,23 @@ } if (session->read_codec) { + + if (session->read_resampler) { + short *data = read_frame->data; + switch_mutex_lock(session->resample_mutex); + + session->read_resampler->from_len = switch_short_to_float(data, session->read_resampler->from, (int) read_frame->datalen / 2); + session->read_resampler->to_len = + switch_resample_process(session->read_resampler, session->read_resampler->from, + session->read_resampler->from_len, session->read_resampler->to, session->read_resampler->to_size, 0); + switch_float_to_short(session->read_resampler->to, data, read_frame->datalen); + read_frame->samples = session->read_resampler->to_len; + read_frame->datalen = session->read_resampler->to_len * 2; + read_frame->rate = session->read_resampler->to_rate; + switch_mutex_unlock(session->resample_mutex); + + } + if ((*frame)->datalen == session->read_codec->implementation->bytes_per_frame) { perfect = TRUE; } else {

1 0

[commit] r7490 - freeswitch/trunk
by Freeswitch SVN 02 Feb '08

02 Feb '08

Author: brian Date: Fri Feb 1 20:45:47 2008 New Revision: 7490 Modified: freeswitch/trunk/configure.in Log: forgot to remove this Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Feb 1 20:45:47 2008 @@ -462,7 +462,6 @@ AC_CONFIG_SUBDIRS(libs/apr) AC_CONFIG_SUBDIRS(libs/apr-util) AC_CONFIG_SUBDIRS(libs/codec/g7xx) -AC_CONFIG_SUBDIRS(libs/codec/g726) AC_CONFIG_SUBDIRS(libs/codec/gsm) AC_CONFIG_SUBDIRS(libs/codec/ilbc) AC_CONFIG_SUBDIRS(libs/codec/lpc10)

1 0

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

02 Feb '08

Author: anthm Date: Fri Feb 1 19:49:25 2008 New Revision: 7489 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update 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 Fri Feb 1 19:49:25 2008 @@ -280,7 +280,12 @@ if (tech_pvt->nh && !switch_test_flag(tech_pvt, TFLAG_BYE)) { if (switch_test_flag(tech_pvt, TFLAG_ANS)) { char reason[128] = ""; - switch_snprintf(reason, sizeof(reason), "Q.850;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); + if (cause < 128) { + switch_snprintf(reason, sizeof(reason), "Q.850;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); + } else { + switch_snprintf(reason, sizeof(reason), "FreeSWITCH;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending BYE to %s\n", switch_channel_get_name(channel)); nua_bye(tech_pvt->nh, SIPTAG_REASON_STR(reason), TAG_END()); } else { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Feb 1 19:49:25 2008 @@ -396,6 +396,7 @@ char *video_fmtp_out; uint32_t video_count; sofia_dtmf_t dtmf_type; + int q850_cause; }; struct callback_t { 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 Fri Feb 1 19:49:25 2008 @@ -136,6 +136,15 @@ if (!session) return; channel = switch_core_session_get_channel(session); + + + if (sip->sip_reason && sip->sip_reason->re_protocol && + (!strcasecmp(sip->sip_reason->re_protocol, "Q.850") || !strcasecmp(sip->sip_reason->re_protocol, "FreeSWITCH")) && + sip->sip_reason->re_cause) { + private_object_t *tech_pvt = switch_core_session_get_private(session); + tech_pvt->q850_cause = atoi(sip->sip_reason->re_cause); + } + if (sip->sip_user_agent && !switch_strlen_zero(sip->sip_user_agent->g_string)){ switch_channel_set_variable(channel, "sip_user_agent", sip->sip_user_agent->g_string); } @@ -1784,8 +1793,8 @@ switch_clear_flag_locked(tech_pvt, TFLAG_NOHUP); } else { int cause; - if (sip->sip_reason && sip->sip_reason->re_protocol && !strcasecmp(sip->sip_reason->re_protocol, "Q.850") && sip->sip_reason->re_cause) { - cause = atoi(sip->sip_reason->re_cause); + if (tech_pvt->q850_cause) { + cause = tech_pvt->q850_cause; } else { cause = sofia_glue_sip_cause_to_freeswitch(status); }

1 0