- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8346 - freeswitch/trunk/build
by Freeswitch SVN 10 May '08

10 May '08

Author: stkn Date: Fri May 9 21:35:30 2008 New Revision: 8346 Modified: freeswitch/trunk/build/modmake.rules.in Log: Do not expand BASE variable while creating Makefiles for modules (so you can actually move the freeswitch source around after a build) Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Fri May 9 21:35:30 2008 @@ -93,7 +93,7 @@ @if test ! -f $@; then \ if ! pwd | grep $(switch_srcdir)/src/mod ; then rulesdir=$(switch_srcdir) ; else rulesdir=../../../.. ; fi ; \ echo BASE=$$rulesdir > Makefile ; \ - echo "include $(BASE)/build/modmake.rules" >> Makefile ; \ + echo 'include $(BASE)/build/modmake.rules' >> Makefile ; \ fi ; $(CURLLA):

1 0

[commit] r8345 - freeswitch/trunk
by Freeswitch SVN 10 May '08

10 May '08

Author: stkn Date: Fri May 9 20:39:12 2008 New Revision: 8345 Modified: freeswitch/trunk/configure.in Log: Rename --enable-debug to --disable-debug since the default is enabled Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri May 9 20:39:12 2008 @@ -140,9 +140,10 @@ APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) fi -# Enable debugging +# Enable debugging (default: on) +# (rename option if the default is changed) AC_ARG_ENABLE(debug, -[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enableval"],[enable_debug="yes"]) +[AC_HELP_STRING([--disable-debug],[build without debug information])],[enable_debug="$enableval"],[enable_debug="yes"]) if test "${enable_debug}" = "yes"; then AC_DEFINE([DEBUG],[],[Enable extra debugging.])

1 0

[commit] r8344 - freeswitch/trunk
by Freeswitch SVN 10 May '08

10 May '08

Author: stkn Date: Fri May 9 20:35:34 2008 New Revision: 8344 Modified: freeswitch/trunk/configure.in Log: Fix --enable-debug / --disable-debug configure option (disable did not work) Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri May 9 20:35:34 2008 @@ -64,8 +64,6 @@ fi -AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) - # Optional Features AC_ARG_ENABLE(resample, @@ -144,7 +142,7 @@ # Enable debugging AC_ARG_ENABLE(debug, -[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enable_debug"],[enable_debug="yes"]) +[AC_HELP_STRING([--enable-debug],[build with debug information])],[enable_debug="$enableval"],[enable_debug="yes"]) if test "${enable_debug}" = "yes"; then AC_DEFINE([DEBUG],[],[Enable extra debugging.]) @@ -157,6 +155,8 @@ fi +AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) + # tweak platform specific flags case "$host" in

1 0

[commit] r8343 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 09 May '08

09 May '08

Author: anthm Date: Fri May 9 18:16:08 2008 New Revision: 8343 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_play_say.c Log: doh should probably expose say Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Fri May 9 18:16:08 2008 @@ -756,7 +756,10 @@ switch_bool_t dial_b, switch_bool_t exec_b, const char *app); SWITCH_DECLARE(switch_status_t) switch_ivr_unbind_dtmf_meta_session(switch_core_session_t *session); SWITCH_DECLARE(switch_status_t) switch_ivr_soft_hold(switch_core_session_t *session, const char *unhold_key, const char *moh_a, const char *moh_b); +SWITCH_DECLARE(switch_status_t) switch_ivr_say(switch_core_session_t *session, const char *tosay, const char *module_name, const char *say_type, const char *say_method, switch_input_args_t *args); +SWITCH_DECLARE(switch_say_method_t) switch_ivr_get_say_method_by_name(const char *name); +SWITCH_DECLARE(switch_say_type_t) switch_ivr_get_say_type_by_name(const char *name); /** @} */ Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri May 9 18:16:08 2008 @@ -128,6 +128,23 @@ } } + +#define SAY_SYNTAX "<module_name> <say_type> <say_method> <text>" +SWITCH_STANDARD_APP(say_function) +{ + char *argv[4] = { 0 }; + int argc; + char *lbuf = NULL; + + if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data)) + && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { + switch_ivr_say(session, argv[3], argv[0], argv[1], argv[2], NULL); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SAY_SYNTAX); + } + +} + #define SOFT_HOLD_SYNTAX "<unhold key> [<moh_a>] [<moh_b>]" SWITCH_STANDARD_APP(soft_hold_function) { @@ -2012,6 +2029,7 @@ SWITCH_ADD_APP(app_interface, "clear_speech_cache", "Clear Speech Handle Cache", "Clear Speech Handle Cache", clear_speech_cache_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "bridge", "Bridge Audio", "Bridge the audio between two sessions", audio_bridge_function, "<channel_url>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "system", "Execute a system command", "Execute a system command", system_session_function, "<command>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "say", "say", "say", say_function, SAY_SYNTAX, SAF_NONE); SWITCH_ADD_DIALPLAN(dp_interface, "inline", inline_dialplan_hunt); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri May 9 18:16:08 2008 @@ -1668,6 +1668,21 @@ stfu_n_destroy(&jb); } +SWITCH_DECLARE(switch_status_t) switch_ivr_say(switch_core_session_t *session, const char *tosay, const char *module_name, const char *say_type, const char *say_method, switch_input_args_t *args) +{ + switch_say_interface_t *si; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + if ((si = switch_loadable_module_get_say_interface(module_name))) { + // should go back and proto all the say mods to const.... + status = si->say_function(session, (char *)tosay, switch_ivr_get_say_type_by_name(say_type), switch_ivr_get_say_method_by_name(say_method), args); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", module_name); + status = SWITCH_STATUS_FALSE; + } + + return status; +} /* For Emacs: * Local Variables: 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 Fri May 9 18:16:08 2008 @@ -65,7 +65,7 @@ NULL }; -static switch_say_method_t get_say_method_by_name(char *name) +SWITCH_DECLARE(switch_say_method_t) switch_ivr_get_say_method_by_name(const char *name) { int x = 0; for (x = 0; SAY_METHOD_NAMES[x]; x++) { @@ -77,7 +77,7 @@ return (switch_say_method_t) x; } -static switch_say_type_t get_say_type_by_name(char *name) +SWITCH_DECLARE(switch_say_type_t) switch_ivr_get_say_type_by_name(const char *name) { int x = 0; for (x = 0; SAY_TYPE_NAMES[x]; x++) { @@ -286,7 +286,7 @@ char *say_type = (char *) switch_xml_attr_soft(action, "type"); char *say_method = (char *) switch_xml_attr_soft(action, "method"); - status = si->say_function(session, odata, get_say_type_by_name(say_type), get_say_method_by_name(say_method), args); + status = si->say_function(session, odata, switch_ivr_get_say_type_by_name(say_type), switch_ivr_get_say_method_by_name(say_method), args); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", module_name); }

1 0

[commit] r8342 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 09 May '08

09 May '08

Author: anthm Date: Fri May 9 15:59:42 2008 New Revision: 8342 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_originate.c Log: allow blind xfers on no-media calls Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri May 9 15:59:42 2008 @@ -1671,8 +1671,13 @@ && !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { switch_channel_set_flag(caller_channel, CF_PROXY_MODE); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying proxy mode 'till both legs are up.\n"); - no_media_bridge = 1; + if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) { + switch_ivr_media(switch_core_session_get_uuid(session), SMF_REBRIDGE); + switch_channel_set_flag(caller_channel, CF_PROXY_MODE); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying proxy mode 'till both legs are up.\n"); + no_media_bridge = 1; + } } } 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 May 9 15:59:42 2008 @@ -1520,7 +1520,7 @@ if (gateway) { if (status == 200 || status == 404) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ping success %s\n", gateway->name); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ping success %s\n", gateway->name); gateway->status = SOFIA_GATEWAY_UP; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ping failed %s\n", gateway->name); @@ -2159,11 +2159,6 @@ goto done; } - if (switch_channel_test_flag(channel_a, CF_PROXY_MODE)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Re-establishing media.\n"); - switch_ivr_media(switch_core_session_get_uuid(session), SMF_REBRIDGE); - } - from = sip->sip_from; to = sip->sip_to; @@ -2189,6 +2184,15 @@ sip_replaces_t *replaces; nua_handle_t *bnh; char *rep; + + if (switch_channel_test_flag(channel_a, CF_PROXY_MODE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Attended Transfer BYPASS MEDIA CALLS!\n"); + switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER_ERROR"); + nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), + TAG_END()); + goto done; + } if ((rep = strchr(refer_to->r_url->url_headers, '='))) { const char *br_a = NULL, *br_b = NULL; @@ -2209,6 +2213,7 @@ sofia_private_t *b_private = NULL; private_object_t *b_tech_pvt = NULL; switch_core_session_t *b_session = NULL; + switch_channel_set_variable(channel_a, SOFIA_REPLACES_HEADER, rep); if ((b_private = nua_handle_magic(bnh))) { @@ -2347,7 +2352,7 @@ &tsession, &cause, exten, timeout, &noop_state_handler, NULL, NULL, NULL, SOF_NONE); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! [%s]\n", exten); - nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("messsage/sipfrag"), NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END()); @@ -2404,6 +2409,9 @@ if (!switch_strlen_zero(full_ref_to)) { switch_channel_set_variable(b_channel, SOFIA_REFER_TO_VARIABLE, full_ref_to); } + + + switch_ivr_session_transfer(b_session, exten, NULL, NULL); switch_core_session_rwunlock(b_session); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Fri May 9 15:59:42 2008 @@ -221,9 +221,7 @@ if ((pname = switch_event_get_header(event, "sofia-profile"))) { - if ((profile = sofia_glue_find_profile(pname))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "using profile %s\n", pname); - } else { + if (!(profile = sofia_glue_find_profile(pname))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no profile %s\n", pname); } } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri May 9 15:59:42 2008 @@ -112,8 +112,8 @@ switch_core_session_t *session; switch_channel_state_t state; switch_channel_state_t running_state; - uint32_t flags; - uint32_t state_flags; + switch_channel_flag_t flags; + switch_channel_flag_t state_flags; switch_caller_profile_t *caller_profile; const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; int state_handler_index; Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri May 9 15:59:42 2008 @@ -106,11 +106,6 @@ top: - if (!(session->read_codec && session->read_codec->implementation)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s has no read codec.\n", switch_channel_get_name(session->channel)); - return SWITCH_STATUS_FALSE; - } - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { *frame = NULL; return SWITCH_STATUS_FALSE; @@ -165,7 +160,14 @@ } switch_assert((*frame)->codec != NULL); - if ((session->read_codec && (*frame)->codec && session->read_codec->implementation != (*frame)->codec->implementation)) { + + if (!(session->read_codec && session->read_codec->implementation)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s has no read codec.\n", switch_channel_get_name(session->channel)); + abort(); + return SWITCH_STATUS_FALSE; + } + + if (((*frame)->codec && session->read_codec->implementation != (*frame)->codec->implementation)) { need_codec = TRUE; } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri May 9 15:59:42 2008 @@ -60,6 +60,11 @@ break; } + if (switch_channel_test_flag(channel, CF_PROXY_MODE)) { + switch_yield(1000); + continue; + } + if (switch_channel_test_flag(channel, CF_SERVICE) || (!switch_channel_test_flag(channel, CF_ANSWERED) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA))) { switch_yield(1000); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri May 9 15:59:42 2008 @@ -38,8 +38,10 @@ { switch_channel_t *channel = switch_core_session_get_channel(session); - while(switch_channel_get_state(channel) == CS_CONSUME_MEDIA) { - switch_ivr_sleep(session, 10); + if (!switch_channel_test_flag(channel, CF_PROXY_MODE)) { + while(switch_channel_get_state(channel) == CS_CONSUME_MEDIA) { + switch_ivr_sleep(session, 10); + } } switch_channel_clear_state_handler(channel, &originate_state_handlers); @@ -1057,10 +1059,12 @@ } } - /* read from the channel while we wait if the audio is up on it */ - if (session && (ringback_data || - !(switch_channel_test_flag(caller_channel, CF_PROXY_MODE) && switch_channel_test_flag(caller_channel, CF_PROXY_MODE))) && - (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA))) { + /* read from the channel while we wait if the audio is up on it */ + if (session && + !switch_channel_test_flag(caller_channel, CF_PROXY_MODE) && + !switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA) && + (ringback_data || (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)))) { + switch_status_t tstatus = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); if (!SWITCH_READ_ACCEPTABLE(tstatus)) {

1 0

[commit] r8341 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 09 May '08

09 May '08

Author: anthm Date: Fri May 9 15:35:51 2008 New Revision: 8341 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: fix small issue 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 May 9 15:35:51 2008 @@ -101,6 +101,7 @@ sofia_gateway_t *gateway; char gateway_name[512]; int destroy_nh; + int destroy_me; }; #define set_param(ptr,val) if (ptr) {free(ptr) ; ptr = NULL;} if (val) {ptr = strdup(val);} 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 May 9 15:35:51 2008 @@ -350,6 +350,11 @@ break; } + if (sofia_private && sofia_private->destroy_me) { + free(sofia_private); + sofia_private = NULL; + } + if (gateway) { sofia_reg_release_gateway(gateway); } @@ -2108,14 +2113,14 @@ if (tech_pvt->sofia_private) { sofia_private = tech_pvt->sofia_private; tech_pvt->sofia_private = NULL; - free(sofia_private); + sofia_private->destroy_me = 1; } tech_pvt->nh = NULL; } else if (sofia_private) { - free(sofia_private); + sofia_private->destroy_me = 1; } if (nh) {

1 0

[commit] r8340 - freeswitch/trunk
by Freeswitch SVN 09 May '08

09 May '08

Author: stkn Date: Fri May 9 15:15:07 2008 New Revision: 8340 Modified: freeswitch/trunk/bootstrap.sh Log: Remove iax from bootstrap.sh too Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Fri May 9 15:15:07 2008 @@ -3,7 +3,7 @@ BASEDIR=`pwd`; LIBDIR=${BASEDIR}/libs; -SUBDIRS="codec/ilbc curl iax iksemel voipcodecs \ +SUBDIRS="codec/ilbc curl iksemel voipcodecs \ js js/nsprpub libdingaling libedit libresample libsndfile pcre sofia-sip \ speex sqlite srtp xmlrpc-c openzap";

1 0

[commit] r8339 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 09 May '08

09 May '08

Author: anthm Date: Fri May 9 14:20:13 2008 New Revision: 8339 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile Log: whoops Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile Fri May 9 14:20:13 2008 @@ -1,5 +1,5 @@ BASE=../../../.. -LOCAL_CFLAGS=-I. -DNEWJB -DLIBIAX +LOCAL_CFLAGS=-I. -DNEWJB -DLIBIAX -DDEBUG_SUPPORT LOCAL_OBJS=iax2-parser.o iax.o md5.o jitterbuf.o iax-mutex.o include $(BASE)/build/modmake.rules

1 0

[commit] r8338 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 09 May '08

09 May '08

Author: mikej Date: Fri May 9 13:47:20 2008 New Revision: 8338 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Log: Wed May 7 15:54:41 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * outbound.c: fix sofia-sip.org bug #1930055 If the initial REGISTER was not challenged, the natted contact did not get unregistered. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 9 13:47:20 2008 @@ -1 +1 @@ -Fri May 9 13:46:29 EDT 2008 +Fri May 9 13:47:15 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Fri May 9 13:47:20 2008 @@ -97,7 +97,7 @@ /** Source of Contact header */ unsigned ob_by_stack:1; /** Self-generated contacts */ - unsigned ob_contacts:1, :0; + unsigned ob_contacts:1; /* The registration state machine. */ /** Initial REGISTER containing ob_rcontact has been sent */ @@ -336,6 +336,14 @@ if (ob) { if (ob->ob_contacts) *return_current_contact = ob->ob_rcontact; + else { + sip_contact_t *contact = *return_current_contact; + if (contact) { + if (ob->ob_rcontact) + msg_header_free_all(ob->ob_home, (msg_header_t*)ob->ob_rcontact); + ob->ob_rcontact = sip_contact_dup(ob->ob_home, contact); + } + } *return_previous_contact = ob->ob_previous; } return 0;

1 0

[commit] r8337 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by Freeswitch SVN 09 May '08

09 May '08

Author: mikej Date: Fri May 9 13:46:43 2008 New Revision: 8337 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_log.c Log: Wed May 7 10:59:52 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * su_log.c: allow multiple calls su_log_soft_set_level() to change logging level Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 9 13:46:43 2008 @@ -1 +1 @@ -Fri May 9 13:45:02 EDT 2008 +Fri May 9 13:46:29 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_log.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_log.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_log.c Fri May 9 13:46:43 2008 @@ -240,11 +240,13 @@ { if (log == NULL) log = su_log_default; - if (log->log_init > 1) + if (log->log_init == 1) return; + if (log->log_env && getenv(log->log_env)) { su_log_init(log); - } else { + } + else { log->log_level = level; log->log_init = 2;

1 0