- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13127 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 23 Apr '09

23 Apr '09

Author: anthm Date: Wed Apr 22 19:30:43 2009 New Revision: 13127 Log: change len to seconds Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Wed Apr 22 19:30:43 2009 @@ -1064,7 +1064,7 @@ SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) == SWITCH_STATUS_SUCCESS) { if (switch_core_file_seek(&fh, &pos, 0, SEEK_END) == SWITCH_STATUS_SUCCESS) { - *message_len = pos; + *message_len = pos / fh.samplerate; status = SWITCH_STATUS_SUCCESS; } switch_core_file_close(&fh);

1 0

[commit] r13126 - freeswitch/trunk/src/mod/loggers/mod_console
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: stkn Date: Wed Apr 22 18:42:11 2009 New Revision: 13126 Log: Fix mod_console too (missing FD_ZERO before FD_SET) Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Wed Apr 22 18:42:11 2009 @@ -155,6 +155,7 @@ fd = fileno(handle); memset(&to, 0, sizeof(to)); + FD_ZERO(&can_write); FD_SET(fd, &can_write); to.tv_sec = sec; to.tv_usec = usec;

1 0

[commit] r13125 - freeswitch/trunk/src
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: stkn Date: Wed Apr 22 18:34:48 2009 New Revision: 13125 Log: Do not use struct fd_set uninitialized (always FD_ZERO() them, before using FD_SET() on a new one, or reusing them after select()). Fixes a segfault on solaris Modified: freeswitch/trunk/src/switch_log.c Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Wed Apr 22 18:34:48 2009 @@ -332,6 +332,7 @@ fd = fileno(handle); memset(&to, 0, sizeof(to)); + FD_ZERO(&can_write); FD_SET(fd, &can_write); to.tv_sec = 0; to.tv_usec = 100000;

1 0

[commit] r13124 - freeswitch/trunk/libs/iksemel/src
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: anthm Date: Wed Apr 22 17:19:12 2009 New Revision: 13124 Log: doh Modified: freeswitch/trunk/libs/iksemel/src/stream.c Modified: freeswitch/trunk/libs/iksemel/src/stream.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/stream.c (original) +++ freeswitch/trunk/libs/iksemel/src/stream.c Wed Apr 22 17:19:12 2009 @@ -516,9 +516,10 @@ #endif { len = data->trans->recv (data->sock, data->buf, NET_IO_BUF_SIZE - 1, timeout); + if (len == 0) len = -1; } - if (len <= 0) return IKS_NET_RWERR; - + if (len < 0) return IKS_NET_RWERR; + if (len == 0) break; data->buf[len] = '\0'; if (data->logHook) data->logHook (data->user_data, data->buf, len, 1); ret = iks_parse (prs, data->buf, len, 0);

1 0

[commit] r13123 - freeswitch/trunk/libs/iksemel/src
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: anthm Date: Wed Apr 22 16:43:53 2009 New Revision: 13123 Log: let return 0 be a failure on read in iks to avoid cpu race Modified: freeswitch/trunk/libs/iksemel/src/stream.c Modified: freeswitch/trunk/libs/iksemel/src/stream.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/stream.c (original) +++ freeswitch/trunk/libs/iksemel/src/stream.c Wed Apr 22 16:43:53 2009 @@ -517,8 +517,8 @@ { len = data->trans->recv (data->sock, data->buf, NET_IO_BUF_SIZE - 1, timeout); } - if (len < 0) return IKS_NET_RWERR; - if (len == 0) break; + if (len <= 0) return IKS_NET_RWERR; + data->buf[len] = '\0'; if (data->logHook) data->logHook (data->user_data, data->buf, len, 1); ret = iks_parse (prs, data->buf, len, 0);

1 0

[commit] r13122 - freeswitch/trunk/libs/speex
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: stkn Date: Wed Apr 22 14:12:42 2009 New Revision: 13122 Log: Disable the ";;" too Modified: freeswitch/trunk/libs/speex/configure.ac Modified: freeswitch/trunk/libs/speex/configure.ac ============================================================================== --- freeswitch/trunk/libs/speex/configure.ac (original) +++ freeswitch/trunk/libs/speex/configure.ac Wed Apr 22 14:12:42 2009 @@ -130,7 +130,7 @@ # CFLAGS="$SAVE_CFLAGS" # ] # ) - ;; +# ;; *) has_visibility=no AC_DEFINE([EXPORT], [], [Symbol visibility prefix])

1 0

[commit] r13121 - freeswitch/trunk/libs/speex
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: stkn Date: Wed Apr 22 14:11:30 2009 New Revision: 13121 Log: Disable speex suncc support again (at least the invalid option warning is gone now), not sure how this worked last time i tested it... Modified: freeswitch/trunk/libs/speex/configure.ac Modified: freeswitch/trunk/libs/speex/configure.ac ============================================================================== --- freeswitch/trunk/libs/speex/configure.ac (original) +++ freeswitch/trunk/libs/speex/configure.ac Wed Apr 22 14:11:30 2009 @@ -112,24 +112,24 @@ ] ) ;; -sun) - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -xldscope=hidden" - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ - __attribute__((visibility("default"))) - int var=10; - ]])], - [ - has_visibility=yes - AC_DEFINE([EXPORT], [__attribute__((visibility("default")))], [Symbol visibility prefix]) - ], - [ - has_visibility=no - AC_DEFINE([EXPORT], [], [Symbol visibility prefix]) - CFLAGS="$SAVE_CFLAGS" - ] - ) +#sun) +# SAVE_CFLAGS="$CFLAGS" +# CFLAGS="$CFLAGS -xldscope=hidden" +# AC_COMPILE_IFELSE([ +# AC_LANG_PROGRAM([[ +# __attribute__((visibility("default"))) +# int var=10; +# ]])], +# [ +# has_visibility=yes +# AC_DEFINE([EXPORT], [__attribute__((visibility("default")))], [Symbol visibility prefix]) +# ], +# [ +# has_visibility=no +# AC_DEFINE([EXPORT], [], [Symbol visibility prefix]) +# CFLAGS="$SAVE_CFLAGS" +# ] +# ) ;; *) has_visibility=no

1 0

[commit] r13120 - freeswitch/trunk/src
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: anthm Date: Wed Apr 22 13:50:57 2009 New Revision: 13120 Log: FSCORE-355 Modified: freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Wed Apr 22 13:50:57 2009 @@ -1155,7 +1155,7 @@ if (flags & SWITCH_URI_NO_SCOPE && sa->family == AF_INET6) { memcpy(&ss, &sa->sa, sa->salen); - ((struct sockaddr_in6*) &ss)->sin6_scope_id = 0; + ((struct sockaddr_in6*) (intptr_t) &ss)->sin6_scope_id = 0; addr = (const struct sockaddr*) &ss; } else { addr = (const struct sockaddr*) &sa->sa;

1 0

[commit] r13119 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: anthm Date: Wed Apr 22 13:38:55 2009 New Revision: 13119 Log: MODENDP-213 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Wed Apr 22 13:38:55 2009 @@ -1325,7 +1325,7 @@ msg->string_arg = p; switch_core_session_receive_message(session, msg); goto end_lock; - } else if (!switch_channel_test_flag(channel, CF_ANSWERED)) { + } else { if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d [%s]\n", code, reason); if (!switch_strlen_zero(((char *) msg->pointer_arg))) {

1 0

[commit] r13118 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: anthm Date: Wed Apr 22 13:06:34 2009 New Revision: 13118 Log: finish up last commit Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 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 Wed Apr 22 13:06:34 2009 @@ -3670,8 +3670,17 @@ channel = switch_core_session_get_channel(member->session); if (!new_conference) { - switch_mutex_lock(globals.setup_mutex); - locked = 1; + if (!locked) { + switch_mutex_lock(globals.setup_mutex); + locked = 1; + } + + if ((new_conference = conference_find(conf_name))) { + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } + } if (!(new_conference = conference_find(conf_name))) { /* build a new conference if it doesn't exist */ @@ -3700,13 +3709,6 @@ xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); } - if (!xml_cfg.profile) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name); - switch_xml_free(cxml); - cxml = NULL; - goto done; - } - xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); /* Release the config registry handle */ @@ -3726,8 +3728,10 @@ goto done; } - switch_mutex_unlock(globals.setup_mutex); - locked = 0; + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } /* Set the minimum number of members (once you go above it you cannot go below it) */ new_conference->min = 1; @@ -4715,8 +4719,10 @@ /* if this is a bridging call, and it's not a duplicate, build a */ /* conference object, and skip pin handling, and locked checking */ - switch_mutex_lock(globals.setup_mutex); - locked = 1; + if (!locked) { + switch_mutex_lock(globals.setup_mutex); + locked = 1; + } if (isbr) { char *uuid = switch_core_session_get_uuid(session); @@ -4737,8 +4743,10 @@ goto done; } - switch_mutex_unlock(globals.setup_mutex); - locked = 0; + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } switch_channel_set_variable(channel, "conference_name", conference->name); @@ -4759,8 +4767,15 @@ enforce_security = switch_true(pvar); } + if ((conference = conference_find(conf_name))) { + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } + } + /* if the conference exists, get the pointer to it */ - if (!(conference = conference_find(conf_name))) { + if (!conference) { /* couldn't find the conference, create one */ conference = conference_new(conf_name, xml_cfg, NULL); @@ -4768,8 +4783,10 @@ goto done; } - switch_mutex_unlock(globals.setup_mutex); - locked = 0; + if (locked) { + switch_mutex_unlock(globals.setup_mutex); + locked = 0; + } switch_channel_set_variable(channel, "conference_name", conference->name);

1 0