September 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9763 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 30 Sep '08

30 Sep '08

Author: brian Date: Tue Sep 30 17:26:09 2008 New Revision: 9763 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: it is now Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Tue Sep 30 17:26:09 2008 @@ -152,6 +152,8 @@    +  +  <!-- Choose the realm challenge key. Default is auto_to if not set.

1 0

[commit] r9762 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 30 Sep '08

30 Sep '08

Author: anthm Date: Tue Sep 30 14:20:38 2008 New Revision: 9762 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: up Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Tue Sep 30 14:20:38 2008 @@ -215,6 +215,10 @@ if ((accountcode = switch_channel_get_variable(channel, "ACCOUNTCODE"))) { a_template_str = (const char *) switch_core_hash_find(globals.template_hash, accountcode); } + + if (!g_template_str) { + g_template_str = "\"${accountcode}\",\"${caller_id_number}\",\"${destination_number}\",\"${context}\",\"${caller_id}\",\"${channel_name}\",\"${bridge_channel}\",\"${last_app}\",\"${last_arg}\",\"${start_stamp}\",\"${answer_stamp}\",\"${end_stamp}\",\"${duration}\",\"${billsec}\",\"${hangup_cause}\",\"${amaflags}\",\"${uuid}\",\"${userfield}\";"; + } if (!a_template_str) { a_template_str = g_template_str;

1 0

[commit] r9761 - freeswitch/trunk/src
by Freeswitch SVN 30 Sep '08

30 Sep '08

Author: anthm Date: Tue Sep 30 13:24:04 2008 New Revision: 9761 Modified: freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_time.c Log: tweaks Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Sep 30 13:24:04 2008 @@ -760,7 +760,6 @@ switch_rtp_flag_t flags, char *timer_name, const char **err, switch_memory_pool_t *pool) { switch_rtp_t *rtp_session = NULL; - uint32_t ssrc = rand() & 0xffffffff; *new_rtp_session = NULL; @@ -792,7 +791,7 @@ rtp_session->seq = (uint16_t) rand(); - rtp_session->ssrc = ssrc; + rtp_session->ssrc = (uint32_t) ((intptr_t) &rtp_session + (uint32_t) switch_timestamp(NULL)); rtp_session->send_msg.header.ssrc = htonl(rtp_session->ssrc); rtp_session->send_msg.header.ts = 0; rtp_session->send_msg.header.m = 0; @@ -1247,7 +1246,7 @@ } if (rtp_session->timer.interval) { - sleep_mss = 1000;//rtp_session->timer.interval * 1000; + sleep_mss = rtp_session->timer.interval * 1000; } else { rtp_session->last_time = switch_time_now(); } Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue Sep 30 13:24:04 2008 @@ -139,6 +139,15 @@ SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t) { +#if defined(HAVE_USLEEP) + usleep(t); +#elif defined(WIN32) + Sleep((DWORD) ((t) / 1000)); +#else + apr_sleep(t); +#endif + +#if 0 #if defined(HAVE_CLOCK_NANOSLEEP) && defined(SWITCH_USE_CLOCK_FUNCS) struct timespec ts; ts.tv_sec = t / APR_USEC_PER_SEC; @@ -153,7 +162,7 @@ #else apr_sleep(t); #endif - +#endif }

1 0

[commit] r9758 - freeswitch/trunk/src
by Freeswitch SVN 30 Sep '08

30 Sep '08

Author: robertj Date: Tue Sep 30 00:09:25 2008 New Revision: 9758 Modified: freeswitch/trunk/src/switch_core_codec.c Log: Fixed not being able to set the video read/write codecs to NULL. Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Tue Sep 30 00:09:25 2008 @@ -183,6 +183,15 @@ switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; + if (!codec || !codec->implementation) { + if (session->video_read_codec) { + session->video_read_codec = NULL; + return SWITCH_STATUS_SUCCESS; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n"); + return SWITCH_STATUS_FALSE; + } + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-video-read-codec-name", codec->implementation->iananame); @@ -210,7 +219,16 @@ switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; - if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { + if (!codec || !codec->implementation) { + if (session->video_write_codec) { + session->video_write_codec = NULL; + return SWITCH_STATUS_SUCCESS; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n"); + return SWITCH_STATUS_FALSE; + } + + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-video-write-codec-name", codec->implementation->iananame); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-video-write-codec-rate", "%d", codec->implementation->actual_samples_per_second);

1 0

[commit] r9757 - freeswitch/trunk/conf
by Freeswitch SVN 30 Sep '08

30 Sep '08

Author: brian Date: Mon Sep 29 23:29:05 2008 New Revision: 9757 Modified: freeswitch/trunk/conf/vars.xml Log: remote this out pending the decision where we want to put it. It can't go in the conf dir Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Sep 29 23:29:05 2008 @@ -124,6 +124,3 @@  <X-PRE-PROCESS cmd="set" data="default_provider_register=false"/> <X-PRE-PROCESS cmd="set" data="default_provider_contact=5000"/> -

1 0

[commit] r9756 - freeswitch/trunk/conf
by Freeswitch SVN 30 Sep '08

30 Sep '08

Author: brian Date: Mon Sep 29 22:55:36 2008 New Revision: 9756 Modified: freeswitch/trunk/conf/vars.xml Log: comment this out pending the decision where we want to put it. It can't go in the conf dir Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Sep 29 22:55:36 2008 @@ -124,6 +124,6 @@  <X-PRE-PROCESS cmd="set" data="default_provider_register=false"/> <X-PRE-PROCESS cmd="set" data="default_provider_contact=5000"/> - +

1 0

[commit] r9755 - freeswitch/trunk/src
by Freeswitch SVN 30 Sep '08

30 Sep '08

Author: robertj Date: Mon Sep 29 22:12:38 2008 New Revision: 9755 Modified: freeswitch/trunk/src/switch_time.c Log: Fixed compile issues with VS2005 build. Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Sep 29 22:12:38 2008 @@ -1207,7 +1207,7 @@ sp->ttis[0].tt_gmtoff = -dstoffset; sp->ttis[0].tt_isdst = 1; - sp->ttis[0].tt_abbrind = stdlen + 1; + sp->ttis[0].tt_abbrind = (int)(stdlen + 1); sp->ttis[1].tt_gmtoff = -stdoffset; sp->ttis[1].tt_isdst = 0; sp->ttis[1].tt_abbrind = 0; @@ -1318,7 +1318,7 @@ sp->ttis[0].tt_abbrind = 0; sp->ttis[1].tt_gmtoff = -dstoffset; sp->ttis[1].tt_isdst = TRUE; - sp->ttis[1].tt_abbrind = stdlen + 1; + sp->ttis[1].tt_abbrind = (int)(stdlen + 1); sp->typecnt = 2; } } else { @@ -1330,9 +1330,9 @@ sp->ttis[0].tt_abbrind = 0; } - sp->charcnt = stdlen + 1; + sp->charcnt = (int)(stdlen + 1); if (dstlen != 0) - sp->charcnt += dstlen + 1; + sp->charcnt += (int)(dstlen + 1); if ((size_t) sp->charcnt > sizeof sp->chars) return -1; cp = sp->chars; @@ -1359,7 +1359,7 @@ { register const struct lsinfo * lp; register long days; - register long rem; + register time_t rem; register int y; register int yleap; register const int * ip;

1 0

[commit] r9754 - freeswitch/trunk/src
by Freeswitch SVN 30 Sep '08

30 Sep '08

Author: mikej Date: Mon Sep 29 21:57:02 2008 New Revision: 9754 Modified: freeswitch/trunk/src/switch_rtp.c Log: totally random ssrc thing. Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Sep 29 21:57:02 2008 @@ -760,7 +760,7 @@ switch_rtp_flag_t flags, char *timer_name, const char **err, switch_memory_pool_t *pool) { switch_rtp_t *rtp_session = NULL; - uint32_t ssrc = rand() & 0xffff; + uint32_t ssrc = rand() & 0xffffffff; *new_rtp_session = NULL;

1 0

[commit] r9753 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: mikej Date: Mon Sep 29 19:52:25 2008 New Revision: 9753 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: cleanup fsctl output. 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 Mon Sep 29 19:52:25 2008 @@ -691,17 +691,22 @@ if (!strcasecmp(argv[0], "hupall")) { arg = 1; switch_core_session_ctl(SCSC_HUPALL, &arg); + stream->write_function(stream, "+OK\n"); } else if (!strcasecmp(argv[0], "pause")) { arg = 1; switch_core_session_ctl(SCSC_PAUSE_INBOUND, &arg); + stream->write_function(stream, "+OK\n"); } else if (!strcasecmp(argv[0], "resume")) { arg = 0; switch_core_session_ctl(SCSC_PAUSE_INBOUND, &arg); + stream->write_function(stream, "+OK\n"); } else if (!strcasecmp(argv[0], "shutdown")) { arg = 0; switch_core_session_ctl(SCSC_SHUTDOWN, &arg); + stream->write_function(stream, "+OK\n"); } else if (!strcasecmp(argv[0], "reclaim_mem")) { switch_core_session_ctl(SCSC_RECLAIM, &arg); + stream->write_function(stream, "+OK\n"); } else if (!strcasecmp(argv[0], "max_sessions")) { if (argc > 1) { arg = atoi(argv[1]); @@ -731,7 +736,7 @@ arg = -1; } - if (arg == -1 || arg == SWITCH_LOG_INVALID) { + if (arg == SWITCH_LOG_INVALID) { stream->write_function(stream, "-ERR syntax error, log level not set!\n"); } else { switch_core_session_ctl(SCSC_LOGLEVEL, &arg); @@ -757,7 +762,6 @@ goto end; } - stream->write_function(stream, "+OK\n"); end: free(mydata); } else {

1 0

[commit] r9752 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia mod/formats/mod_shout
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: anthm Date: Mon Sep 29 19:03:27 2008 New Revision: 9752 Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/formats/mod_shout/Makefile freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Mon Sep 29 19:03:27 2008 @@ -161,7 +161,8 @@ \param port the remote port \param err pointer for error messages */ -SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, + switch_bool_t change_adv_addr, const char **err); SWITCH_DECLARE(char *) switch_rtp_get_remote_host(switch_rtp_t *rtp_session); SWITCH_DECLARE(switch_port_t) switch_rtp_get_remote_port(switch_rtp_t *rtp_session); @@ -173,10 +174,12 @@ \param rtp_session an RTP session to assign the local address to \param host the ip or fqhn of the local address \param port the local port + \param change_adv_addr change the advertised address for doing compare \param err pointer for error messages \note this call also binds the RTP session's socket to the new address */ -SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, + switch_port_t port, const char **err); /*! \brief Kill the socket on an existing RTP session 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 Sep 29 19:03:27 2008 @@ -858,7 +858,8 @@ switch_set_flag_locked(tech_pvt, TFLAG_VIDEO); switch_channel_set_flag(tech_pvt->channel, CF_VIDEO); if (switch_rtp_ready(tech_pvt->video_rtp_session)) { - if (switch_rtp_set_remote_address(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port, &err) != + if (switch_rtp_set_remote_address(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip, + tech_pvt->remote_sdp_video_port, SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", err); } else { @@ -881,7 +882,7 @@ } if (switch_rtp_ready(tech_pvt->rtp_session)) { - if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, &err) != + if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", err); } else { @@ -1788,7 +1789,7 @@ if (tech_pvt->rtp_session && switch_test_flag(tech_pvt, TFLAG_REINVITE)) { switch_clear_flag_locked(tech_pvt, TFLAG_REINVITE); - if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, &err) != + if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", err); } else { Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Mon Sep 29 19:03:27 2008 @@ -30,7 +30,7 @@ $(GETLIB) $(MPG123).tar.gz $(MPG123_DIR)/Makefile: $(MPG123_DIR) - cd $(MPG123_DIR) && ./configure --disable-shared --with-pic + cd $(MPG123_DIR) && CFLAGS=$(AM_CFLAGS) ./configure --disable-shared --with-pic $(TOUCH_TARGET) $(MPG123LA): $(MPG123_DIR)/Makefile Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Sep 29 19:03:27 2008 @@ -196,6 +196,7 @@ int writing; char *stun_ip; switch_port_t stun_port; + int from_auto; }; static int global_init = 0; @@ -609,7 +610,8 @@ } -SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err) +SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, + switch_bool_t change_adv_addr, const char **err) { switch_sockaddr_t *remote_addr; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -623,8 +625,11 @@ switch_mutex_lock(rtp_session->write_mutex); rtp_session->remote_addr = remote_addr; - rtp_session->remote_host_str = switch_core_strdup(rtp_session->pool, host); - rtp_session->remote_port = port; + + if (change_adv_addr) { + rtp_session->remote_host_str = switch_core_strdup(rtp_session->pool, host); + rtp_session->remote_port = port; + } if (rtp_session->sock_input && switch_sockaddr_get_family(rtp_session->remote_addr) == @@ -886,7 +891,7 @@ goto end; } - if (switch_rtp_set_remote_address(rtp_session, tx_host, tx_port, err) != SWITCH_STATUS_SUCCESS) { + if (switch_rtp_set_remote_address(rtp_session, tx_host, tx_port, SWITCH_TRUE, err) != SWITCH_STATUS_SUCCESS) { switch_mutex_unlock(rtp_session->flag_mutex); rtp_session = NULL; goto end; @@ -1235,12 +1240,15 @@ uint8_t check = 0; stfu_frame_t *jb_frame; int ret = -1; - + int sleep_mss = 1000; + if (!switch_rtp_ready(rtp_session)) { return -1; } - if (!rtp_session->timer.interval) { + if (rtp_session->timer.interval) { + sleep_mss = 1000;//rtp_session->timer.interval * 1000; + } else { rtp_session->last_time = switch_time_now(); } @@ -1272,7 +1280,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, switch_sockaddr_get_port(rtp_session->from_addr)); - switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err); + switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), SWITCH_FALSE, &err); switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); } } @@ -1544,8 +1552,12 @@ break; do_continue: - - switch_yield(1000); + + if (sleep_mss) { + switch_yield(sleep_mss); + } else { + switch_yield(1000); + } } if (switch_rtp_ready(rtp_session)) {

1 0