May 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

14 May '08

Author: mikej Date: Wed May 14 14:20:48 2008 New Revision: 8402 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h Log: Tue May 13 16:47:50 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_stack.h: removed unused typedef ull Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed May 14 14:20:48 2008 @@ -1 +1 @@ -Wed May 14 14:19:52 EDT 2008 +Wed May 14 14:20:32 EDT 2008 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 Wed May 14 14:20:48 2008 @@ -432,8 +432,6 @@ /* ---------------------------------------------------------------------- */ -typedef unsigned longlong ull; - #define SET_STATUS(_status, _phrase) status = _status, phrase = _phrase #define SET_STATUS2(_status, _phrase) status = _status, phrase = _phrase

1 0

[commit] r8401 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sresolv
by Freeswitch SVN 14 May '08

14 May '08

Author: mikej Date: Wed May 14 14:20:11 2008 New Revision: 8401 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Log: Tue May 13 16:45:09 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * sres.c: allow dns redirection with _sres_default_port Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed May 14 14:20:11 2008 @@ -1 +1 @@ -Wed May 14 14:17:15 EDT 2008 +Wed May 14 14:19:52 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Wed May 14 14:20:11 2008 @@ -2190,6 +2190,8 @@ return c; } +uint16_t _sres_default_port = 53; + /** Parse config file. * * @return Number of search domains, if successful. @@ -2212,7 +2214,7 @@ c->c_opt.check_names = 1; c->c_opt.timeout = SRES_RETRY_INTERVAL; c->c_opt.attempts = SRES_MAX_RETRY_COUNT; - c->c_port = 53; + c->c_port = _sres_default_port; if (f != NULL) { for (line = 1; fgets(buf, sizeof(buf), f); line++) {

1 0

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

14 May '08

Author: mikej Date: Wed May 14 14:19:34 2008 New Revision: 8400 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am freeswitch/trunk/libs/sofia-sip/tests/Makefile.am freeswitch/trunk/libs/sofia-sip/tests/suite_for_nua.c Log: Update sofia tests: Tue May 6 13:53:21 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * tests: added 2nd check-based test suite for nua Wed May 7 08:26:48 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * suite2_for_nua.c: more test cases Wed May 7 13:40:05 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * suite2_for_nua.c, s2tester.[hc]: made it easier to refactor test cases Wed May 7 14:34:54 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * test_nua: moved to tests subdirectory Wed May 7 14:37:06 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * check_nua: moved to libsofia-sip-ua/nua Mon May 12 19:00:26 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * check_nua: updated Tue May 13 16:45:21 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * test_s2.h, test_s2.c: added internal DNS server Tue May 13 16:46:08 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * check_register.c: added test case register_1_3_3_1 using tcp pingpong Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed May 14 14:19:34 2008 @@ -1 +1 @@ -Wed May 14 14:16:11 EDT 2008 +Wed May 14 14:17:15 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am Wed May 14 14:19:34 2008 @@ -13,13 +13,13 @@ noinst_LTLIBRARIES = libnua.la -check_LTLIBRARIES = libtestnua.la libtestproxy.la libtestnat.la +check_PROGRAMS = +TESTS = -check_PROGRAMS = test_nua - -TESTS = test_nua - -CLEANFILES = tmp_sippasswd.?????? +if HAVE_CHECK +check_PROGRAMS += check_nua +TESTS += check_nua +endif # ---------------------------------------------------------------------- # Rules for building the targets @@ -43,6 +43,29 @@ COVERAGE_INPUT = $(libnua_la_SOURCES) $(include_sofia_HEADERS) +check_nua_SOURCES = check_nua.c check_nua.h \ + check_session.c check_register.c \ + test_s2.h test_s2.c + +check_nua_LDADD = $(nua_libs) @CHECK_LIBS@ + +nua_libs = libnua.la \ + ../iptsec/libiptsec.la \ + ../ipt/libipt.la \ + ../nea/libnea.la \ + ../nta/libnta.la \ + ../sresolv/libsresolv.la \ + ../tport/libtport.la \ + ../stun/libstun.la \ + ../soa/libsoa.la \ + ../sdp/libsdp.la \ + ../sip/libsip.la \ + ../http/libhttp.la \ + ../msg/libmsg.la \ + ../url/liburl.la \ + ../bnf/libbnf.la \ + ../su/libsu.la + test_nua_LDFLAGS = -static libtestnua_la_SOURCES = test_nua.h test_ops.c \ @@ -80,6 +103,7 @@ ../bnf/libbnf.la \ ../su/libsu.la +^ ^ ^ ^ ^ ^ ^ # ---------------------------------------------------------------------- # Install and distribution rules Modified: freeswitch/trunk/libs/sofia-sip/tests/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Wed May 14 14:19:34 2008 @@ -1,35 +1,63 @@ # -# Tests using check +# Makefile.am for Sofia SIP tests # +# Copyright (C) 2007,2008 Nokia Corporation +# Contact: Pekka Pessi <pekka.pessi(a)nokia.com> +# Licensed under LGPL. See file COPYING. + +TESTS = test_nua +check_PROGRAMS = test_nua EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c -TESTS = -tests_PROGRAMS = -testsdir := ${libdir}/tests/libsofia-sip-ua-tests +test_nua_SOURCES = test_nua.c -include $(top_srcdir)/rules/sofia.am +test_nua_LDADD = $(check_LIBRARIES) \ + ${sofiabuilddir}/libsofia-sip-ua.la -INCLUDES = ${INTERNAL_INCLUDES} +check_LIBRARIES = libtestnua.a libtestproxy.a libtestnat.a -AM_CFLAGS += @CHECK_CFLAGS@ +libtestnua_a_SOURCES = test_nua.h test_ops.c \ + test_init.c \ + test_nua_api.c test_nua_params.c \ + test_register.c test_basic_call.c \ + test_offer_answer.c \ + test_call_reject.c test_cancel_bye.c \ + test_call_hold.c test_session_timer.c \ + test_refer.c test_100rel.c \ + test_simple.c test_sip_events.c \ + test_extension.c -if HAVE_CHECK +libtestproxy_a_SOURCES = test_proxy.h test_proxy.c + +libtestnat_a_SOURCES = test_nat.h test_nat.c test_nat_tags.c +# +# Install in special test package +# +testsdir = ${libdir}/tests/libsofia-sip-ua-tests +tests_PROGRAMS = + +if HAVE_CHECK TESTS += check_sofia tests_PROGRAMS += check_sofia +endif + +check_sofia_CFLAGS = @CHECK_CFLAGS@ + check_sofia_SOURCES = check_sofia.c check_sofia.h \ suite_for_nua.c -CHECKLIBS = ${sofiabuilddir}/nua/libtestnua.la \ - ${sofiabuilddir}/nua/libtestproxy.la \ - ${sofiabuilddir}/nua/libtestnat.la - -$(CHECKLIBS): - cd ${sofiabuilddir}/nua && make checklib - -check_sofia_LDADD = \ - $(CHECKLIBS) ${sofiabuilddir}/libsofia-sip-ua.la \ - @CHECK_LIBS@ -endif +check_sofia_LDADD = $(check_LIBRARIES) \ + ${sofiabuilddir}/libsofia-sip-ua.la \ + @CHECK_LIBS@ + +CLEANFILES = tmp_sippasswd.?????? + +# ---------------------------------------------------------------------- +# Sofia specific rules + +include $(top_srcdir)/rules/sofia.am + +INCLUDES = ${INTERNAL_INCLUDES} Modified: freeswitch/trunk/libs/sofia-sip/tests/suite_for_nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/suite_for_nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/suite_for_nua.c Wed May 14 14:19:34 2008 @@ -22,7 +22,7 @@ * */ -/**@CFILE check_sofia.c +/**@CFILE suite_for_nua.c * * @brief Check-driven tester for Sofia SIP User Agent library *

1 0

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

14 May '08

Author: mikej Date: Wed May 14 14:16:19 2008 New Revision: 8399 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Log: Tue May 13 15:41:24 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nta.c: fixed outgoing retry timer Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed May 14 14:16:19 2008 @@ -1 +1 @@ -Tue May 13 15:08:49 EDT 2008 +Wed May 14 14:16:11 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 Wed May 14 14:16:19 2008 @@ -8008,7 +8008,7 @@ outgoing_queue_init(sa->sa_out.free = rq, 0); while ((orq = sa->sa_out.re_list)) { - if ((int32_t)(orq->orq_retry) - now > 0) + if ((int32_t)(orq->orq_retry - now) > 0) break; if (retransmitted >= timer_max_retransmit) break;

1 0

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

14 May '08

Author: mikej Date: Wed May 14 12:54:54 2008 New Revision: 8398 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c Log: type stupidity Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/iax.c Wed May 14 12:54:54 2008 @@ -2984,7 +2984,12 @@ static struct iax_event *iax_net_read(void) { unsigned char buf[65536]; - int res, sinlen; + int res; +#ifdef WIN32 + socklen_t sinlen; +#else + unsigned int sinlen; +#endif struct sockaddr_in sin; sinlen = sizeof(sin);

1 0

[commit] r8397 - in freeswitch/trunk/src/mod: endpoints/mod_sofia formats/mod_local_stream formats/mod_sndfile
by Freeswitch SVN 14 May '08

14 May '08

Author: anthm Date: Wed May 14 12:01:13 2008 New Revision: 8397 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Log: silence some less important debug info 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 Wed May 14 12:01:13 2008 @@ -806,7 +806,7 @@ } if (!(nh = nua_handle_by_call_id(profile->nua, call_id))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find handle for %s\n", call_id); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Cannot find handle for %s\n", call_id); return 0; } Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Wed May 14 12:01:13 2008 @@ -184,7 +184,7 @@ return NULL; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing [%s] rate: %dhz\n", fname, source->rate); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing [%s] rate: %dhz\n", fname, source->rate); while (RUNNING) { switch_core_timer_next(&timer); Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Wed May 14 12:01:13 2008 @@ -167,7 +167,7 @@ } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opening File [%s] rate %dhz\n", path, context->sfinfo.samplerate); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opening File [%s] rate %dhz\n", path, context->sfinfo.samplerate); handle->samples = (unsigned int) context->sfinfo.frames; handle->samplerate = context->sfinfo.samplerate; handle->channels = (uint8_t) context->sfinfo.channels;

1 0

[commit] r8396 - in freeswitch/trunk: conf/autoload_configs src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 May '08

14 May '08

Author: anthm Date: Wed May 14 10:22:04 2008 New Revision: 8396 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml freeswitch/trunk/conf/autoload_configs/modules.conf.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: musta took a wrong toin at albakoyke Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Wed May 14 10:22:04 2008 @@ -83,6 +83,7 @@ <param name="pin-sound" value="conference/conf-pin.wav"/>  <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/> + <param name="comfort-noise-level" value="1400"/>    Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Wed May 14 10:22:04 2008 @@ -11,7 +11,7 @@ <load module="mod_enum"/>  -  + <load module="mod_xml_rpc"/>   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 May 14 10:22:04 2008 @@ -2726,6 +2726,8 @@ tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip); tech_pvt->remote_port = network_port; + channel = tech_pvt->channel = switch_core_session_get_channel(session); + if (sip->sip_contact && sip->sip_contact->m_url) { char tmp[35] = ""; tech_pvt->record_route = switch_core_session_sprintf(session, "sip:%s@%s:%d", @@ -2741,7 +2743,6 @@ tech_pvt->key = switch_core_session_strdup(session, key); } - channel = tech_pvt->channel = switch_core_session_get_channel(session); if (is_auth) { switch_channel_set_variable(channel, "sip_authorized", "true");

1 0

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

14 May '08

Author: anthm Date: Wed May 14 10:13:40 2008 New Revision: 8395 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: clean up nat stuff more 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 May 14 10:13:40 2008 @@ -411,7 +411,8 @@ (val = switch_channel_get_variable(channel, "sip-force-contact")) || ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { sticky = tech_pvt->record_route; - session_timeout = 20; + session_timeout = SOFIA_NAT_SESSION_TIMEOUT; + switch_channel_set_variable(channel, "sip_nat_detected", "true"); } @@ -1107,6 +1108,7 @@ (val = switch_channel_get_variable(channel, "sip-force-contact")) || ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { sticky = tech_pvt->record_route; + switch_channel_set_variable(channel, "sip_nat_detected", "true"); } nua_respond(tech_pvt->nh, 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 Wed May 14 10:13:40 2008 @@ -45,7 +45,7 @@ #ifdef SWITCH_HAVE_ODBC #include <switch_odbc.h> #endif - +#define SOFIA_NAT_SESSION_TIMEOUT 20 #define SOFIA_MAX_ACL 100 #define MODNAME "mod_sofia" 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 May 14 10:13:40 2008 @@ -2727,10 +2727,14 @@ tech_pvt->remote_port = network_port; if (sip->sip_contact && sip->sip_contact->m_url) { + char tmp[35] = ""; tech_pvt->record_route = switch_core_session_sprintf(session, "sip:%s@%s:%d", sip->sip_contact->m_url->url_user, tech_pvt->remote_ip, tech_pvt->remote_port); + switch_channel_set_variable(channel, "sip_received_ip", tech_pvt->remote_ip); + snprintf(tmp, sizeof(tmp), "tech_pvt->remote_port"); + switch_channel_set_variable(channel, "sip_received_port", tmp); } if (*key != '\0') { @@ -3168,6 +3172,7 @@ if (ok) { switch_set_flag(tech_pvt, TFLAG_NAT); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting NAT mode based on acl %s\n", last_acl); + switch_channel_set_variable(channel, "sip_nat_detected", "true"); } } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed May 14 10:13:40 2008 @@ -1007,7 +1007,8 @@ ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { tech_pvt->record_route = switch_core_session_strdup(tech_pvt->session, url_str); sticky = tech_pvt->record_route; - session_timeout = 20; + session_timeout = SOFIA_NAT_SESSION_TIMEOUT; + switch_channel_set_variable(channel, "sip_nat_detected", "true"); } @@ -1532,6 +1533,16 @@ if (tech_pvt->cng_pt) { flags |= SWITCH_RTP_FLAG_AUTO_CNG; } + + if (tech_pvt->rtp_session && switch_test_flag(tech_pvt, TFLAG_REINVITE)) { + const char *ip = switch_channel_get_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE); + const char *port = switch_channel_get_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_PORT_VARIABLE); + + if (ip && port && !strcmp(ip, tech_pvt->adv_sdp_audio_ip) && atoi(port) == tech_pvt->remote_sdp_audio_port) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio params are unchanged.\n"); + goto video; + } + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "AUDIO RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n", switch_channel_get_name(tech_pvt->channel), @@ -1809,7 +1820,7 @@ } if (((m = sdp->sdp_media)) && m->m_mode == sdp_sendonly) { - sendonly = 1; + sendonly = 2; /* global sendonly always wins */ } for (attr = sdp->sdp_attributes; attr; attr = attr->a_next) { @@ -1819,7 +1830,7 @@ if ((!strcasecmp(attr->a_name, "sendonly")) || (!strcasecmp(attr->a_name, "inactive"))) { sendonly = 1; - } else if (!strcasecmp(attr->a_name, "sendrecv")) { + } else if (sendonly < 2 && !strcasecmp(attr->a_name, "sendrecv")) { sendonly = 0; } else if (!strcasecmp(attr->a_name, "ptime")) { dptime = atoi(attr->a_value); @@ -1840,7 +1851,7 @@ if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) { stream = tech_pvt->profile->hold_music; } - + if (stream && strcasecmp(stream, "silence")) { if (!strcasecmp(stream, "indicate_hold")) { switch_channel_set_flag(tech_pvt->channel, CF_SUSPEND);

1 0

[commit] r8392 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 13 May '08

13 May '08

Author: anthm Date: Tue May 13 19:23:41 2008 New Revision: 8392 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: fix many nat woes, see changes to default config for details Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Tue May 13 19:23:41 2008 @@ -35,7 +35,6 @@  <param name="sip-ip" value="$${local_ip_v4}"/> <param name="hold-music" value="$${hold_music}"/> - <param name="apply-register-acl" value="rfc1918"/> <param name="apply-nat-acl" value="rfc1918"/>

1 0

[commit] r8391 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 13 May '08

13 May '08

Author: anthm Date: Tue May 13 19:22:21 2008 New Revision: 8391 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix many nat woes, see changes to default config for details Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Tue May 13 19:22:21 2008 @@ -35,10 +35,12 @@  <param name="sip-ip" value="$${local_ip_v4}"/> <param name="hold-music" value="$${hold_music}"/> + <param name="apply-register-acl" value="rfc1918"/> + <param name="apply-nat-acl" value="rfc1918"/>   -  -  +  +   <param name="record-template" value="$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>  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 Tue May 13 19:22:21 2008 @@ -339,6 +339,7 @@ const char *val; const char *b_sdp = NULL; int is_proxy = 0; + char *sticky = NULL; if (switch_test_flag(tech_pvt, TFLAG_ANS) || switch_channel_test_flag(channel, CF_OUTBOUND)) { return SWITCH_STATUS_SUCCESS; @@ -405,9 +406,19 @@ session_timeout = v_session_timeout; } } + + if (switch_test_flag(tech_pvt, TFLAG_NAT) || + (val = switch_channel_get_variable(channel, "sip-force-contact")) || + ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { + sticky = tech_pvt->record_route; + session_timeout = 20; + } + + nua_respond(tech_pvt->nh, SIP_200_OK, NUTAG_AUTOANSWER(0), + TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), NUTAG_SESSION_TIMER(session_timeout), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), @@ -1039,6 +1050,9 @@ break; case SWITCH_MESSAGE_INDICATE_PROGRESS: { + char *sticky = NULL; + const char *val = NULL; + if (!switch_test_flag(tech_pvt, TFLAG_ANS) && !switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); @@ -1087,9 +1101,18 @@ } } switch_channel_mark_pre_answered(channel); + + + if (switch_test_flag(tech_pvt, TFLAG_NAT) || + (val = switch_channel_get_variable(channel, "sip-force-contact")) || + ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { + sticky = tech_pvt->record_route; + } + nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, NUTAG_AUTOANSWER(0), + TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), @@ -1865,6 +1888,8 @@ switch_ivr_transfer_variable(session, nsession, "sip_auto_answer"); switch_ivr_transfer_variable(session, nsession, SOFIA_SIP_HEADER_PREFIX_T); switch_ivr_transfer_variable(session, nsession, "sip_video_fmtp"); + switch_ivr_transfer_variable(session, nsession, "sip-force-contact"); + switch_ivr_transfer_variable(session, nsession, "sip_sticky_contact"); if (switch_core_session_compare(session, nsession)) { /* It's another sofia channel! so lets cache what they use as a pt for telephone event so 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 Tue May 13 19:22:21 2008 @@ -172,7 +172,7 @@ TFLAG_REFER = (1 << 17), TFLAG_NOHUP = (1 << 18), TFLAG_XFER = (1 << 19), - TFLAG_RESERVED = (1 << 20), + TFLAG_NAT = (1 << 20), TFLAG_BUGGY_2833 = (1 << 21), TFLAG_SIP_HOLD = (1 << 22), TFLAG_INB_NOMEDIA = (1 << 23), @@ -330,6 +330,8 @@ uint32_t acl_count; char *reg_acl[SOFIA_MAX_ACL]; uint32_t reg_acl_count; + char *nat_acl[SOFIA_MAX_ACL]; + uint32_t nat_acl_count; }; @@ -394,6 +396,7 @@ char *gateway_name; char *local_crypto_key; char *remote_crypto_key; + char *record_route; int crypto_tag; unsigned char local_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; unsigned char remote_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; @@ -434,6 +437,8 @@ uint32_t video_count; sofia_dtmf_t dtmf_type; int q850_cause; + char *remote_ip; + int remote_port; }; struct callback_t { @@ -444,7 +449,8 @@ typedef enum { REG_REGISTER, - REG_INVITE + REG_AUTO_REGISTER, + REG_INVITE, } sofia_regtype_t; typedef enum { 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 May 13 19:22:21 2008 @@ -1299,6 +1299,12 @@ profile->username = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "context")) { profile->context = switch_core_strdup(profile->pool, val); + } else if (!strcasecmp(var, "apply-nat-acl")) { + if (profile->acl_count < SOFIA_MAX_ACL) { + profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); + } } else if (!strcasecmp(var, "apply-inbound-acl")) { if (profile->acl_count < SOFIA_MAX_ACL) { profile->acl[profile->acl_count++] = switch_core_strdup(profile->pool, val); @@ -1529,6 +1535,9 @@ if (gateway) { if (status == 200 || status == 404) { //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ping success %s\n", gateway->name); + if (gateway->state == REG_STATE_FAILED) { + gateway->state = REG_STATE_UNREGED; + } gateway->status = SOFIA_GATEWAY_UP; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ping failed %s\n", gateway->name); @@ -2637,7 +2646,7 @@ uint32_t sess_max = switch_core_session_limit(0); int is_auth = 0, calling_myself = 0; su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); - + int network_port = 0; if (sess_count >= sess_max || !(profile->pflags & PFLAG_RUNNING)) { nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); @@ -2652,6 +2661,7 @@ get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); + network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port); if (profile->acl_count) { uint32_t x = 0; @@ -2679,8 +2689,7 @@ if ((profile->pflags & PFLAG_AUTH_CALLS) || (!(profile->pflags & PFLAG_BLIND_AUTH) && (sip->sip_proxy_authorization || sip->sip_authorization))) { - int rport = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port); - if (!strcmp(network_ip, profile->sipip) && rport == profile->sip_port) { + if (!strcmp(network_ip, profile->sipip) && network_port == profile->sip_port) { calling_myself++; } else { if (sofia_reg_handle_register(nua, profile, nh, sip, REG_INVITE, key, sizeof(key), &v_event)) { @@ -2714,6 +2723,16 @@ } switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip); + tech_pvt->remote_port = network_port; + + if (sip->sip_contact && sip->sip_contact->m_url) { + tech_pvt->record_route = switch_core_session_sprintf(session, "sip:%s@%s:%d", + sip->sip_contact->m_url->url_user, + tech_pvt->remote_ip, + tech_pvt->remote_port); + } + if (*key != '\0') { tech_pvt->key = switch_core_session_strdup(session, key); } @@ -3127,6 +3146,34 @@ switch_assert(sql); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } + + + if (profile->nat_acl_count) { + uint32_t x = 0; + int ok = 1; + char *last_acl = NULL; + const char *contact_host = NULL; + + if (sip && sip->sip_contact && sip->sip_contact->m_url && sip->sip_contact->m_url->url_host) { + contact_host = sip->sip_contact->m_url->url_host; + } + if (contact_host) { + for (x = 0 ; x < profile->nat_acl_count; x++) { + last_acl = profile->nat_acl[x]; + if (!(ok = switch_check_network_list_ip(contact_host, last_acl))) { + break; + } + } + + if (ok) { + switch_set_flag(tech_pvt, TFLAG_NAT); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting NAT mode based on acl %s\n", last_acl); + } + } + } + + + return; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue May 13 19:22:21 2008 @@ -868,6 +868,7 @@ uint32_t session_timeout = 0; const char *val; const char *rep; + char *sticky; rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); @@ -1001,6 +1002,17 @@ TAG_END()); + if (switch_test_flag(tech_pvt, TFLAG_NAT) || + (val = switch_channel_get_variable(channel, "sip-force-contact")) || + ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { + tech_pvt->record_route = switch_core_session_strdup(tech_pvt->session, url_str); + sticky = tech_pvt->record_route; + session_timeout = 20; + } + + + + /* TODO: We should use the new tags for making an rpid and add profile options to turn this on/off */ if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME)) { priv = "name"; @@ -1091,6 +1103,7 @@ sofia_glue_tech_patch_sdp(tech_pvt); } + nua_invite(tech_pvt->nh, NUTAG_AUTOANSWER(0), NUTAG_SESSION_TIMER(session_timeout), Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Tue May 13 19:22:21 2008 @@ -495,7 +495,8 @@ authorization = sip->sip_proxy_authorization; } - if (regtype == REG_REGISTER && (profile->pflags & PFLAG_BLIND_REG)) { + if (regtype == REG_AUTO_REGISTER || (regtype == REG_REGISTER && (profile->pflags & PFLAG_BLIND_REG))) { + regtype = REG_REGISTER; goto reg; } @@ -716,19 +717,29 @@ switch_event_t *v_event = NULL; char network_ip[80]; su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); - + sofia_regtype_t type = REG_REGISTER; + if (profile->reg_acl_count) { uint32_t x = 0; + int ok = 1; + char *last_acl = NULL; get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); - + for (x = 0 ; x < profile->reg_acl_count; x++) { - if (!switch_check_network_list_ip(network_ip, profile->reg_acl[x])) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", network_ip, profile->reg_acl[x]); - nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); - goto end; + last_acl = profile->reg_acl[x]; + if (!(ok = switch_check_network_list_ip(network_ip, last_acl))) { + break; } } + + if (ok && !(profile->pflags & PFLAG_BLIND_REG)) { + type = REG_AUTO_REGISTER; + } else if (!ok) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", network_ip, profile->reg_acl[x]); + nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); + goto end; + } } @@ -749,7 +760,7 @@ goto end; } - sofia_reg_handle_register(nua, profile, nh, sip, REG_REGISTER, key, sizeof(key), &v_event); + sofia_reg_handle_register(nua, profile, nh, sip, type, key, sizeof(key), &v_event); if (v_event) { switch_event_fire(&v_event);

1 0