- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12866 - freeswitch/trunk/src
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: anthm Date: Wed Apr 1 11:51:23 2009 New Revision: 12866 Log: tweak debug message Modified: freeswitch/trunk/src/switch_core_memory.c Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Wed Apr 1 11:51:23 2009 @@ -348,7 +348,7 @@ #ifdef DEBUG_ALLOC2 switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "New Pool\n"); #endif - tmp = switch_core_sprintf(*pool, "%s:%d", func, line); + tmp = switch_core_sprintf(*pool, "%s:%d", file, line); apr_pool_tag(*pool, tmp); @@ -576,6 +576,7 @@ apr_allocator_mutex_set(my_allocator, my_mutex); apr_pool_mutex_set(memory_manager.memory_pool, my_mutex); apr_allocator_owner_set(my_allocator, memory_manager.memory_pool); + apr_pool_tag(memory_manager.memory_pool, "core_pool"); #else apr_pool_create(&memory_manager.memory_pool, NULL); switch_assert(memory_manager.memory_pool != NULL);

1 0

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

01 Apr '09

Author: anthm Date: Wed Apr 1 11:35:37 2009 New Revision: 12865 Log: just ok mwi notifies Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Wed Apr 1 11:35:37 2009 @@ -92,7 +92,7 @@ int sub_state; tl_gets(tags, NUTAG_SUBSTATE_REF(sub_state), TAG_END()); - + /* make sure we have a proper event */ if (!sip || !sip->sip_event) { goto error; @@ -254,8 +254,14 @@ error: - nua_respond(nh, 481, "Subscription Does Not Exist", NUTAG_WITH_THIS(nua), TAG_END()); + if (sip->sip_event && sip->sip_event->o_type && !strcasecmp(sip->sip_event->o_type, "message-summary")) { + /* unsolicited mwi, just say ok */ + nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); + } else { + nua_respond(nh, 481, "Subscription Does Not Exist", NUTAG_WITH_THIS(nua), TAG_END()); + } + end: if (sub_state == nua_substate_terminated) {

1 0

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

01 Apr '09

Author: anthm Date: Wed Apr 1 09:26:57 2009 New Revision: 12864 Log: clean up pin prommpting and make local override stay local 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 1 09:26:57 2009 @@ -4715,11 +4715,6 @@ /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 2; - /* if the dialplan specified a pin, override the profile's value */ - if (dpin) { - conference->pin = switch_core_strdup(conference->pool, dpin); - } - /* Indicate the conference is dynamic */ switch_set_flag_locked(conference, CFLAG_DYNAMIC); @@ -4743,11 +4738,6 @@ goto done; } - /* if the dialplan specified a pin, override the profile's value */ - if (dpin) { - conference->pin = switch_core_strdup(conference->pool, dpin); - } - switch_channel_set_variable(channel, "conference_name", conference->name); /* Set the minimum number of members (once you go above it you cannot go below it) */ @@ -4769,8 +4759,14 @@ } rl++; + if (!dpin && conference->pin) { + dpin = conference->pin; + } + + + /* if this is not an outbound call, deal with conference pins */ - if (enforce_security && conference->pin && *(conference->pin)) { + if (enforce_security && !switch_strlen_zero(dpin)) { char pin_buf[80] = ""; int pin_retries = 3; /* XXX - this should be configurable - i'm too lazy to do it right now... */ int pin_valid = 0; @@ -4778,28 +4774,47 @@ /* Answer the channel */ switch_channel_answer(channel); + + if (!conference->pin_sound) { + conference->pin_sound = switch_core_strdup(conference->pool, "conference/conf-pin.wav"); + } - while (!pin_valid && pin_retries && status == SWITCH_STATUS_SUCCESS) { + if (!conference->bad_pin_sound) { + conference->bad_pin_sound = switch_core_strdup(conference->pool, "conference/conf-bad-pin.wav"); + } + while (!pin_valid && pin_retries && status == SWITCH_STATUS_SUCCESS) { + switch_status_t pstatus = SWITCH_STATUS_FALSE; + /* be friendly */ if (conference->pin_sound) { - conference_local_play_file(conference, session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf)); + pstatus = conference_local_play_file(conference, session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf)); + } else if (conference->tts_engine && conference->tts_voice) { + pstatus = switch_ivr_speak_text(session, conference->tts_engine, conference->tts_voice, "please enter the conference pin number", NULL); + } else { + pstatus = switch_ivr_speak_text(session, "flite", "slt", "please enter the conference pin number", NULL); } + + if (pstatus != SWITCH_STATUS_SUCCESS && pstatus != SWITCH_STATUS_BREAK) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot ask the user for a pin, ending call"); + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + } + /* wait for them if neccessary */ - if (strlen(pin_buf) < strlen(conference->pin)) { + if (strlen(pin_buf) < strlen(dpin)) { char *buf = pin_buf + strlen(pin_buf); char term = '\0'; - + status = switch_ivr_collect_digits_count(session, buf, sizeof(pin_buf) - strlen(pin_buf), - strlen(conference->pin) - strlen(pin_buf), "#", &term, 10000, 0, 0); + strlen(dpin) - strlen(pin_buf), "#", &term, 10000, 0, 0); if (status == SWITCH_STATUS_TIMEOUT) { status = SWITCH_STATUS_SUCCESS; } } - pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, conference->pin) == 0); + pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, dpin) == 0); if (!pin_valid) { /* zero the collected pin */ memset(pin_buf, 0, sizeof(pin_buf));

1 0

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

01 Apr '09

Author: anthm Date: Wed Apr 1 08:57:16 2009 New Revision: 12863 Log: add conference_enforce_security variable to bypass or require pin or locked flag 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 1 08:57:16 2009 @@ -4727,6 +4727,13 @@ launch_conference_thread(conference); } else { + int enforce_security = !switch_channel_test_flag(channel, CF_OUTBOUND); + const char *pvar = switch_channel_get_variable(channel, "conference_enforce_security"); + + if (pvar) { + enforce_security = switch_true(pvar); + } + /* if the conference exists, get the pointer to it */ if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { /* couldn't find the conference, create one */ @@ -4763,7 +4770,7 @@ rl++; /* if this is not an outbound call, deal with conference pins */ - if (!switch_channel_test_flag(channel, CF_OUTBOUND) && conference->pin && *(conference->pin)) { + if (enforce_security && conference->pin && *(conference->pin)) { char pin_buf[80] = ""; int pin_retries = 3; /* XXX - this should be configurable - i'm too lazy to do it right now... */ int pin_valid = 0; @@ -4815,7 +4822,7 @@ } /* don't allow more callers if the conference is locked, unless we invited them */ - if (switch_test_flag(conference, CFLAG_LOCKED) && !switch_channel_test_flag(channel, CF_OUTBOUND)) { + if (switch_test_flag(conference, CFLAG_LOCKED) && enforce_security) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is locked.\n", conf_name); if (conference->locked_sound) { /* Answer the channel */

1 0

[commit] r12862 - in freeswitch/trunk/src/mod/languages: mod_lua mod_perl mod_python mod_spidermonkey
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: brian Date: Tue Mar 31 22:17:27 2009 New Revision: 12862 Log: remove lingering code that is not needed anymore Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Tue Mar 31 22:17:27 2009 @@ -44,7 +44,6 @@ static struct { switch_memory_pool_t *pool; char *xml_handler; - switch_event_node_t *node; } globals; int luaopen_freeswitch(lua_State * L); @@ -461,7 +460,6 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lua_shutdown) { - switch_event_unbind(&globals.node); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Tue Mar 31 22:17:27 2009 @@ -54,7 +54,6 @@ PerlInterpreter *my_perl; switch_memory_pool_t *pool; char *xml_handler; - switch_event_node_t *node; } globals; Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Tue Mar 31 22:17:27 2009 @@ -57,7 +57,6 @@ static struct { switch_memory_pool_t *pool; char *xml_handler; - switch_event_node_t *node; } globals; static void eval_some_python(const char *funcname, char *args, switch_core_session_t *session, switch_stream_handle_t *stream, switch_event_t *params, char **str) @@ -412,7 +411,7 @@ Py_Finalize(); PyEval_ReleaseLock(); - switch_event_unbind(&globals.node); + return SWITCH_STATUS_UNLOAD; } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Mar 31 22:17:27 2009 @@ -95,7 +95,6 @@ FILE *gOutFile; int stackDummy; JSRuntime *rt; - switch_event_node_t *node; } globals; static JSClass global_class = { @@ -3723,7 +3722,7 @@ //JS_DestroyRuntime(globals.rt); curl_global_cleanup(); - switch_event_unbind(&globals.node); + switch_core_hash_destroy(&module_manager.mod_hash); switch_core_hash_destroy(&module_manager.load_hash); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r12861 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 18:57:07 2009 New Revision: 12861 Log: speed up loop Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Tue Mar 31 18:57:07 2009 @@ -640,7 +640,8 @@ uint32_t gateway_loops = 0; int loops = 0; uint32_t qsize; - + void *pop; + ireg_loops = IREG_SECONDS; gateway_loops = GATEWAY_SECONDS; @@ -652,7 +653,6 @@ while ((mod_sofia_globals.running == 1 && sofia_test_pflag(profile, PFLAG_RUNNING)) || qsize) { if (qsize) { - void *pop; switch_mutex_lock(profile->ireg_mutex); while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { sofia_glue_actually_execute_sql(profile, SWITCH_TRUE, (char *) pop, NULL); @@ -675,10 +675,17 @@ loops = 0; } - switch_yield(10000); + switch_cond_next(); qsize = switch_queue_size(profile->sql_queue); } + switch_mutex_lock(profile->ireg_mutex); + while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + sofia_glue_actually_execute_sql(profile, SWITCH_TRUE, (char *) pop, NULL); + free(pop); + } + switch_mutex_unlock(profile->ireg_mutex); + sofia_clear_pflag_locked(profile, PFLAG_WORKER_RUNNING); return NULL;

1 0

[commit] r12860 - in freeswitch/trunk/src/mod/languages: mod_lua mod_perl mod_python mod_spidermonkey
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 18:56:47 2009 New Revision: 12860 Log: remove old code Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Tue Mar 31 18:56:47 2009 @@ -438,38 +438,11 @@ return SWITCH_STATUS_SUCCESS; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char *path, *cmd; - - path = switch_mprintf("%s%smwi.lua", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - switch_assert(path != NULL); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - lua_thread(cmd); - switch_safe_free(cmd); - } - - switch_safe_free(path); - } -} - SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load) { switch_api_interface_t *api_interface; switch_application_interface_t *app_interface; - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Tue Mar 31 18:56:47 2009 @@ -429,24 +429,6 @@ return xml; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char path[512], *cmd; - - switch_snprintf(path, sizeof(path), "%s%smwi.pl", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - perl_thread(cmd); - switch_safe_free(cmd); - } - } -} - static switch_status_t do_config(void) { char *cf = "perl.conf"; @@ -491,12 +473,6 @@ globals.pool = pool; - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - if (!(my_perl = perl_alloc())) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate perl interpreter\n"); return SWITCH_STATUS_MEMERR; Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Tue Mar 31 18:56:47 2009 @@ -333,26 +333,6 @@ return 0; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char *path, *cmd; - - path = switch_mprintf("%s%smwi.py", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - switch_assert(path != NULL); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - py_thread(cmd); - switch_safe_free(cmd); - } - switch_safe_free(path); - } -} - SWITCH_STANDARD_API(launch_python) { @@ -372,12 +352,6 @@ switch_application_interface_t *app_interface; char *pp = getenv("PYTHONPATH"); - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - if (pp) { char *path = switch_mprintf("%s:%s", pp, SWITCH_GLOBAL_dirs.script_dir); setenv("PYTHONPATH", path, 1); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Mar 31 18:56:47 2009 @@ -3695,27 +3695,6 @@ return SWITCH_STATUS_SUCCESS; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char *path, *cmd; - - path = switch_mprintf("%s%smwi.js", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - switch_assert(path != NULL); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - js_thread_launch(cmd); - switch_safe_free(cmd); - } - - switch_safe_free(path); - } -} - SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load) { switch_application_interface_t *app_interface; @@ -3725,12 +3704,6 @@ return status; } - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_API(js_run_interface, "jsrun", "run a script", launch_async, "jsrun <script> [additional_vars [...]]");

1 0

[commit] r12859 - freeswitch/trunk/src/mod/asr_tts/mod_flite
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: stkn Date: Tue Mar 31 18:36:35 2009 New Revision: 12859 Log: Flite does not like the "-std=c99" flag, use the fix from mod_xml_ldap (for openldap) to remove it from CFLAGS before calling the flite configure script Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Tue Mar 31 18:36:35 2009 @@ -17,7 +17,7 @@ $(GETLIB) $(FLITE)-latest.tar.gz $(FLITE_DIR)/Makefile: $(FLITE_DIR) - cd $(FLITE_DIR) && ./configure --without-audio --with-pic --disable-shared + cd $(FLITE_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure --without-audio --with-pic --disable-shared $(TOUCH_TARGET) $(FLITE_A): $(FLITE_DIR) $(FLITE_DIR)/Makefile

1 0

[commit] r12858 - freeswitch/trunk/src
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 15:55:26 2009 New Revision: 12858 Log: linux... how did that not crash every time Modified: freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Mar 31 15:55:26 2009 @@ -1119,9 +1119,10 @@ for (;;) { for (index = (*event)->priority; index < 3; index++) { + int was = (*event)->priority; if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { - if (index != (*event)->priority) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); + if (index != was) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority %d/%d!\n", index, was); } goto end; }

1 0

[commit] r12857 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/nta src src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: mikej Date: Tue Mar 31 15:54:31 2009 New Revision: 12857 Log: revert Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Mar 31 15:54:31 2009 @@ -3319,10 +3319,8 @@ msg_maxsize(msg, agent->sa_maxsize); - if (1 || agent->sa_preload) { - isize_t preload = (dlen + agent->sa_preload + 1023) & ~1023; - su_home_preload(msg_home(msg), 1, preload); - } + if (agent->sa_preload) + su_home_preload(msg_home(msg), 1, dlen + agent->sa_preload); return msg; } 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 Tue Mar 31 15:54:31 2009 @@ -744,7 +744,6 @@ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(profile->bindurl), - NTATAG_PRELOAD(2048), TAG_IF(!strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP4_ONLY)), TAG_IF(strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP6_ONLY)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Mar 31 15:54:31 2009 @@ -1119,10 +1119,9 @@ for (;;) { for (index = (*event)->priority; index < 3; index++) { - int was = (*event)->priority; if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { - if (index != was) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority %d/%d!\n", index, was); + if (index != (*event)->priority) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); } goto end; }

1 0