February 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

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

11 Feb '08

Author: anthm Date: Mon Feb 11 16:20:43 2008 New Revision: 7589 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: tweak 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 11 16:20:43 2008 @@ -1382,6 +1382,8 @@ char *domain = NULL; char *profile_name = NULL; char *p; + sofia_profile_t *profile = NULL; + if (!cmd) { stream->write_function(stream, "%s", ""); @@ -1409,7 +1411,6 @@ if (user && profile_name) { char *sql; - sofia_profile_t *profile; if (!(profile = sofia_glue_find_profile(profile_name))) { profile_name = domain; @@ -1449,6 +1450,11 @@ end: switch_safe_free(data); + + if (profile) { + sofia_glue_release_profile(profile); + } + return SWITCH_STATUS_SUCCESS; }

1 0

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

11 Feb '08

Author: anthm Date: Mon Feb 11 15:47:20 2008 New Revision: 7588 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: auto append domain name on ^ notation 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 11 15:47:20 2008 @@ -1564,7 +1564,7 @@ switch_caller_profile_t *caller_profile = NULL; private_object_t *tech_pvt = NULL; switch_channel_t *nchannel; - char *host, *dest_to; + char *host = NULL, *dest_to = NULL; *new_session = NULL; @@ -1679,8 +1679,6 @@ if ((dest_to = strchr(dest, '^'))) { *dest_to++ = '\0'; - tech_pvt->dest_to = switch_core_session_alloc(nsession, strlen(dest_to) + 5); - switch_snprintf(tech_pvt->dest_to, strlen(dest_to) + 5, "sip:%s", dest_to); } if ((host = strchr(dest, '%'))) { @@ -1696,12 +1694,13 @@ cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; goto error; } - } else if (!strchr(dest, '@')) { + } else if (!(host = strchr(dest, '@'))) { char buf[128]; tech_pvt->e_dest = switch_core_session_strdup(nsession, dest); if (sofia_reg_find_reg_url(profile, dest, profile_name, buf, sizeof(buf))) { tech_pvt->dest = switch_core_session_strdup(nsession, buf); tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, profile_name); + host = profile_name; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile_name); cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; @@ -1713,6 +1712,15 @@ } } + if (dest_to) { + if (strchr(dest_to, '@')) { + tech_pvt->dest_to = switch_core_session_sprintf(nsession, "sip:%s", dest_to); + } else { + tech_pvt->dest_to = switch_core_session_sprintf(nsession, "sip:%s@%s", dest_to, host); + } + } + + if (!tech_pvt->dest_to) { tech_pvt->dest_to = tech_pvt->dest; }

1 0

[commit] r7587 - freeswitch/trunk/libs/voipcodecs
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: mikej Date: Mon Feb 11 14:39:20 2008 New Revision: 7587 Modified: freeswitch/trunk/libs/voipcodecs/ (props changed) Log: svn:ignore

1 0

[commit] r7586 - freeswitch/trunk/src
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: anthm Date: Mon Feb 11 14:38:30 2008 New Revision: 7586 Modified: freeswitch/trunk/src/switch_core_io.c Log: fix resampler issue Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Mon Feb 11 14:38:30 2008 @@ -674,7 +674,7 @@ switch (status) { case SWITCH_STATUS_RESAMPLE: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "fixme 2\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "fixme 2\n"); case SWITCH_STATUS_SUCCESS: session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); @@ -749,9 +749,9 @@ session->enc_write_frame.seq = frame->seq; session->enc_write_frame.payload = session->write_codec->implementation->ianacode; write_frame = &session->enc_write_frame; - if (!session->read_resampler) { + if (!session->write_resampler) { switch_mutex_lock(session->resample_mutex); - status = switch_resample_create(&session->read_resampler, + status = switch_resample_create(&session->write_resampler, frame->codec->implementation->actual_samples_per_second, frame->codec->implementation->bytes_per_frame, session->write_codec->implementation->actual_samples_per_second, @@ -774,10 +774,10 @@ write_frame = &session->enc_write_frame; break; case SWITCH_STATUS_NOOP: - if (session->read_resampler) { + if (session->write_resampler) { switch_mutex_lock(session->resample_mutex); - switch_resample_destroy(&session->read_resampler); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deactivating read resampler\n"); + switch_resample_destroy(&session->write_resampler); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deactivating write resampler\n"); switch_mutex_unlock(session->resample_mutex); } enc_frame->codec = session->write_codec;

1 0

[commit] r7585 - in freeswitch/trunk/src/mod: applications/mod_fsv codecs/mod_voipcodecs
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: mikej Date: Mon Feb 11 14:36:58 2008 New Revision: 7585 Modified: freeswitch/trunk/src/mod/applications/mod_fsv/ (props changed) freeswitch/trunk/src/mod/codecs/mod_voipcodecs/ (props changed) Log: svn:ignore

1 0

[commit] r7584 - freeswitch/trunk/libs/libedit/src
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: stkn Date: Mon Feb 11 14:11:24 2008 New Revision: 7584 Modified: freeswitch/trunk/libs/libedit/src/vi.c Log: Resurrect the lost FreeBSD __weak_references fix from the previous libedit version. -This line, and those below, will be ignored-- M vi.c Modified: freeswitch/trunk/libs/libedit/src/vi.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/vi.c (original) +++ freeswitch/trunk/libs/libedit/src/vi.c Mon Feb 11 14:11:24 2008 @@ -915,14 +915,14 @@ * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) extern char *get_alias_text(const char *) __weak_reference(get_alias_text); #endif protected el_action_t /*ARGSUSED*/ vi_alias(EditLine *el, int c) { -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) char alias_name[3]; char *alias_text;

1 0

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

11 Feb '08

Author: brian Date: Mon Feb 11 12:29:30 2008 New Revision: 7583 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: tweak 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 Feb 11 12:29:30 2008 @@ -1646,9 +1646,9 @@ switch_codec_t *read_codec = switch_core_session_get_read_codec(member->session); uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; uint32_t samples = switch_bytes_per_frame(member->conference->rate, interval); - uint32_t flush_len = switch_bytes_per_frame(member->conference->rate, member->conference->interval) * 4; uint32_t csamples = samples; uint32_t tsamples = member->orig_read_codec->implementation->samples_per_frame; + uint32_t flush_len = member->read_codec.implementation->bytes_per_frame * 4; uint32_t low_count = 0, bytes = samples * 2; call_list_t *call_list = NULL, *cp = NULL;

1 0

[commit] r7582 - in freeswitch/trunk/src: include mod/applications/mod_fsv mod/endpoints/mod_sofia
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: anthm Date: Mon Feb 11 12:14:14 2008 New Revision: 7582 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Mon Feb 11 12:14:14 2008 @@ -509,6 +509,7 @@ switch_memory_pool_t *memory_pool; /*! private data for the codec module to store handle specific info */ void *private_info; + switch_payload_t agreed_pt; }; /*! \brief A table of settings and callbacks that define a paticular implementation of a codec */ Modified: freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c Mon Feb 11 12:14:14 2008 @@ -216,12 +216,13 @@ switch_frame_t write_frame = {0}, vid_frame = {0}; int fd = -1; int bytes; - switch_codec_t *read_codec = NULL, codec = {0}, vid_codec = {0}; + switch_codec_t *read_codec = NULL, codec = {0}, vid_codec = {0}, *read_vid_codec; unsigned char *aud_buffer; unsigned char *vid_buffer; struct file_header h; uint32_t ts = 0, last = 0; switch_timer_t timer = {0}; + switch_payload_t pt = 0; aud_buffer = switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE); vid_buffer = switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE); @@ -243,6 +244,10 @@ switch_channel_set_variable(channel, "sip_force_video_fmtp", h.video_fmtp); switch_channel_answer(channel); + + if ((read_vid_codec = switch_core_session_get_video_read_codec(session))) { + pt = read_vid_codec->agreed_pt; + } write_frame.codec = &codec; write_frame.data = aud_buffer; @@ -304,7 +309,9 @@ } ts = ntohl(h->ts); - h->pt = vid_codec.implementation->ianacode; + if (pt) { + h->pt = pt; + } if (switch_channel_test_flag(channel, CF_VIDEO)) { switch_core_session_write_video_frame(session, &vid_frame, -1, 0); } 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 Mon Feb 11 12:14:14 2008 @@ -1065,6 +1065,9 @@ tech_pvt->video_read_frame.codec = &tech_pvt->video_read_codec; tech_pvt->video_fmtp_out = switch_core_session_strdup(tech_pvt->session, tech_pvt->video_write_codec.fmtp_out); + + tech_pvt->video_write_codec.agreed_pt = tech_pvt->video_agreed_pt; + tech_pvt->video_read_codec.agreed_pt = tech_pvt->video_agreed_pt; switch_core_session_set_video_read_codec(tech_pvt->session, &tech_pvt->video_read_codec); switch_core_session_set_video_write_codec(tech_pvt->session, &tech_pvt->video_write_codec); } @@ -1137,6 +1140,9 @@ ); tech_pvt->read_frame.codec = &tech_pvt->read_codec; + tech_pvt->write_codec.agreed_pt = tech_pvt->agreed_pt; + tech_pvt->read_codec.agreed_pt = tech_pvt->agreed_pt; + switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); tech_pvt->fmtp_out = switch_core_session_strdup(tech_pvt->session, tech_pvt->write_codec.fmtp_out); @@ -1903,6 +1909,8 @@ switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_VIDEO_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_VIDEO_PORT_VARIABLE, tmp); switch_channel_set_variable(tech_pvt->channel, "sip_video_fmtp", tech_pvt->video_rm_fmtp); + switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->video_agreed_pt); + switch_channel_set_variable(tech_pvt->channel, "sip_video_pt", tmp); break; } else { vmatch = 0;

1 0

[commit] r7581 - in freeswitch/trunk/src: . include/private
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: anthm Date: Mon Feb 11 11:49:07 2008 New Revision: 7581 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/switch_core_sqldb.c Log: update core sql for some speed tuning Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Mon Feb 11 11:49:07 2008 @@ -78,7 +78,7 @@ #define SWITCH_EVENT_QUEUE_LEN 256 #define SWITCH_MESSAGE_QUEUE_LEN 256 -#define SWITCH_SQL_QUEUE_LEN 2000 +#define SWITCH_SQL_QUEUE_LEN 100000 #define SWITCH_BUFFER_BLOCK_FRAMES 25 #define SWITCH_BUFFER_START_FRAMES 50 Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Mon Feb 11 11:49:07 2008 @@ -154,6 +154,7 @@ char *tmp, *sqlbuf = (char *) malloc(sql_len); char *sql; switch_size_t newlen; + int lc = 0; switch_assert(sqlbuf); @@ -211,6 +212,11 @@ *sqlbuf = '\0'; } + if (++lc == 300000) { + switch_core_db_exec(sql_manager.db, "vacuum;", NULL, NULL, NULL); + lc = 0; + } + if (nothing_in_queue) { switch_yield(1000); } @@ -394,6 +400,11 @@ switch_core_db_exec(sql_manager.db, "drop table calls", NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, "drop table interfaces", NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, "drop table tasks", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "PRAGMA synchronous=OFF;", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "PRAGMA count_changes=OFF;", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "PRAGMA cache_size=8000", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "PRAGMA temp_store=MEMORY;", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, create_channels_sql, NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, create_calls_sql, NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, create_interfaces_sql, NULL, NULL, NULL);

1 0

[commit] r7580 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: mikej Date: Mon Feb 11 01:45:03 2008 New Revision: 7580 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Log: fix length error introduced in r6827 (should fix MODEVENT-15) Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Mon Feb 11 01:45:03 2008 @@ -171,7 +171,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Multicast-Sender", "%s", globals.hostname); if (switch_event_serialize(event, &packet, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { memcpy(buf, &globals.host_hash, sizeof(globals.host_hash)); - switch_copy_string(buf + sizeof(globals.host_hash), packet, sizeof(buf) - sizeof(globals.host_hash)); + switch_copy_string(buf + sizeof(globals.host_hash), packet, MULTICAST_BUFFSIZE - sizeof(globals.host_hash)); len = strlen(packet) + sizeof(globals.host_hash);; //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT\n--------------------------------\n%s\n", buf); switch_socket_sendto(globals.udp_socket, globals.addr, 0, buf, &len); @@ -270,7 +270,7 @@ globals.running = 1; while (globals.running == 1) { char *myaddr; - size_t len = sizeof(buf); + size_t len = MULTICAST_BUFFSIZE; memset(buf, 0, len); switch_sockaddr_ip_get(&myaddr, globals.addr);

1 0