- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13401 - freeswitch/trunk
by FreeSWITCH SVN 20 May '09

20 May '09

Author: mikej Date: Wed May 20 09:21:54 2009 New Revision: 13401 Log: attempt to remove regression caused by r13362 Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Wed May 20 09:21:54 2009 @@ -337,11 +337,11 @@ AC_CHECK_LIB(rt, clock_nanosleep, [AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define if you have clock_nanosleep()])]) AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) -AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,[ +AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[ #include <sys/types.h> #include <time.h>]) -AC_CHECK_MEMBERS([struct tm.tm_zone, struct tm.__tm_zone],,,[ +AC_CHECK_MEMBERS([struct tm.tm_zone],,,[ #include <sys/types.h> #include <time.h>])

1 0

[commit] r13400 - freeswitch/trunk/src
by FreeSWITCH SVN 20 May '09

20 May '09

Author: anthm Date: Wed May 20 08:02:41 2009 New Revision: 13400 Log: treat app::arg syntax in execute_on_answer as a broadcast request Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed May 20 08:02:41 2009 @@ -1893,12 +1893,17 @@ char *arg = NULL; app = switch_core_session_strdup(channel->session, var); - - if ((arg = strchr(app, ' '))) { - *arg++ = '\0'; + + if ((arg = strchr(app, ':')) && *(arg+1) == ':') { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s execute on answer: %s (BROADCAST)\n", channel->name, app); + switch_ivr_broadcast(switch_core_session_get_uuid(channel->session), app, SMF_NONE); + } else { + if ((arg = strchr(app, ' '))) { + *arg++ = '\0'; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s execute on answer: %s(%s)\n", channel->name, app, switch_str_nil(arg)); + switch_core_session_execute_application(channel->session, app, arg); } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s execute on answer: %s(%s)", channel->name, app, switch_str_nil(arg)); - switch_core_session_execute_application(channel->session, app, arg); } switch_channel_audio_sync(channel);

1 0

[commit] r13399 - freeswitch/trunk/src/include
by FreeSWITCH SVN 20 May '09

20 May '09

Author: mikej Date: Tue May 19 19:50:09 2009 New Revision: 13399 Log: OCD Modified: freeswitch/trunk/src/include/switch_rtp.h Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Tue May 19 19:50:09 2009 @@ -45,7 +45,8 @@ #define SWITCH_RTP_KEY_LEN 30 #define SWITCH_RTP_CRYPTO_KEY_32 "AES_CM_128_HMAC_SHA1_32" #define SWITCH_RTP_CRYPTO_KEY_80 "AES_CM_128_HMAC_SHA1_80" - typedef enum { + +typedef enum { SWITCH_RTP_CRYPTO_SEND, SWITCH_RTP_CRYPTO_RECV, SWITCH_RTP_CRYPTO_MAX

1 0

[commit] r13398 - freeswitch/trunk/src
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 16:25:52 2009 New Revision: 13398 Log: core: fix segfault on out of memory situation. (FSCORE-366) Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue May 19 16:25:52 2009 @@ -2316,8 +2316,9 @@ static const char *ent[] = { "lt;", "<", "gt;", ">", "quot;", """, "apos;", "'", "amp;", "&", NULL }; - switch_xml_root_t root = (switch_xml_root_t) memset(malloc(sizeof(struct switch_xml_root)), - '\0', sizeof(struct switch_xml_root)); + switch_xml_root_t root = (switch_xml_root_t) malloc(sizeof(struct switch_xml_root)); + if (!root) return NULL; + memset(root, '\0', sizeof(struct switch_xml_root)); root->xml.name = (char *) name; root->cur = &root->xml; strcpy(root->err, root->xml.txt = (char *)""); @@ -2372,9 +2373,9 @@ { switch_xml_t child; - if (!xml) - return NULL; - child = (switch_xml_t) memset(malloc(sizeof(struct switch_xml)), '\0', sizeof(struct switch_xml)); + if (!xml) return NULL; + if (!(child = (switch_xml_t) malloc(sizeof(struct switch_xml)))) return NULL; + memset(child, '\0', sizeof(struct switch_xml)); child->name = (char *) name; child->attr = SWITCH_XML_NIL; child->off = off;

1 0

[commit] r13397 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 16:16:03 2009 New Revision: 13397 Log: mod_sofia: add contact-user profile param to override default contact username for a profile (MODSOFIA-8) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 19 16:16:03 2009 @@ -56,6 +56,7 @@ #define MAX_CODEC_CHECK_FRAMES 50 #define MAX_MISMATCH_FRAMES 3 #define MODNAME "mod_sofia" +#define SOFIA_DEFAULT_CONTACT_USER MODNAME static const switch_state_handler_table_t noop_state_handler = { 0 }; struct sofia_gateway; typedef struct sofia_gateway sofia_gateway_t; @@ -483,7 +484,8 @@ uint32_t timer_t1; uint32_t timer_t1x64; uint32_t timer_t2; - uint32_t timer_t4; + uint32_t timer_t4; + char *contact_user; }; struct private_object { 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 19 16:16:03 2009 @@ -2017,6 +2017,7 @@ sofia_set_pflag(profile, PFLAG_AUTOFIX_TIMING); sofia_set_pflag(profile, PFLAG_MESSAGE_QUERY_ON_REGISTER); sofia_set_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); + profile->contact_user = SOFIA_DEFAULT_CONTACT_USER; for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -2312,6 +2313,8 @@ } else { sofia_clear_pflag(profile, PFLAG_AUTOFIX_TIMING); } + } else if (!strcasecmp(var, "contact-user")) { + profile->contact_user = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "nat-options-ping")) { if (switch_true(val)) { sofia_set_pflag(profile, PFLAG_NAT_OPTIONS_PING); @@ -2534,7 +2537,8 @@ if (profile->extsipip) { char *ipv6 = strchr(profile->extsipip, ':'); profile->url = switch_core_sprintf(profile->pool, - "sip:mod_sofia@%s%s%s:%d", + "sip:%s@%s%s%s:%d", + profile->contact_user, ipv6 ? "[" : "", profile->extsipip, ipv6 ? "]" : "", @@ -2543,7 +2547,8 @@ } else { char *ipv6 = strchr(profile->sipip, ':'); profile->url = switch_core_sprintf(profile->pool, - "sip:mod_sofia@%s%s%s:%d", + "sip:%s@%s%s%s:%d", + profile->contact_user, ipv6 ? "[" : "", profile->sipip, ipv6 ? "]" : "", @@ -2570,13 +2575,15 @@ char *ipv6 = strchr(profile->extsipip, ':'); profile->tls_url = switch_core_sprintf(profile->pool, - "sip:mod_sofia@%s%s%s:%d", + "sip:%s@%s%s%s:%d", + profile->contact_user, ipv6 ? "[" : "", profile->extsipip, ipv6 ? "]" : "", profile->tls_sip_port); profile->tls_bindurl = switch_core_sprintf(profile->pool, - "sips:mod_sofia@%s%s%s:%d;maddr=%s", + "sips:%s@%s%s%s:%d;maddr=%s", + profile->contact_user, ipv6 ? "[" : "", profile->extsipip, ipv6 ? "]" : "", @@ -2586,14 +2593,16 @@ char *ipv6 = strchr(profile->sipip, ':'); profile->tls_url = switch_core_sprintf(profile->pool, - "sip:mod_sofia@%s%s%s:%d", + "sip:%s@%s%s%s:%d", + profile->contact_user, ipv6 ? "[" : "", profile->sipip, ipv6 ? "]" : "", profile->tls_sip_port); profile->tls_bindurl = switch_core_sprintf(profile->pool, - "sips:mod_sofia@%s%s%s:%d", + "sips:%s@%s%s%s:%d", + profile->contact_user, ipv6 ? "[" : "", profile->sipip, ipv6 ? "]" : "",

1 0

[commit] r13396 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 15:49:37 2009 New Revision: 13396 Log: mod_dingaling: add dingaling status fsapi command (MODENDP-212) Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue May 19 15:49:37 2009 @@ -204,6 +204,7 @@ SWITCH_STANDARD_API(dl_logout); SWITCH_STANDARD_API(dl_pres); SWITCH_STANDARD_API(dl_debug); +SWITCH_STANDARD_API(dingaling); static switch_status_t channel_on_init(switch_core_session_t *session); static switch_status_t channel_on_hangup(switch_core_session_t *session); static switch_status_t channel_on_destroy(switch_core_session_t *session); @@ -1827,11 +1828,13 @@ #define LOGOUT_SYNTAX "dl_logout <profile_name>" #define LOGIN_SYNTAX "Existing Profile:\ndl_login profile=<profile_name>\nDynamic Profile:\ndl_login var1=val1;var2=val2;varN=valN\n" #define DEBUG_SYNTAX "dl_debug [true|false]" +#define DINGALING_SYNTAX "dingaling [status]" SWITCH_ADD_API(api_interface, "dl_debug", "DingaLing Debug", dl_debug, DEBUG_SYNTAX); SWITCH_ADD_API(api_interface, "dl_pres", "DingaLing Presence", dl_pres, PRES_SYNTAX); SWITCH_ADD_API(api_interface, "dl_logout", "DingaLing Logout", dl_logout, LOGOUT_SYNTAX); SWITCH_ADD_API(api_interface, "dl_login", "DingaLing Login", dl_login, LOGIN_SYNTAX); + SWITCH_ADD_API(api_interface, "dingaling", "DingaLing Menu", dingaling, DINGALING_SYNTAX); SWITCH_ADD_CHAT(chat_interface, MDL_CHAT_PROTO, chat_send); /* indicate that the module should continue to be loaded */ @@ -2089,6 +2092,53 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_STANDARD_API(dingaling) +{ + char *argv[10] = { 0 }; + int argc = 0; + void *val; + char *myarg = NULL; + mdl_profile_t *profile = NULL; + switch_hash_index_t *hi; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + if (session) return status; + + if (switch_strlen_zero(cmd) || !(myarg = strdup(cmd))) { + stream->write_function(stream, "USAGE: %s\n", DINGALING_SYNTAX); + return SWITCH_STATUS_FALSE; + } + + if ((argc = switch_separate_string(myarg, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 1) { + stream->write_function(stream, "USAGE: %s\n", DINGALING_SYNTAX); + goto done; + } + + if (argv[0] && !strncasecmp(argv[0], "status", 6)) { + stream->write_function(stream, "--DingaLing status--\n"); + stream->write_function(stream, "login | connected\n"); + for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + profile = (mdl_profile_t *) val; + stream->write_function(stream, "%s | ", profile->login); + if (ldl_handle_authorized(profile->handle)){ + stream->write_function(stream, "AUTHORIZED"); + } else if (ldl_handle_connected(profile->handle)){ + stream->write_function(stream, "CONNECTED"); + } else { + stream->write_function(stream, "UNCONNECTED"); + } + stream->write_function(stream, "\n"); + } + } else { + stream->write_function(stream, "USAGE: %s\n", DINGALING_SYNTAX); + } + +done: + switch_safe_free(myarg); + return status; +} + SWITCH_STANDARD_API(dl_login) { char *argv[10] = { 0 };

1 0

[commit] r13395 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/sresolv libs/udns src
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 15:25:59 2009 New Revision: 13395 Log: build: fix gcc-4.4.0 build failures (FSCORE-355) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c freeswitch/trunk/libs/udns/udns_resolver.c freeswitch/trunk/src/switch_stun.c freeswitch/trunk/src/switch_utils.c 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 Tue May 19 15:25:59 2009 @@ -3486,15 +3486,17 @@ if (from == NULL) ; else if (from->ss_family == AF_INET) { - struct sockaddr_in const *sin = (void *)from; - su_inet_ntop(AF_INET, &sin->sin_addr, host, sizeof host); - port = sin->sin_port; + struct sockaddr_in sin; + memcpy(&sin, from, sizeof sin); + su_inet_ntop(AF_INET, &sin.sin_addr, host, sizeof host); + port = sin.sin_port; } #if HAVE_SIN6 else if (from->ss_family == AF_INET6) { - struct sockaddr_in6 const *sin6 = (void *)from; - su_inet_ntop(AF_INET6, &sin6->sin6_addr, host, sizeof host); - port = sin6->sin6_port; + struct sockaddr_in6 sin6; + memcpy(&sin6, from, sizeof sin6); + su_inet_ntop(AF_INET6, &sin6.sin6_addr, host, sizeof host); + port = sin6.sin6_port; } #endif Modified: freeswitch/trunk/libs/udns/udns_resolver.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_resolver.c (original) +++ freeswitch/trunk/libs/udns/udns_resolver.c Tue May 19 15:25:59 2009 @@ -739,7 +739,7 @@ sns = &ctx->dnsc_serv[i]; if (sns->sa.sa_family == AF_INET) { sin6.sin6_port = sns->sin.sin_port; - ((struct in_addr*)&sin6.sin6_addr)[3] = sns->sin.sin_addr; + memcpy(&sin6.sin6_addr.s6_addr[12], &sns->sin.sin_addr, sizeof(struct in_addr)); sns->sin6 = sin6; } } Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Tue May 19 15:25:59 2009 @@ -549,7 +549,8 @@ case SWITCH_STUN_ATTR_MAPPED_ADDRESS: if (attr->type) { if (funny) { - ((switch_stun_ip_t *) attr->value)->address ^= ntohl(0xabcdabcd); + switch_stun_ip_t *tmp = (switch_stun_ip_t *)attr->value; + tmp->address ^= ntohl(0xabcdabcd); } switch_stun_packet_attribute_get_mapped_address(attr, rip, &rport); } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue May 19 15:25:59 2009 @@ -1151,14 +1151,15 @@ int flags) { char host[NI_MAXHOST], serv[NI_MAXSERV]; - struct sockaddr_storage ss; + struct sockaddr_in6 si6; const struct sockaddr *addr; const char *colon; if (flags & SWITCH_URI_NO_SCOPE && sa->family == AF_INET6) { - memcpy(&ss, &sa->sa, sa->salen); - ((struct sockaddr_in6*) (intptr_t) &ss)->sin6_scope_id = 0; - addr = (const struct sockaddr*) (intptr_t)&ss; + memcpy(&si6, &sa->sa, sa->salen); + si6.sin6_scope_id = 0; + + addr = (const struct sockaddr*) &si6; } else { addr = (const struct sockaddr*) (intptr_t)&sa->sa; }

1 0

[commit] r13394 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 15:24:53 2009 New Revision: 13394 Log: fix var scope masking Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue May 19 15:24:53 2009 @@ -3041,17 +3041,17 @@ } if (disk_quota) { - callback_t cbt = { 0 }; - char sql[256]; + callback_t callback = { 0 }; + char sqlstmt[256]; char disk_usage[256]; - cbt.buf = disk_usage; - cbt.len = sizeof(disk_usage); + callback.buf = disk_usage; + callback.len = sizeof(disk_usage); - switch_snprintf(sql, sizeof(sql), + switch_snprintf(sqlstmt, sizeof(sqlstmt), "select sum(message_len) from voicemail_msgs where username='%s' and domain='%s'", id, domain_name); - vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); + vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &callback); if (atoi(disk_usage) >= disk_quota) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Voicemail disk quota is exceeded for %s\n", id);

1 0

[commit] r13393 - freeswitch/trunk/src/mod/formats/mod_file_string
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 15:13:57 2009 New Revision: 13393 Log: svn::ignore Modified: freeswitch/trunk/src/mod/formats/mod_file_string/ (props changed)

1 0

[commit] r13392 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 15:12:32 2009 New Revision: 13392 Log: fix windows pch Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Tue May 19 15:12:32 2009 @@ -59,9 +59,19 @@ #define _XOPEN_SOURCE 600 #endif #endif +#ifdef __linux__ +#ifndef _BSD_SOURCE +#define _BSD_SOURCE +#endif +#endif #ifndef __BSD_VISIBLE #define __BSD_VISIBLE 1 #endif +#ifdef __linux__ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#endif #endif #include <stdlib.h> #include <stdio.h> Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Tue May 19 15:12:32 2009 @@ -30,12 +30,6 @@ * */ -#ifdef __linux__ -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -#endif - #include <switch.h> #ifndef WIN32 #include <switch_private.h> Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue May 19 15:12:32 2009 @@ -34,9 +34,6 @@ */ -#ifdef __linux__ -#define _BSD_SOURCE -#endif #include <switch.h> #include <switch_version.h>

1 0