- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8427 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 00:01:56 2008 New Revision: 8427 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: don't push null values into the hash Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Fri May 16 00:01:56 2008 @@ -266,9 +266,9 @@ need_vars_map = 1; } - if(vars_map) - if (switch_core_hash_insert(vars_map,val,ENABLE_PARAM_VALUE) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant add %s to params hash!\n",val); + if (vars_map && val) + if (switch_core_hash_insert(vars_map, val, ENABLE_PARAM_VALUE) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant add %s to params hash!\n",val); } }

1 0

[commit] r8426 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 15 May '08

15 May '08

Author: stkn Date: Thu May 15 17:43:52 2008 New Revision: 8426 Modified: freeswitch/trunk/src/mod/languages/mod_lua/Makefile Log: Pass CC to lua make, fixes building on (open-)solaris Modified: freeswitch/trunk/src/mod/languages/mod_lua/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/Makefile Thu May 15 17:43:52 2008 @@ -11,7 +11,7 @@ local_depend: $(LOCAL_OBJS) $(LIBLUA_A): - cd lua && $(MAKE) CFLAGS="$(ALL_CFLAGS) -DLUA_USE_LINUX -w" liblua.a + cd lua && $(MAKE) CC="$(CC)" CFLAGS="$(ALL_CFLAGS) -DLUA_USE_LINUX -w" liblua.a luaclean: cd lua && $(MAKE) clean

1 0

[commit] r8425 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 15 May '08

15 May '08

Author: anthm Date: Thu May 15 17:36:32 2008 New Revision: 8425 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_bridge.c Log: make the impossible possible Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu May 15 17:36:32 2008 @@ -1404,19 +1404,24 @@ switch_channel_set_flag(channel, CF_INNER_BRIDGE); switch_ivr_multi_threaded_bridge(session, peer_session, xfer_on_dtmf, peer_session, NULL); - + + switch_channel_clear_flag(peer_channel, CF_INNER_BRIDGE); + switch_channel_clear_flag(channel, CF_INNER_BRIDGE); + if (bond) { switch_core_session_t *b_session; char buf[128] = ""; - if ((b_session = switch_core_session_locate(bond))) { + if (!switch_channel_ready(channel)) { + switch_ivr_uuid_bridge(switch_core_session_get_uuid(peer_session), bond); + } else if ((b_session = switch_core_session_locate(bond))) { switch_channel_t *b_channel = switch_core_session_get_channel(b_session); switch_snprintf(buf, sizeof(buf), "%s %s", switch_core_session_get_uuid(peer_session), switch_core_session_get_uuid(session)); switch_channel_set_variable(b_channel, "xfer_uuids", buf); switch_snprintf(buf, sizeof(buf), "%s %s", switch_core_session_get_uuid(peer_session), bond); switch_channel_set_variable(channel, "xfer_uuids", buf); - + switch_core_event_hook_add_state_change(session, hanguphook); switch_core_event_hook_add_state_change(b_session, hanguphook); Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu May 15 17:36:32 2008 @@ -369,8 +369,8 @@ switch_channel_clear_state_handler(channel, &audio_bridge_peer_state_handlers); state = switch_channel_get_state(channel); - - if (!switch_channel_test_flag(channel, CF_TRANSFER) && state != CS_PARK && state != CS_ROUTING) { + + if (!switch_channel_test_flag(channel, CF_TRANSFER) && state != CS_PARK && state != CS_ROUTING && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); }

1 0

[commit] r8424 - freeswitch/trunk/src
by Freeswitch SVN 15 May '08

15 May '08

Author: mikej Date: Thu May 15 17:31:47 2008 New Revision: 8424 Modified: freeswitch/trunk/src/switch_log.c Log: Avoid fflush-ing NULL. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Thu May 15 17:31:47 2008 @@ -311,7 +311,9 @@ switch_safe_free(data); switch_safe_free(new_fmt); - fflush(handle); + if (handle) { + fflush(handle); + } } SWITCH_DECLARE(switch_status_t) switch_log_init(switch_memory_pool_t *pool)

1 0

[commit] r8423 - freeswitch/trunk/src
by Freeswitch SVN 15 May '08

15 May '08

Author: mikej Date: Thu May 15 17:25:26 2008 New Revision: 8423 Modified: freeswitch/trunk/src/switch_console.c Log: Avoid non null terminated string. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Thu May 15 17:25:26 2008 @@ -824,7 +824,7 @@ for (x = 0; x < (sizeof(cmd) - 1); x++) { int c = getchar(); if (c < 0) { - int y = read(fileno(stdin), cmd, sizeof(cmd)); + int y = read(fileno(stdin), cmd, sizeof(cmd) - 1); cmd[y - 1] = '\0'; break; }

1 0

[commit] r8422 - freeswitch/trunk/src
by Freeswitch SVN 15 May '08

15 May '08

Author: mikej Date: Thu May 15 17:08:42 2008 New Revision: 8422 Modified: freeswitch/trunk/src/switch_channel.c Log: handle buffer boundries a bit better, assert before deref. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu May 15 17:08:42 2008 @@ -130,7 +130,7 @@ uint8_t x; const char *str = "UNKNOWN"; - for (x = 0; CAUSE_CHART[x].name; x++) { + for (x = 0; x < (sizeof(CAUSE_CHART) / sizeof(struct switch_cause_table)) ; x++) { if (CAUSE_CHART[x].cause == cause) { str = CAUSE_CHART[x].name; } @@ -147,7 +147,7 @@ if (*str > 47 && *str < 58) { cause = atoi(str); } else { - for (x = 0; CAUSE_CHART[x].name; x++) { + for (x = 0; x < (sizeof(CAUSE_CHART) / sizeof(struct switch_cause_table)) && CAUSE_CHART[x].name; x++) { if (!strcasecmp(CAUSE_CHART[x].name, str)) { cause = CAUSE_CHART[x].cause; } @@ -1272,10 +1272,9 @@ int index, i = channel->state_handler_index; const switch_state_handler_table_t *new_handlers[SWITCH_MAX_STATE_HANDLERS] = { 0 }; + switch_assert(channel != NULL); switch_mutex_lock(channel->flag_mutex); - - switch_assert(channel != NULL); channel->state_handler_index = 0; if (state_handler) {

1 0

[commit] r8421 - freeswitch/trunk/src
by Freeswitch SVN 15 May '08

15 May '08

Author: mikej Date: Thu May 15 17:05:32 2008 New Revision: 8421 Modified: freeswitch/trunk/src/switch.c Log: handle malloc failures. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu May 15 17:05:32 2008 @@ -404,6 +404,10 @@ x++; if (argv[x] && strlen(argv[x])) { SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(strlen(argv[x]) + 1); + if (!SWITCH_GLOBAL_dirs.conf_dir) { + fprintf(stderr, "Allocation error\n"); + return 255; + } strcpy(SWITCH_GLOBAL_dirs.conf_dir, argv[x]); alt_dirs++; } else { @@ -417,6 +421,10 @@ x++; if (argv[x] && strlen(argv[x])) { SWITCH_GLOBAL_dirs.log_dir = (char *) malloc(strlen(argv[x]) + 1); + if (!SWITCH_GLOBAL_dirs.log_dir) { + fprintf(stderr, "Allocation error\n"); + return 255; + } strcpy(SWITCH_GLOBAL_dirs.log_dir, argv[x]); alt_dirs++; } else { @@ -430,6 +438,10 @@ x++; if (argv[x] && strlen(argv[x])) { SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(strlen(argv[x]) + 1); + if (!SWITCH_GLOBAL_dirs.db_dir) { + fprintf(stderr, "Allocation error\n"); + return 255; + } strcpy(SWITCH_GLOBAL_dirs.db_dir, argv[x]); alt_dirs++; } else { @@ -443,6 +455,10 @@ x++; if (argv[x] && strlen(argv[x])) { SWITCH_GLOBAL_dirs.script_dir = (char *) malloc(strlen(argv[x]) + 1); + if (!SWITCH_GLOBAL_dirs.script_dir) { + fprintf(stderr, "Allocation error\n"); + return 255; + } strcpy(SWITCH_GLOBAL_dirs.script_dir, argv[x]); } else { fprintf(stderr, "When using -scripts you must specify a scripts directory\n");

1 0

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

15 May '08

Author: anthm Date: Thu May 15 17:04:37 2008 New Revision: 8420 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 Thu May 15 17:04:37 2008 @@ -975,7 +975,7 @@ code = 488; } - if (!reason && code != 407) { + if (switch_strlen_zero(reason) && code != 407) { reason = sip_status_phrase(code); if (switch_strlen_zero(reason)) { reason = "Because"; @@ -1014,7 +1014,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_BYE); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d %s\n", code, reason); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d [%s]\n", code, reason); if (!switch_strlen_zero(((char *)msg->pointer_arg))) { tech_pvt->local_sdp_str = switch_core_session_strdup(tech_pvt->session, (char *)msg->pointer_arg);

1 0

[commit] r8419 - in freeswitch/trunk/src: . include
by Freeswitch SVN 15 May '08

15 May '08

Author: anthm Date: Thu May 15 16:53:22 2008 New Revision: 8419 Modified: freeswitch/trunk/src/include/switch_config.h freeswitch/trunk/src/switch_config.c Log: fix pointer thingy Modified: freeswitch/trunk/src/include/switch_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_config.h (original) +++ freeswitch/trunk/src/include/switch_config.h Thu May 15 16:53:22 2008 @@ -65,7 +65,7 @@ /*! FILE stream buffer to the opened file */ FILE *file; /*! path to the file */ - char *path; + char path[512]; /*! current category */ char category[256]; /*! current section */ Modified: freeswitch/trunk/src/switch_config.c ============================================================================== --- freeswitch/trunk/src/switch_config.c (original) +++ freeswitch/trunk/src/switch_config.c Thu May 15 16:53:22 2008 @@ -66,7 +66,7 @@ } cfg->file = f; - cfg->path = path; + switch_set_string(cfg->path, path); while (switch_config_next_pair(cfg, &var, &val)) { if (file_path && (cfg->sectno != last) && !strcmp(cfg->section, file_path)) { @@ -83,7 +83,7 @@ return 0; } else { cfg->file = f; - cfg->path = path; + switch_set_string(cfg->path, path); return 1; } }

1 0

[commit] r8418 - in freeswitch/trunk: conf/autoload_configs src src/include src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 15 May '08

15 May '08

Author: anthm Date: Thu May 15 16:29:08 2008 New Revision: 8418 Modified: freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/trunk/src/switch_event.c Log: add patch from MDXMLINT-27 Modified: freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml Thu May 15 16:29:08 2008 @@ -6,5 +6,7 @@ <param name="auth-realm" value="freeswitch"/> <param name="auth-user" value="freeswitch"/> <param name="auth-pass" value="works"/> +  +  </settings> </configuration> Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Thu May 15 16:29:08 2008 @@ -339,7 +339,7 @@ */ #define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, event, data) -SWITCH_DECLARE(char *) switch_event_build_param_string(switch_event_t *event, const char *prefix); +SWITCH_DECLARE(char *) switch_event_build_param_string(switch_event_t *event, const char *prefix,switch_hash_t* vars_map); ///\} Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Thu May 15 16:29:08 2008 @@ -43,6 +43,8 @@ char *cred; int disable100continue; uint32_t ignore_cacert_check; + switch_hash_t* vars_map; + switch_memory_pool_t* vars_map_pool; }; static int keep_files_around = 0; @@ -110,7 +112,7 @@ struct curl_slist *headers = NULL; char hostname[256] = ""; char basic_data[512]; - + gethostname(hostname, sizeof(hostname)); if (!binding) { @@ -134,7 +136,7 @@ switch_str_nil(key_name), switch_str_nil(key_value)); - data = switch_event_build_param_string(params, basic_data); + data = switch_event_build_param_string(params, basic_data,binding->vars_map); switch_assert(data); switch_uuid_get(&uuid); @@ -204,14 +206,17 @@ return xml; } - +#define ENABLE_PARAM_VALUE "enabled" static switch_status_t do_config(void) { char *cf = "xml_curl.conf"; switch_xml_t cfg, xml, bindings_tag, binding_tag, param; xml_binding_t *binding = NULL; int x = 0; - + int need_vars_map = 0; + switch_hash_t* vars_map = NULL; + switch_memory_pool_t* vars_map_pool = NULL; + 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; @@ -244,7 +249,29 @@ disable100continue = 1; } else if (!strcasecmp(var, "ignore-cacert-check") && switch_true(val)) { ignore_cacert_check = 1; - } + } else if(!strcasecmp(var, "enable-post-var")) { + if (!vars_map && need_vars_map == 0) { + if (switch_core_new_memory_pool(&vars_map_pool) != SWITCH_STATUS_SUCCESS) { + need_vars_map = -1; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant create memory pool!\n"); + continue; + } + + if (switch_core_hash_init(&vars_map,vars_map_pool) != SWITCH_STATUS_SUCCESS) { + need_vars_map = -1; + switch_core_destroy_memory_pool(&vars_map_pool); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant init params hash!\n"); + continue; + } + need_vars_map = 1; + } + + if(vars_map) + if (switch_core_hash_insert(vars_map,val,ENABLE_PARAM_VALUE) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant add %s to params hash!\n",val); + } + + } } if (!url) { @@ -269,6 +296,9 @@ binding->disable100continue = disable100continue; binding->ignore_cacert_check = ignore_cacert_check; + + binding->vars_map = vars_map; + binding->vars_map_pool = vars_map_pool; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n", switch_strlen_zero(bname) ? "N/A" : bname, binding->url, binding->bindings ? binding->bindings : "all"); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Thu May 15 16:29:08 2008 @@ -1275,7 +1275,7 @@ return data; } -SWITCH_DECLARE(char *) switch_event_build_param_string(switch_event_t *event, const char *prefix) +SWITCH_DECLARE(char *) switch_event_build_param_string(switch_event_t *event, const char *prefix, switch_hash_t* vars_map) { switch_stream_handle_t stream = { 0 }; switch_size_t encode_len = 1024, new_len = 0; @@ -1284,6 +1284,7 @@ char *e = NULL; switch_event_header_t *hi; uint32_t x = 0; + void* data = NULL; SWITCH_STANDARD_STREAM(stream); @@ -1318,10 +1319,18 @@ if (event) { if ((hi = event->headers)) { + for (; hi; hi = hi->next) { char *var = hi->name; char *val = hi->value; - + + if (vars_map != NULL) + { + if ((data = switch_core_hash_find(vars_map,var)) == NULL || strcasecmp(((char*)data),"enabled")) + continue; + + } + new_len = (strlen((char *) var) * 3) + 1; if (encode_len < new_len) { char *tmp; @@ -1339,6 +1348,7 @@ } } } + e = (char *) stream.data + (strlen((char *) stream.data) - 1); if (e && *e == '&') {

1 0