May 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

09 May '08

Author: mikej Date: Fri May 9 13:45:13 2008 New Revision: 8336 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Log: Wed May 7 10:59:16 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * tport_tls.c: avoid free(NULL) Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 9 13:45:13 2008 @@ -1 +1 @@ -Fri May 9 13:44:20 EDT 2008 +Fri May 9 13:45:02 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Fri May 9 13:45:13 2008 @@ -299,7 +299,9 @@ BIO_free(tls->bio_con); for (k = 0; k < TLS_MAX_HOSTS; k++) - free(tls->hosts[k]), tls->hosts[k] = NULL; + if (tls->hosts[k]) { + free(tls->hosts[k]), tls->hosts[k] = NULL; + } free(tls); }

1 0

[commit] r8335 - 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:44:46 2008 New Revision: 8335 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h Log: Wed May 7 10:08:17 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua: improved logging, fixed macro expansion on __LINE__ on most compilers Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 9 13:44:46 2008 @@ -1 +1 @@ -Fri May 9 13:43:35 EDT 2008 +Fri May 9 13:44:20 EDT 2008 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 Fri May 9 13:44:46 2008 @@ -511,12 +511,19 @@ e->e_status = status; e->e_phrase = phrase; - SU_DEBUG_7(("nua(%p): signal %s\n", (void *)nh, - nua_event_name(event) + 4)); - su_msg_deinitializer(sumsg, nua_event_deinit); retval = su_msg_send_to(sumsg, nua->nua_server, nua_stack_signal); + + if (retval == 0){ + SU_DEBUG_7(("nua(%p): %s signal %s\n", (void *)nh, + "sent", nua_event_name(event) + 4)); + } + else { + SU_DEBUG_0(("nua(%p): %s signal %s\n", (void *)nh, + "FAILED TO SEND", nua_event_name(event) + 4)); + + } } ta_end(ta); @@ -552,9 +559,9 @@ char const *name = nua_event_name(e->e_event); if (e->e_status == 0) - SU_DEBUG_5(("nua(%p): signal %s\n", (void *)nh, name + 4)); + SU_DEBUG_5(("nua(%p): %s signal %s\n", (void *)nh, "recv", name + 4)); else - SU_DEBUG_5(("nua(%p): signal %s %u %s\n", + SU_DEBUG_5(("nua(%p): recv signal %s %u %s\n", (void *)nh, name + 4, e->e_status, e->e_phrase ? e->e_phrase : "")); } @@ -651,7 +658,8 @@ } if (error < 0) { - nua_stack_event(nh->nh_nua, nh, NULL, event, NUA_ERROR_AT(__FILE__, __LINE__), NULL); + nua_stack_event(nh->nh_nua, nh, NULL, event, + NUA_ERROR_AT(__FILE__, __LINE__), NULL); } su_msg_destroy(nua->nua_signal); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h Fri May 9 13:44:46 2008 @@ -207,7 +207,8 @@ extern char const nua_internal_error[]; #define NUA_INTERNAL_ERROR 900, nua_internal_error -#define NUA_ERROR_AT(file, line) 900, "Internal error at " file ":" #line +#define _NUA_INTERNAL_ERROR_AT(file, line) "Internal error at " file ":" #line +#define NUA_ERROR_AT(file, line) 900, _NUA_INTERNAL_ERROR_AT(file, line) struct nua_s { su_home_t nua_home[1];

1 0

[commit] r8334 - 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:44:02 2008 New Revision: 8334 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Wed May 7 10:05:57 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_stack.c: if nua_register() fails to provide To, use From. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 9 13:44:02 2008 @@ -1 +1 @@ -Fri May 9 13:43:01 EDT 2008 +Fri May 9 13:43:35 EDT 2008 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 Fri May 9 13:44:02 2008 @@ -2290,6 +2290,12 @@ sip_add_dup(msg, sip, (sip_header_t *)nua->nua_from) < 0) return nua_client_return(cr, NUA_ERROR_AT(__FILE__, __LINE__), msg); + if (sip->sip_to == NULL && cr->cr_method == sip_method_register && + sip_add_dup_as(msg, sip, sip_to_class, + (sip_header_t *)sip->sip_from) < 0) { + return nua_client_return(cr, NUA_ERROR_AT(__FILE__, __LINE__), msg); + } + if (cr->cr_dialog) { ds->ds_leg = nta_leg_tcreate(nua->nua_nta, nua_stack_process_request, nh,

1 0

[commit] r8333 - 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:43:16 2008 New Revision: 8333 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Log: Wed May 7 10:04:14 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: do not terminate session without soa if SDP O/A seems to fail SDP O/A may be buried inside MIME multipart Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 9 13:43:16 2008 @@ -1 +1 @@ -Fri May 9 13:42:29 EDT 2008 +Fri May 9 13:43:01 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Fri May 9 13:43:16 2008 @@ -1293,7 +1293,9 @@ /* signal SOA that O/A round(s) is (are) complete */ soa_activate(nh->nh_soa, NULL); } - else if (nh->nh_soa == NULL && !(cr->cr_offer_sent && !cr->cr_answer_recv)) { + else if (nh->nh_soa == NULL + /* NUA does not necessarily know dirty details */ + /* && !(cr->cr_offer_sent && !cr->cr_answer_recv) */) { ; } else { @@ -3135,17 +3137,15 @@ (sr->sr_offer_recv && !sr->sr_answer_sent)) break; - if (sr || - (cri && cri->cr_offer_sent && !cri->cr_answer_recv) || - (cri && cri->cr_offer_recv && !cri->cr_answer_sent)) { - if (nh->nh_soa == NULL) { - if (session_get_description(sip, NULL, NULL)) - return nua_client_return(cr, 500, "Overlapping Offer/Answer", msg); - } - } - else if (nh->nh_soa == NULL) { + if (nh->nh_soa == NULL) { offer_sent = session_get_description(sip, NULL, NULL); } + else if (sr || + (cri && cri->cr_offer_sent && !cri->cr_answer_recv) || + (cri && cri->cr_offer_recv && !cri->cr_answer_sent)) { + if (session_get_description(sip, NULL, NULL)) + return nua_client_return(cr, 500, "Overlapping Offer/Answer", msg); + } else if (!sip->sip_payload) { soa_init_offer_answer(nh->nh_soa); @@ -3360,7 +3360,7 @@ if ((overlap = sr0->sr_offer_recv && !sr0->sr_answer_sent)) break; - if (overlap) + if (nh->nh_soa && overlap) return nua_server_retry_after(sr, 500, "Overlapping Offer/Answer", 1, 9); if (nh->nh_soa &&

1 0

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

09 May '08

Author: mikej Date: Fri May 9 13:42:46 2008 New Revision: 8332 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Log: Wed May 7 09:10:28 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nta.c: do not replace host:port in user-specified Via header Note that port for UDP is replaced if request is stateful and there is no rport. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 9 13:42:46 2008 @@ -1 +1 @@ -Wed May 7 08:28:38 EDT 2008 +Fri May 9 13:42:29 EDT 2008 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 Fri May 9 13:42:46 2008 @@ -2063,11 +2063,16 @@ clear = 1, v->v_protocol = via->v_protocol; /* XXX - should we do this? */ - if (via->v_host != v->v_host && + if (!user_via && + via->v_host != v->v_host && str0cmp(via->v_host, v->v_host)) clear = 1, v->v_host = via->v_host; - if (via->v_port != v->v_port && + if ((!user_via || + /* Replace port in user Via only if we use udp and no rport */ + (v->v_protocol == sip_transport_udp && !v->v_rport && + !orq->orq_stateless)) && + via->v_port != v->v_port && str0cmp(via->v_port, v->v_port)) clear = 1, v->v_port = via->v_port;

1 0