Author: anthm Date: Thu May 10 14:17:34 2007 New Revision: 5126 Modified: freeswitch/trunk/libs/ (props changed) freeswitch/trunk/libs/curl/ (props changed) freeswitch/trunk/libs/libedit/ (props changed) freeswitch/trunk/libs/libedit/doc/ (props changed) freeswitch/trunk/libs/libedit/examples/ (props changed) freeswitch/trunk/libs/libedit/src/ (props changed) freeswitch/trunk/libs/portaudio/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/ (props changed) freeswitch/trunk/libs/sofia-sip/utils/ (props changed) freeswitch/trunk/libs/xmlrpc-c/src/cpp/ (props changed) freeswitch/trunk/scripts/socket/socket2me/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_sofia/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Changes in other areas also in this revision: Modified: freeswitch/trunk/ (props changed) Log: props and sofia fix Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c Thu May 10 14:17:34 2007 @@ -927,7 +927,7 @@ size_t len, xtra, e_len, l_len = 0, l_xtra = 0; ta_list ta; - if (nua == NULL || (nua->nua_shutdown_started && event != nua_r_shutdown)) + if (nua == NULL) return; ta_start(ta, tag, value); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Thu May 10 14:17:34 2007 @@ -378,7 +378,8 @@ 901, "Stack is going down", NULL); } - else switch (event) { + + switch (event) { case nua_r_get_params: nua_stack_get_params(nua, nh ? nh : nua->nua_dhandle, event, tags); break; @@ -485,8 +486,7 @@ su_timer_set(t, nua_stack_timer, a); if (nua->nua_shutdown) { - nua_stack_shutdown(nua); - return; + nua_stack_shutdown(nua); } for (nh = nua->nua_handles; nh; nh = nh_next) { 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 Thu May 10 14:17:34 2007 @@ -339,7 +339,7 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -411,7 +411,7 @@ } } - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -443,7 +443,7 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -538,7 +538,7 @@ } } - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -1140,7 +1140,7 @@ if (!strcasecmp(argv[1], "stop") || !strcasecmp(argv[1], "restart")) { - int rsec = 30; + int rsec = 3; int diff = (int) (time(NULL) - profile->started); int remain = rsec - diff; if (diff < rsec) { 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 Thu May 10 14:17:34 2007 @@ -363,11 +363,6 @@ su_root_step(profile->s_root, 1000); } - while(profile->inuse) { - switch_yield(500000); - } - - //sofia_reg_check_expire(profile, 0); //sofia_reg_check_gateway(profile, 0); Diffs of changes in other areas also in this revision: