- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

19 Jun '09

Author: anthm Date: Fri Jun 19 15:49:18 2009 New Revision: 13875 Log: MODENDP-222 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Fri Jun 19 15:49:18 2009 @@ -1933,7 +1933,8 @@ if (v_event && *v_event) { - switch_xml_t xparams[3]; + short int xparams_type[6]; + switch_xml_t xparams[6]; int i = 0; switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "sip_number_alias", number_alias); @@ -1943,29 +1944,52 @@ switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "user_name", username); switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "domain_name", domain_name); - if ((dparams = switch_xml_child(domain, "variables"))) { - xparams[i++] = dparams; + if ((uparams = switch_xml_child(user, "params"))) { + xparams_type[i] = 0; + xparams[i++] = uparams; } - if (group && (gparams = switch_xml_child(group, "variables"))) { + if (group && (gparams = switch_xml_child(group, "params"))) { + xparams_type[i] = 0; xparams[i++] = gparams; } + if ((dparams = switch_xml_child(domain, "params"))) { + xparams_type[i] = 0; + xparams[i++] = dparams; + } + if ((uparams = switch_xml_child(user, "variables"))) { + xparams_type[i] = 1; xparams[i++] = uparams; } - if (i <= 3) { + if (group && (gparams = switch_xml_child(group, "variables"))) { + xparams_type[i] = 1; + xparams[i++] = gparams; + } + + if ((dparams = switch_xml_child(domain, "variables"))) { + xparams_type[i] = 1; + xparams[i++] = dparams; + } + + if (i <= 6) { int j = 0; for (j = 0; j < i; j++) { - for (param = switch_xml_child(xparams[j], "variable"); param; param = param->next) { + for (param = switch_xml_child(xparams[j], (xparams_type[j]?"variable":"param")); param; param = param->next) { const char *var = switch_xml_attr_soft(param, "name"); const char *val = switch_xml_attr_soft(param, "value"); sofia_gateway_t *gateway_ptr = NULL; - if (!switch_strlen_zero(var) && !switch_strlen_zero(val)) { - switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, var, val); + if (!switch_strlen_zero(var) && !switch_strlen_zero(val) && (xparams_type[j] == 1 || !strncasecmp(var, "sip-",4) || !strcasecmp(var, "register-gateway")) ) { + if (!switch_event_get_header(*v_event, var)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "event_add_header -> '%s' = '%s'\n",var, val); + switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, var, val); + } else { + continue; + } if (!strcasecmp(var, "register-gateway")) { if (!strcasecmp(val, "all")) {

1 0

[commit] r13874 - in freeswitch/trunk/conf: . dialplan
by FreeSWITCH SVN 19 Jun '09

19 Jun '09

Author: mcollins Date: Fri Jun 19 15:02:05 2009 New Revision: 13874 Log: config:Remove use_profile from default dialplan, move to vars.xml, default value is 'internal' Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Jun 19 15:02:05 2009 @@ -60,10 +60,6 @@ </extension> <extension name="global" continue="true"> - <condition field="${network_addr}" expression="^$" break="never"> - <action application="set" data="use_profile=${cond(${acl($${local_ip_v4} rfc1918)} == true ? nat : default)}"/> - <anti-action application="set" data="use_profile=${cond(${acl(${network_addr} rfc1918)} == true ? nat : default)}"/> - </condition> <condition field="${call_debug}" expression="^true$" break="never"> <action application="info"/> </condition> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Fri Jun 19 15:02:05 2009 @@ -26,6 +26,7 @@ <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/> <X-PRE-PROCESS cmd="set" data="domain_name=$${domain}"/> <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/> + <X-PRE-PROCESS cmd="set" data="use_profile=internal"/> <!-- Enable ZRTP globally you can override this on a per channel basis

1 0

[commit] r13873 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 19 Jun '09

19 Jun '09

Author: andrew Date: Fri Jun 19 14:35:02 2009 New Revision: 13873 Log: Move mutex into the global struct, don't leak on config reload (thanks Math) Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Fri Jun 19 14:35:02 2009 @@ -39,7 +39,6 @@ /* magic byte sequence */ static unsigned char MAGIC[] = {226, 132, 177, 197, 152, 198, 142, 211, 172, 197, 158, 208, 169, 208, 135, 197, 166, 207, 154, 196, 166}; static char *MARKER = "1"; -static switch_mutex_t *MUTEX = NULL; SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown); @@ -63,6 +62,7 @@ switch_event_node_t *node; uint8_t ttl; char *psk; + switch_mutex_t *mutex; } globals; SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_address, globals.address); @@ -82,7 +82,6 @@ globals.ttl = 1; - globals.psk = NULL; globals.key_count = 0; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { @@ -175,7 +174,7 @@ } if (event->event_id == SWITCH_EVENT_RELOADXML) { - switch_mutex_lock(MUTEX); + switch_mutex_lock(globals.mutex); switch_core_hash_destroy(&globals.event_hash); globals.event_hash = NULL; switch_core_hash_init(&globals.event_hash, module_pool); @@ -185,10 +184,10 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Event Multicast Reloaded\n"); } - switch_mutex_unlock(MUTEX); + switch_mutex_unlock(globals.mutex); } - switch_mutex_lock(MUTEX); + switch_mutex_lock(globals.mutex); if (globals.event_list[(uint8_t) SWITCH_EVENT_ALL]) { send = 1; } else if ((globals.event_list[(uint8_t) event->event_id])) { @@ -196,7 +195,7 @@ send = 1; } } - switch_mutex_unlock(MUTEX); + switch_mutex_unlock(globals.mutex); if (send) { char *packet; @@ -268,7 +267,7 @@ memset(&globals, 0, sizeof(globals)); - switch_mutex_init(&MUTEX, SWITCH_MUTEX_NESTED, pool); + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, pool); module_pool = pool; switch_core_hash_init(&globals.event_hash, module_pool);

1 0

[commit] r13872 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 19 Jun '09

19 Jun '09

Author: andrew Date: Fri Jun 19 14:24:23 2009 New Revision: 13872 Log: Make mod_event_multicast re-read its config on RELOADXML (partially) Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Fri Jun 19 14:24:23 2009 @@ -39,6 +39,7 @@ /* magic byte sequence */ static unsigned char MAGIC[] = {226, 132, 177, 197, 152, 198, 142, 211, 172, 197, 158, 208, 169, 208, 135, 197, 166, 207, 154, 196, 166}; static char *MARKER = "1"; +static switch_mutex_t *MUTEX = NULL; SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown); @@ -78,24 +79,17 @@ char *next, *cur; uint32_t count = 0; uint8_t custom = 0; - switch_ssize_t hlen = -1; - - gethostname(globals.hostname, sizeof(globals.hostname)); - globals.host_hash = switch_hashfunc_default(globals.hostname, &hlen); - globals.key_count = 0; + globals.ttl = 1; globals.psk = NULL; + globals.key_count = 0; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf); return SWITCH_STATUS_TERM; } - if (switch_event_reserve_subclass(MULTICAST_EVENT) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n"); - return SWITCH_STATUS_GENERR; - } if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { @@ -180,6 +174,21 @@ return; } + if (event->event_id == SWITCH_EVENT_RELOADXML) { + switch_mutex_lock(MUTEX); + switch_core_hash_destroy(&globals.event_hash); + globals.event_hash = NULL; + switch_core_hash_init(&globals.event_hash, module_pool); + bzero(globals.event_list, SWITCH_EVENT_ALL); + if (load_config() != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to reload config file\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Event Multicast Reloaded\n"); + } + switch_mutex_unlock(MUTEX); + } + + switch_mutex_lock(MUTEX); if (globals.event_list[(uint8_t) SWITCH_EVENT_ALL]) { send = 1; } else if ((globals.event_list[(uint8_t) event->event_id])) { @@ -187,6 +196,7 @@ send = 1; } } + switch_mutex_unlock(MUTEX); if (send) { char *packet; @@ -254,12 +264,19 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load) { + switch_ssize_t hlen = -1; + memset(&globals, 0, sizeof(globals)); + switch_mutex_init(&MUTEX, SWITCH_MUTEX_NESTED, pool); module_pool = pool; switch_core_hash_init(&globals.event_hash, module_pool); + gethostname(globals.hostname, sizeof(globals.hostname)); + globals.host_hash = switch_hashfunc_default(globals.hostname, &hlen); + globals.key_count = 0; + if (load_config() != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Configure\n"); return SWITCH_STATUS_TERM; @@ -302,6 +319,10 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); + if (switch_event_reserve_subclass(MULTICAST_EVENT) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!\n"); + return SWITCH_STATUS_GENERR; + } if (switch_event_bind(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");

1 0

[commit] r13871 - freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
by FreeSWITCH SVN 19 Jun '09

19 Jun '09

Author: crienzo Date: Fri Jun 19 13:51:01 2009 New Revision: 13871 Log: Add support for host byte ordered L16 from UniMRCP. We need UniMRCP r995 now Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Fri Jun 19 13:51:01 2009 @@ -790,15 +790,18 @@ codec->channel_count = 1; codec->payload_type = 96; codec->sampling_rate = schannel->rate; - apt_string_set(&codec->name, schannel->codec); + if (!strcmp(schannel->codec, "L16")) { + /* "LPCM" is UniMRCP's name for L16 host byte ordered */ + apt_string_set(&codec->name, "LPCM"); + } else { + apt_string_set(&codec->name, schannel->codec); + } /* see RFC 1890 for payload types */ if (!strcmp(schannel->codec, "PCMU") && schannel->rate == 8000) { codec->payload_type = 0; } else if (!strcmp(schannel->codec, "PCMA") && schannel->rate == 8000) { codec->payload_type = 8; - } else if (!strcmp(schannel->codec, "L16") && schannel->rate == 44100) { - codec->payload_type = 11; - } + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) requesting codec %s/%d/%d\n", schannel->name, schannel->codec, codec->payload_type, codec->sampling_rate); if(schannel->type == SPEECH_CHANNEL_SYNTHESIZER) { termination = mrcp_application_sink_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);

1 0

[commit] r13870 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 19 Jun '09

19 Jun '09

Author: andrew Date: Fri Jun 19 12:51:18 2009 New Revision: 13870 Log: Whoops Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile Fri Jun 19 12:51:18 2009 @@ -1,6 +1,5 @@ -LOCAL_CFLAGS= $(OPENSSL_CFLAGS) -DHAVE_OPENSSL +LOCAL_CFLAGS= $(OPENSSL_CFLAGS) LOCAL_LDLAGS= $(OPENSSL_LIBS) -CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h include ../../../../build/modmake.rules

1 0

[commit] r13869 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 19 Jun '09

19 Jun '09

Author: intralanman Date: Fri Jun 19 12:48:49 2009 New Revision: 13869 Log: this should handle all cases now Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Fri Jun 19 12:48:49 2009 @@ -34,7 +34,7 @@ #include <switch_odbc.h> -#define LCR_SYNTAX "lcr <digits> [<lcr profile>] [caller_id]" +#define LCR_SYNTAX "lcr <digits> [<lcr profile>] [caller_id] [intrastate]" #define LCR_ADMIN_SYNTAX "lcr_admin show profiles" /* SQL Query places */ @@ -640,7 +640,6 @@ switch_channel_t *channel; char *id_str; char *safe_sql = NULL; - const char *intra = NULL; char *rate_field = NULL; switch_assert(cb_struct->lookup_number != NULL); @@ -658,17 +657,19 @@ digits_expanded = expand_digits(cb_struct->pool, digits_copy, cb_struct->profile->quote_in_list); + /* set our rate field based on env and profile */ + if (cb_struct->intrastate == SWITCH_TRUE && profile->profile_has_intra == SWITCH_TRUE) { + rate_field = switch_core_strdup(cb_struct->pool, "intra"); + } else { + rate_field = switch_core_strdup(cb_struct->pool, "rate"); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate routing [%d] so rate field is [%s]\n", + cb_struct->intrastate, rate_field); + /* set some channel vars if we have a session */ if (cb_struct->session) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "we have a session\n"); if ((channel = switch_core_session_get_channel(cb_struct->session))) { - intra = switch_channel_get_variable(channel, "intrastate"); - if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true") || profile->profile_has_intra == SWITCH_FALSE) { - rate_field = switch_core_strdup(cb_struct->pool, "rate"); - } else { - rate_field = switch_core_strdup(cb_struct->pool, "intra"); - } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate routing [%s] so rate field is [%s]\n", intra, rate_field); switch_channel_set_variable_var_check(channel, "lcr_rate_field", rate_field, SWITCH_FALSE); switch_channel_set_variable_var_check(channel, "lcr_query_digits", digits_copy, SWITCH_FALSE); id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id); @@ -677,14 +678,7 @@ } } if (cb_struct->event) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "we have an event"); - intra = switch_event_get_header(cb_struct->event, "intrastate"); - if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true") || profile->profile_has_intra == SWITCH_FALSE) { - rate_field = switch_core_strdup(cb_struct->pool, "rate"); - } else { - rate_field = switch_core_strdup(cb_struct->pool, "intra"); - } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate routing [%s] so rate field is [%s]\n", intra, rate_field); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "we have an event\n"); switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_rate_field", rate_field); switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_query_digits", digits_copy); id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id); @@ -692,11 +686,7 @@ switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_query_expanded_digits", digits_expanded); } - if (!cb_struct->session && !cb_struct->session) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "We have no session and no event, we need to set rate_field somewhere now\n"); - } /* set up the query to be executed */ - /* format the custom_sql */ safe_sql = format_custom_sql(profile->custom_sql, cb_struct, digits_copy); if (!safe_sql) { @@ -997,6 +987,7 @@ char *lcr_profile = NULL; switch_memory_pool_t *pool = NULL; switch_event_t *event = NULL; + const char *intra = NULL; if (session) { pool = switch_core_session_get_pool(session); @@ -1011,6 +1002,16 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile); goto end; } + + intra = switch_channel_get_variable(channel, "intrastate"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate channel var is [%s]\n", intra); + if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on interstate rates\n"); + routes.intrastate = SWITCH_FALSE; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n"); + routes.intrastate = SWITCH_TRUE; + } if (!caller_profile) { caller_profile = switch_channel_get_caller_profile(channel); @@ -1073,6 +1074,7 @@ lcr_route cur_route = { 0 }; switch_memory_pool_t *pool; switch_event_t *event; + const char *intra = NULL; if (!(mydata = switch_core_session_strdup(session, data))) { return; @@ -1088,6 +1090,16 @@ } routes.pool = pool; + intra = switch_channel_get_variable(channel, "intrastate"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate channel var is [%s]\n", intra); + if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on interstate rates\n"); + routes.intrastate = SWITCH_FALSE; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n"); + routes.intrastate = SWITCH_TRUE; + } + if (!caller_profile) { if (!(caller_profile = switch_channel_get_caller_profile(channel))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unable to locate caller_profile\n");

1 0

[commit] r13868 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by FreeSWITCH SVN 19 Jun '09

19 Jun '09

Author: andrew Date: Fri Jun 19 12:47:09 2009 New Revision: 13868 Log: Switch to cipher-block-chaining, add a magic byte sequence to check for sucessful decryption and fix some null termination issues Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/Makefile Fri Jun 19 12:47:09 2009 @@ -1,5 +1,6 @@ -LOCAL_CFLAGS= $(OPENSSL_CFLAGS) +LOCAL_CFLAGS= $(OPENSSL_CFLAGS) -DHAVE_OPENSSL LOCAL_LDLAGS= $(OPENSSL_LIBS) +CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h include ../../../../build/modmake.rules Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Fri Jun 19 12:47:09 2009 @@ -36,6 +36,8 @@ #define MULTICAST_BUFFSIZE 65536 +/* magic byte sequence */ +static unsigned char MAGIC[] = {226, 132, 177, 197, 152, 198, 142, 211, 172, 197, 158, 208, 169, 208, 135, 197, 166, 207, 154, 196, 166}; static char *MARKER = "1"; SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load); @@ -205,11 +207,12 @@ switch_uuid_get(&uuid); switch_uuid_format(uuid_str, &uuid); - len = strlen(packet) + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + EVP_MAX_IV_LENGTH; + len = strlen(packet) + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + EVP_MAX_IV_LENGTH + strlen((char*)MAGIC); #else - len = strlen(packet) + sizeof(globals.host_hash); + len = strlen(packet) + sizeof(globals.host_hash) + strlen((char*) MAGIC); #endif buf = malloc(len + 1); + bzero(buf, len + 1); switch_assert(buf); memcpy(buf, &globals.host_hash, sizeof(globals.host_hash)); @@ -218,17 +221,22 @@ switch_copy_string(buf + sizeof(globals.host_hash), uuid_str, SWITCH_UUID_FORMATTED_LENGTH); EVP_CIPHER_CTX_init(&ctx); - EVP_EncryptInit(&ctx, EVP_bf_cfb(), NULL, NULL); + EVP_EncryptInit(&ctx, EVP_bf_cbc(), NULL, NULL); EVP_CIPHER_CTX_set_key_length(&ctx, strlen(globals.psk)); EVP_EncryptInit(&ctx, NULL, (unsigned char*) globals.psk, (unsigned char*) uuid_str); EVP_EncryptUpdate(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH, &outlen, (unsigned char*) packet, (int) strlen(packet)); + EVP_EncryptUpdate(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen, + &tmplen, (unsigned char*) MAGIC, (int) strlen((char *) MAGIC)); + outlen += tmplen; EVP_EncryptFinal(&ctx, (unsigned char*) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen, &tmplen); outlen += tmplen; len = (size_t) outlen + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH; + *(buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen) = '\0'; } else { #endif switch_copy_string(buf + sizeof(globals.host_hash), packet, len - sizeof(globals.host_hash)); + switch_copy_string(buf + sizeof(globals.host_hash) + strlen(packet), (char *) MAGIC, strlen((char*) MAGIC)+1); #ifdef HAVE_OPENSSL } #endif @@ -246,7 +254,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load) { - memset(&globals, 0, sizeof(globals)); module_pool = pool; @@ -340,7 +347,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_multicast_runtime) { switch_event_t *local_event; - char *buf; + char *buf, *m; switch_sockaddr_t *addr; buf = (char *) malloc(MULTICAST_BUFFSIZE); @@ -384,26 +391,41 @@ tmp = malloc(len); - memset(tmp, 0, len); + bzero(tmp, len); switch_copy_string(uuid_str, packet, SWITCH_UUID_FORMATTED_LENGTH); packet += SWITCH_UUID_FORMATTED_LENGTH; EVP_CIPHER_CTX_init(&ctx); - EVP_DecryptInit(&ctx, EVP_bf_cfb(), NULL, NULL); + EVP_DecryptInit(&ctx, EVP_bf_cbc(), NULL, NULL); EVP_CIPHER_CTX_set_key_length(&ctx, strlen(globals.psk)); EVP_DecryptInit(&ctx, NULL, (unsigned char*) globals.psk, (unsigned char*) uuid_str); EVP_DecryptUpdate(&ctx, (unsigned char*) tmp, &outl, (unsigned char*) packet, (int) len); EVP_DecryptFinal(&ctx, (unsigned char*) tmp + outl, &tmplen); + *(tmp + outl + tmplen) = '\0'; + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "decrypted event as %s\n----------\n of actual length %d (%d) %d\n", tmp, outl + tmplen, (int) len, (int) strlen(tmp));*/ - /*continue;*/ packet = tmp; } #endif - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT %d\n--------------------------------\n%s\n", (int) len, packet); + if ((m = strchr(packet, (int) MAGIC[0])) != 0) { + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found start of magic string\n");*/ + if (!strncmp((char*) MAGIC, m, strlen((char*) MAGIC))) { + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found entire magic string\n");*/ + *m = '\0'; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Failed to find entire magic string\n"); + continue; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to find start of magic string\n"); + continue; + } + + /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT %d\n--------------------------------\n%s\n", (int) len, packet);*/ if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_EVENT) == SWITCH_STATUS_SUCCESS) { char *var, *val, *term = NULL, tmpname[128]; switch_event_add_header_string(local_event, SWITCH_STACK_BOTTOM, "Multicast", "yes");

1 0

[commit] r13867 - freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc
by FreeSWITCH SVN 19 Jun '09

19 Jun '09

Author: ledr Date: Fri Jun 19 12:33:31 2009 New Revision: 13867 Log: Debug from cli toggles dumping of generated xml Modified: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Modified: freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c (original) +++ freeswitch/trunk/scripts/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Fri Jun 19 12:33:31 2009 @@ -45,6 +45,37 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_odbc_shutdown); SWITCH_MODULE_DEFINITION(mod_xml_odbc, mod_xml_odbc_load, mod_xml_odbc_shutdown, NULL); +static switch_bool_t debug = SWITCH_FALSE; + +#define XML_ODBC_SYNTAX "[debug_on|debug_off]" + +SWITCH_STANDARD_API(xml_odbc_function) +{ + if (session) { + return SWITCH_STATUS_FALSE; + } + + if (switch_strlen_zero(cmd)) { + goto usage; + } + + if (!strcasecmp(cmd, "debug_on")) { + debug = SWITCH_TRUE; + } else if (!strcasecmp(cmd, "debug_off")) { + debug = SWITCH_FALSE; + } else { + goto usage; + } + + stream->write_function(stream, "OK\n"); + return SWITCH_STATUS_SUCCESS; + + usage: + stream->write_function(stream, "USAGE: %s\n", XML_ODBC_SYNTAX); + return SWITCH_STATUS_SUCCESS; +} + + typedef struct xml_binding { char *bindings; } xml_binding_t; @@ -287,7 +318,9 @@ } } -//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG DUMP OF XML GENERATED:\n\n%s\n\n", switch_xml_toxml(xml, SWITCH_FALSE)); + if (debug == SWITCH_TRUE) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Debug dump of XML generated:\n%s", switch_xml_toxml(xml, SWITCH_FALSE)); + } free(dir_user); dir_user = NULL; @@ -432,7 +465,7 @@ switch_core_new_memory_pool(&globals.pool); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); - *module_interface = switch_loadable_module_create_module_interface(pool, modname); + switch_api_interface_t *xml_odbc_api_interface; #ifndef SWITCH_HAVE_ODBC switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You must have ODBC support in FreeSWITCH to use this module\n"); @@ -442,6 +475,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "XML ODBC module loading...\n"); + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + SWITCH_ADD_API(xml_odbc_api_interface, "xml_odbc", "XML ODBC", xml_odbc_function, XML_ODBC_SYNTAX); + switch_console_set_complete("add xml_odbc debug_on"); + switch_console_set_complete("add xml_odbc debug_off"); + if (do_config() != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load xml_odbc config file\n"); return SWITCH_STATUS_FALSE;

1 0

[commit] r13866 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Jun '09

19 Jun '09

Author: anthm Date: Fri Jun 19 12:23:57 2009 New Revision: 13866 Log: FSCORE-384 Modified: freeswitch/trunk/src/switch_odbc.c Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Fri Jun 19 12:23:57 2009 @@ -388,12 +388,16 @@ switch_assert(names && vals); for (x = 1; x <= c; x++) { - SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; - SQLULEN ColumnSize; + SQLSMALLINT NameLength = 0, DataType = 0, DecimalDigits = 0, Nullable = 0; + SQLULEN ColumnSize = 0; names[y] = malloc(name_len); memset(names[y], 0, name_len); SQLDescribeCol(stmt, x, (SQLCHAR *) names[y], (SQLSMALLINT) name_len, &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); + + if (!ColumnSize) { + ColumnSize = 255; + } ColumnSize++; vals[y] = malloc(ColumnSize);

1 0