March 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4702 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: anthm Date: Tue Mar 20 19:09:35 2007 New Revision: 4702 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Mar 20 19:09:35 2007 @@ -215,6 +215,7 @@ char *register_contact; char *register_to; char *register_proxy; + char *register_context; char *expires_str; uint32_t freq; time_t expires; @@ -4546,7 +4547,7 @@ const char *displayname = NULL; const char *destination_number = NULL; const char *from_user = NULL, *from_host = NULL; - const char *context; + const char *context = NULL; char network_ip[80]; if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) { @@ -4673,10 +4674,26 @@ switch_channel_set_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards); } - if (profile->context && !strcasecmp(profile->context, "_domain_")) { - context = from_host; - } else { - context = profile->context; + + if (sip->sip_request->rq_url) { + outbound_reg_t *gateway; + char *from_key = switch_core_session_sprintf(session, "sip:%s@%s", + (char *) sip->sip_request->rq_url->url_user, + (char *) sip->sip_request->rq_url->url_host); + + if ((gateway = find_gateway(from_key))) { + context = gateway->register_context; + switch_channel_set_variable(channel, "sip_gateway", gateway->name); + } + } + + + if (!context) { + if (profile->context && !strcasecmp(profile->context, "_domain_")) { + context = from_host; + } else { + context = profile->context; + } } tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), @@ -5137,9 +5154,8 @@ } break; default: - if (gateway_ptr->expires && now >= gateway_ptr->expires) { + if (now >= gateway_ptr->expires) { gateway_ptr->state = REG_STATE_UNREGED; - gateway_ptr->expires = 0; } break; } @@ -5556,8 +5572,10 @@ *password = NULL, *extension = NULL, *proxy = NULL, + *context = "default", *expire_seconds = "3600"; + for (param = switch_xml_child(gateway_tag, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); @@ -5574,6 +5592,8 @@ extension = val; } else if (!strcmp(var, "proxy")) { proxy = val; + } else if (!strcmp(var, "context")) { + context = val; } else if (!strcmp(var, "expire-seconds")) { expire_seconds = val; } @@ -5604,6 +5624,7 @@ } gateway->register_scheme = switch_core_strdup(gateway->pool, scheme); + gateway->register_context = switch_core_strdup(gateway->pool, context); gateway->register_realm = switch_core_strdup(gateway->pool, realm); gateway->register_username = switch_core_strdup(gateway->pool, username); gateway->register_password = switch_core_strdup(gateway->pool, password); @@ -5635,9 +5656,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate gateway '%s'\n", gateway->name); } else if (find_gateway(gateway->register_from)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate uri '%s'\n", gateway->register_from); + } else if (find_gateway(gateway->register_contact)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate contact '%s'\n", gateway->register_from); } else { add_gateway(gateway->name, gateway); add_gateway(gateway->register_from, gateway); + add_gateway(gateway->register_contact, gateway); } }

1 0

[commit] r4701 - in freeswitch/trunk/libs: apr-util apr-util/include/private apr-util/xml/expat apr/include/arch/unix iksemel js libdingaling libdingaling/src libetpan libresample libresample/src pcre
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 18:50:57 2007 New Revision: 4701 Added: freeswitch/trunk/libs/apr-util/xml/expat/config.h.in - copied unchanged from r4675, /freeswitch/trunk/libs/apr-util/xml/expat/config.h.in freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in - copied, changed from r4675, /freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in Removed: freeswitch/trunk/libs/apr-util/include/private/apu_config.h.in freeswitch/trunk/libs/js/config.h.in freeswitch/trunk/libs/libdingaling/src/config.h.in freeswitch/trunk/libs/libetpan/config.h.in freeswitch/trunk/libs/libresample/src/configtemplate.h Modified: freeswitch/trunk/libs/apr-util/configure.in freeswitch/trunk/libs/apr/include/arch/unix/ (props changed) freeswitch/trunk/libs/iksemel/configure.ac freeswitch/trunk/libs/libdingaling/configure.in freeswitch/trunk/libs/libetpan/configure.in freeswitch/trunk/libs/libresample/configure.in freeswitch/trunk/libs/pcre/configure.ac Log: correct which files are autogenerated by autoheader and which are not Modified: freeswitch/trunk/libs/apr-util/configure.in ============================================================================== --- freeswitch/trunk/libs/apr-util/configure.in (original) +++ freeswitch/trunk/libs/apr-util/configure.in Tue Mar 20 18:50:57 2007 @@ -5,7 +5,7 @@ AC_PREREQ(2.50) AC_INIT(export_vars.sh.in) -AC_CONFIG_HEADER(include/private/apu_config.h) +AC_CONFIG_HEADERS(include/private/apu_config.h) AC_CONFIG_AUX_DIR(build) sinclude(build/apu-conf.m4) Copied: freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in (from r4675, /freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in) ============================================================================== --- /freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in (original) +++ freeswitch/trunk/libs/apr/include/arch/unix/apr_private.h.in Tue Mar 20 18:50:57 2007 @@ -194,6 +194,9 @@ /* Define to 1 if you have the `bsd' library (-lbsd). */ #undef HAVE_LIBBSD +/* Define to 1 if you have the `dl' library (-ldl). */ +#undef HAVE_LIBDL + /* Define to 1 if you have the `sendfile' library (-lsendfile). */ #undef HAVE_LIBSENDFILE Modified: freeswitch/trunk/libs/iksemel/configure.ac ============================================================================== --- freeswitch/trunk/libs/iksemel/configure.ac (original) +++ freeswitch/trunk/libs/iksemel/configure.ac Tue Mar 20 18:50:57 2007 @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(build) AC_CONFIG_SRCDIR([configure.ac]) AM_INIT_AUTOMAKE(iksemel,1.2) -AM_CONFIG_HEADER(include/config.h) +AC_CONFIG_HEADERS(include/config.h) AC_CANONICAL_HOST Modified: freeswitch/trunk/libs/libdingaling/configure.in ============================================================================== --- freeswitch/trunk/libs/libdingaling/configure.in (original) +++ freeswitch/trunk/libs/libdingaling/configure.in Tue Mar 20 18:50:57 2007 @@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR(build) AM_INIT_AUTOMAKE(libdingaling,0.1) AC_CONFIG_SRCDIR([src]) -AC_CONFIG_HEADER([src/config.h]) +AC_CONFIG_HEADERS([src/config.h]) #Set default language AC_LANG_C Modified: freeswitch/trunk/libs/libetpan/configure.in ============================================================================== --- freeswitch/trunk/libs/libetpan/configure.in (original) +++ freeswitch/trunk/libs/libetpan/configure.in Tue Mar 20 18:50:57 2007 @@ -44,7 +44,7 @@ CFLAGS="$CFLAGS" AC_ARG_ENABLE(syntax, [ --enable-unstrict-syntax be lazy on syntax checking for protocols (default=no)], , [AC_DEFINE(UNSTRICT_SYNTAX, 1, [Define to be lazy on protocol syntax])]) -AC_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AH_VERBATIM([CONFIG_H_FIRST], [/* Check for Linux's /usr/include/features.h */ Modified: freeswitch/trunk/libs/libresample/configure.in ============================================================================== --- freeswitch/trunk/libs/libresample/configure.in (original) +++ freeswitch/trunk/libs/libresample/configure.in Tue Mar 20 18:50:57 2007 @@ -111,7 +111,7 @@ AC_CHECK_HEADERS(inttypes.h) -AC_CONFIG_HEADER(src/config.h:src/configtemplate.h) +AC_CONFIG_HEADERS(src/config.h:src/configtemplate.h) AC_OUTPUT([Makefile]) echo "" Modified: freeswitch/trunk/libs/pcre/configure.ac ============================================================================== --- freeswitch/trunk/libs/pcre/configure.ac (original) +++ freeswitch/trunk/libs/pcre/configure.ac Tue Mar 20 18:50:57 2007 @@ -16,10 +16,6 @@ AC_PREREQ(2.57) -dnl Arrange to build config.h from config.h.in. -dnl Manual says this macro should come right after AC_INIT. -AC_CONFIG_HEADER(config.h) - dnl Default values for miscellaneous macros POSIX_MALLOC_THRESHOLD=-DPOSIX_MALLOC_THRESHOLD=10 @@ -299,4 +295,4 @@ fi dnl This must be last; it determines what files are written as well as config.h -AC_OUTPUT(Makefile pcre-config:pcre-config.in libpcre.pc:libpcre.pc.in pcrecpparg.h:pcrecpparg.h.in pcre_stringpiece.h:pcre_stringpiece.h.in RunGrepTest:RunGrepTest.in RunTest:RunTest.in,[chmod a+x RunTest RunGrepTest pcre-config]) +AC_OUTPUT(config.h Makefile pcre-config:pcre-config.in libpcre.pc:libpcre.pc.in pcrecpparg.h:pcrecpparg.h.in pcre_stringpiece.h:pcre_stringpiece.h.in RunGrepTest:RunGrepTest.in RunTest:RunTest.in,[chmod a+x RunTest RunGrepTest pcre-config])

1 0

[commit] r4700 - freeswitch/trunk/libs/srtp
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 18:17:53 2007 New Revision: 4700 Modified: freeswitch/trunk/libs/srtp/configure.in Log: fix broken build in srtp Modified: freeswitch/trunk/libs/srtp/configure.in ============================================================================== --- freeswitch/trunk/libs/srtp/configure.in (original) +++ freeswitch/trunk/libs/srtp/configure.in Tue Mar 20 18:17:53 2007 @@ -269,7 +269,7 @@ AC_MSG_RESULT($enable_gdoi) AM_CONDITIONAL([GDOI],[test "SRTP_GDOI" = "1"]) -AC_CONFIG_HEADER(crypto/include/config.h:config_in.h) +AC_CONFIG_HEADERS(crypto/include/config.h:config_in.h) AC_OUTPUT(Makefile crypto/Makefile doc/Makefile test/Makefile srtp-1.42.pc)

1 0

[commit] r4699 - freeswitch/trunk/src
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: anthm Date: Tue Mar 20 17:42:02 2007 New Revision: 4699 Modified: freeswitch/trunk/src/switch_core.c Log: update Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Mar 20 17:42:02 2007 @@ -397,8 +397,9 @@ return SWITCH_STATUS_FALSE; } -static switch_status_t switch_core_media_bug_close(switch_media_bug_t *bp) +static switch_status_t switch_core_media_bug_close(switch_media_bug_t **bug) { + switch_media_bug_t *bp = *bug; if (bp) { if (bp->callback) { bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_CLOSE); @@ -406,6 +407,7 @@ } switch_core_media_bug_destroy(bp); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing BUG from %s\n", switch_channel_get_name(bp->session->channel)); + *bug = NULL; return SWITCH_STATUS_SUCCESS; } @@ -434,10 +436,7 @@ last = bp; } switch_thread_rwlock_unlock(session->bug_rwlock); - - if ((status = switch_core_media_bug_close(bp)) == SWITCH_STATUS_SUCCESS) { - *bug = NULL; - } + status = switch_core_media_bug_close(&bp); } return status; @@ -2225,7 +2224,10 @@ switch_mutex_unlock(bp->read_mutex); dp = bp; bp = last; - switch_core_media_bug_close(dp); + switch_core_media_bug_close(&dp); + if (!bp) { + break; + } continue; } } @@ -2484,10 +2486,10 @@ if (session->bugs) { switch_media_bug_t *bp, *dp, *last = NULL; - switch_bool_t ok = SWITCH_TRUE; switch_thread_rwlock_rdlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { + switch_bool_t ok = SWITCH_TRUE; if (!bp->ready) { continue; } @@ -2518,7 +2520,10 @@ } dp = bp; bp = last; - switch_core_media_bug_close(dp); + switch_core_media_bug_close(&dp); + if (!bp) { + break; + } continue; } last = bp;

1 0

[commit] r4698 - in freeswitch/trunk/libs: apr/include/arch/unix codec/lpc10 curl curl/docs curl/docs/examples curl/docs/libcurl curl/include curl/include/curl curl/lib curl/packages curl/packages/AIX curl/packages/AIX/RPM curl/packages/DOS curl/packages/EPM curl/packages/Linux curl/packages/Linux/RPM curl/packages/Solaris curl/packages/Win32 curl/packages/Win32/cygwin curl/packages/vms curl/src curl/tests curl/tests/data curl/tests/libtest curl/tests/server sofia-sip/libsofia-sip-ua-glib
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 17:33:12 2007 New Revision: 4698 Modified: freeswitch/trunk/libs/apr/include/arch/unix/ (props changed) freeswitch/trunk/libs/codec/lpc10/ (props changed) freeswitch/trunk/libs/curl/ (props changed) freeswitch/trunk/libs/curl/docs/ (props changed) freeswitch/trunk/libs/curl/docs/examples/ (props changed) freeswitch/trunk/libs/curl/docs/libcurl/ (props changed) freeswitch/trunk/libs/curl/include/ (props changed) freeswitch/trunk/libs/curl/include/curl/ (props changed) freeswitch/trunk/libs/curl/lib/ (props changed) freeswitch/trunk/libs/curl/packages/ (props changed) freeswitch/trunk/libs/curl/packages/AIX/ (props changed) freeswitch/trunk/libs/curl/packages/AIX/RPM/ (props changed) freeswitch/trunk/libs/curl/packages/DOS/ (props changed) freeswitch/trunk/libs/curl/packages/EPM/ (props changed) freeswitch/trunk/libs/curl/packages/Linux/ (props changed) freeswitch/trunk/libs/curl/packages/Linux/RPM/ (props changed) freeswitch/trunk/libs/curl/packages/Solaris/ (props changed) freeswitch/trunk/libs/curl/packages/Win32/ (props changed) freeswitch/trunk/libs/curl/packages/Win32/cygwin/ (props changed) freeswitch/trunk/libs/curl/packages/vms/ (props changed) freeswitch/trunk/libs/curl/src/ (props changed) freeswitch/trunk/libs/curl/tests/ (props changed) freeswitch/trunk/libs/curl/tests/data/ (props changed) freeswitch/trunk/libs/curl/tests/libtest/ (props changed) freeswitch/trunk/libs/curl/tests/server/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/ (props changed) freeswitch/trunk/libs/sofia-sip/win32/ (props changed) Log: svn:ignore properties

1 0

[commit] r4697 - in freeswitch/trunk/libs: apr-util apr-util/xml/expat iksemel/include libsndfile/src sofia-sip srtp srtp/doc
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 17:26:28 2007 New Revision: 4697 Removed: freeswitch/trunk/libs/apr-util/configure freeswitch/trunk/libs/apr-util/xml/expat/config.h.in freeswitch/trunk/libs/iksemel/include/config.h.in freeswitch/trunk/libs/libsndfile/src/config.h.in freeswitch/trunk/libs/sofia-sip/config.h.in freeswitch/trunk/libs/srtp/config_in.h freeswitch/trunk/libs/srtp/doc/Makefile Log: remove generated files from tree

1 0

[commit] r4696 - freeswitch/trunk/src/include
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 17:24:48 2007 New Revision: 4696 Removed: freeswitch/trunk/src/include/switch_private.h.in Log: remove generated file from tree

1 0

[commit] r4695 - freeswitch/trunk
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 17:23:39 2007 New Revision: 4695 Modified: freeswitch/trunk/Makefile.am Log: fix debian build Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Mar 20 17:23:39 2007 @@ -97,7 +97,7 @@ freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) -freeswitch_LDADD = ${MOD_LINK} +freeswitch_LDADD = ${MOD_LINK} libs/apr/libapr-1.la $(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool

1 0

[commit] r4694 - in freeswitch/trunk/src: . include
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: anthm Date: Tue Mar 20 17:20:14 2007 New Revision: 4694 Modified: freeswitch/trunk/src/include/switch_private.h.in freeswitch/trunk/src/switch_core.c Log: update Modified: freeswitch/trunk/src/include/switch_private.h.in ============================================================================== --- freeswitch/trunk/src/include/switch_private.h.in (original) +++ freeswitch/trunk/src/include/switch_private.h.in Tue Mar 20 17:20:14 2007 @@ -7,6 +7,9 @@ */ #undef HAVE_DIRENT_H +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + /* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME @@ -148,19 +151,19 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE -/* The size of a `char', as computed by sizeof. */ +/* The size of `char', as computed by sizeof. */ #undef SIZEOF_CHAR -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `long long', as computed by sizeof. */ +/* The size of `long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG -/* The size of a `short', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ #undef SIZEOF_SHORT /* The size of size_t */ @@ -169,7 +172,7 @@ /* The size of ssize_t */ #undef SIZEOF_SSIZE_T -/* The size of a `void*', as computed by sizeof. */ +/* The size of `void*', as computed by sizeof. */ #undef SIZEOF_VOIDP /* Define to 1 if you have the ANSI C header files. */ @@ -202,7 +205,7 @@ /* Define to rpl_malloc if the replacement function should be used. */ #undef malloc -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t /* Define to `int' if <sys/types.h> does not define. */ Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Mar 20 17:20:14 2007 @@ -2516,7 +2516,6 @@ } else { session->bugs = bp->next; } - switch_mutex_unlock(bp->read_mutex); dp = bp; bp = last; switch_core_media_bug_close(dp);

1 0

[commit] r4693 - freeswitch/trunk/src/include
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: anthm Date: Tue Mar 20 17:03:03 2007 New Revision: 4693 Modified: freeswitch/trunk/src/include/switch_types.h Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Mar 20 17:03:03 2007 @@ -975,7 +975,7 @@ typedef struct switch_management_interface switch_management_interface_t; typedef struct switch_core_port_allocator switch_core_port_allocator_t; typedef struct switch_media_bug switch_media_bug_t; -typedef void (*switch_media_bug_callback_t)(switch_media_bug_t *, void *, switch_abc_type_t); +typedef switch_bool_t (*switch_media_bug_callback_t)(switch_media_bug_t *, void *, switch_abc_type_t); typedef void (*switch_application_function_t)(switch_core_session_t *, char *); typedef void (*switch_event_callback_t)(switch_event_t *); typedef switch_caller_extension_t *(*switch_dialplan_hunt_function_t)(switch_core_session_t *, void *);

1 0