March 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12811 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Fri Mar 27 14:54:45 2009 New Revision: 12811 Log: allocate frame from session pool so it will not go out of scope Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Fri Mar 27 14:54:45 2009 @@ -1057,9 +1057,11 @@ , m_readRTP(0, 512) , m_callOnStart(true) { - memset(&m_readFrame, 0, sizeof(m_readFrame)); - m_readFrame.codec = m_switchCodec; - m_readFrame.flags = SFF_RAW_RTP; + + m_readFrame = (switch_frame_t *) switch_core_session_alloc(m_fsSession, sizeof(*m_readFrame)); + + m_readFrame->codec = m_switchCodec; + m_readFrame->flags = SFF_RAW_RTP; } @@ -1116,7 +1118,7 @@ << mediaFormat.GetMediaType() << " codec " << mediaFormat << " for connection " << *this); if (IsSink()) { - m_readFrame.rate = mediaFormat.GetClockRate(); + m_readFrame->rate = mediaFormat.GetClockRate(); if (isAudio) { switch_core_session_set_read_codec(m_fsSession, m_switchCodec); @@ -1195,7 +1197,7 @@ m_callOnStart = false; } - m_readFrame.flags = 0; + m_readFrame->flags = 0; /* while (switch_channel_ready(m_fsChannel)) { @@ -1222,7 +1224,7 @@ return SWITCH_STATUS_FALSE; } if (!m_readRTP.GetPayloadSize()) { - m_readFrame.flags = SFF_CNG; + m_readFrame->flags = SFF_CNG; break; } } @@ -1234,8 +1236,8 @@ switch_core_timer_next(m_switchTimer); - if (!(m_readFrame.datalen = m_readRTP.GetPayloadSize())) { - m_readFrame.flags = SFF_CNG; + if (!(m_readFrame->datalen = m_readRTP.GetPayloadSize())) { + m_readFrame->flags = SFF_CNG; } } @@ -1245,17 +1247,17 @@ //switch_core_timer_step(&m_switchTimer); - m_readFrame.buflen = m_readRTP.GetSize(); - m_readFrame.data = m_readRTP.GetPayloadPtr(); - m_readFrame.packet = m_readRTP.GetPointer(); - m_readFrame.packetlen = m_readRTP.GetHeaderSize() + m_readFrame.datalen; - m_readFrame.payload = (switch_payload_t) m_readRTP.GetPayloadType(); - m_readFrame.timestamp = m_readRTP.GetTimestamp(); - m_readFrame.m = (switch_bool_t) m_readRTP.GetMarker(); - m_readFrame.seq = m_readRTP.GetSequenceNumber(); - m_readFrame.ssrc = m_readRTP.GetSyncSource(); - m_readFrame.codec = m_switchCodec; - *frame = &m_readFrame; + m_readFrame->buflen = m_readRTP.GetSize(); + m_readFrame->data = m_readRTP.GetPayloadPtr(); + m_readFrame->packet = m_readRTP.GetPointer(); + m_readFrame->packetlen = m_readRTP.GetHeaderSize() + m_readFrame->datalen; + m_readFrame->payload = (switch_payload_t) m_readRTP.GetPayloadType(); + m_readFrame->timestamp = m_readRTP.GetTimestamp(); + m_readFrame->m = (switch_bool_t) m_readRTP.GetMarker(); + m_readFrame->seq = m_readRTP.GetSequenceNumber(); + m_readFrame->ssrc = m_readRTP.GetSyncSource(); + m_readFrame->codec = m_switchCodec; + *frame = m_readFrame; return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Fri Mar 27 14:54:45 2009 @@ -234,7 +234,7 @@ switch_channel_t *m_fsChannel; switch_timer_t *m_switchTimer; switch_codec_t *m_switchCodec; - switch_frame_t m_readFrame; + switch_frame_t *m_readFrame; RTP_DataFrame m_readRTP; bool m_callOnStart; uint32_t m_timeStamp;

1 0

[commit] r12810 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Fri Mar 27 14:51:41 2009 New Revision: 12810 Log: here you go Modified: freeswitch/trunk/src/switch_loadable_module.c Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri Mar 27 14:51:41 2009 @@ -144,6 +144,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "endpoint"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } } @@ -187,6 +189,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "codec"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } } @@ -205,6 +209,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "dialplan"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.dialplan_hash, ptr->interface_name, (const void *) ptr); @@ -223,6 +229,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "timer"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.timer_hash, ptr->interface_name, (const void *) ptr); @@ -243,6 +251,8 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "description", switch_str_nil(ptr->short_desc)); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "syntax", switch_str_nil(ptr->syntax)); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.application_hash, ptr->interface_name, (const void *) ptr); @@ -263,6 +273,8 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "description", switch_str_nil(ptr->desc)); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "syntax", switch_str_nil(ptr->syntax)); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.api_hash, ptr->interface_name, (const void *) ptr); @@ -283,6 +295,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "file"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->extens[i]); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.file_hash, ptr->extens[i], (const void *) ptr); @@ -302,6 +316,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "speech"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.speech_hash, ptr->interface_name, (const void *) ptr); @@ -320,6 +336,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "asr"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.asr_hash, ptr->interface_name, (const void *) ptr); @@ -338,6 +356,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "directory"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.directory_hash, ptr->interface_name, (const void *) ptr); @@ -356,6 +376,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "chat"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.chat_hash, ptr->interface_name, (const void *) ptr); @@ -374,6 +396,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "say"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->interface_name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } switch_core_hash_insert(loadable_modules.say_hash, ptr->interface_name, (const void *) ptr); @@ -398,6 +422,8 @@ if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "type", "management"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "name", ptr->relative_oid); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", new_module->key); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "filename", new_module->filename); switch_event_fire(&event); } }

1 0

[commit] r12809 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Fri Mar 27 13:51:48 2009 New Revision: 12809 Log: MODAPP-245 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Mar 27 13:51:48 2009 @@ -3618,11 +3618,13 @@ stream->write_function(stream, "Bad Args\n"); return SWITCH_STATUS_GENERR; } + if (conference) { conference_outcall_bg(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3]); } else { - conference_outcall_bg(NULL, argv[1], NULL, argv[2], 60, NULL, argv[4], argv[3]); + conference_outcall_bg(NULL, argv[0], NULL, argv[2], 60, NULL, argv[4], argv[3]); } + stream->write_function(stream, "OK\n"); return SWITCH_STATUS_SUCCESS; @@ -4064,7 +4066,7 @@ /* command returned error, so show syntax usage */ stream->write_function(stream, conf_api_sub_commands[CONF_API_COMMAND_DIAL].psyntax); } - } else if (strcasecmp(argv[0], "bgdial") == 0) { + } else if (argv[1] && strcasecmp(argv[1], "bgdial") == 0) { if (conf_api_sub_bgdial(NULL, stream, argc, argv) != SWITCH_STATUS_SUCCESS) { /* command returned error, so show syntax usage */ stream->write_function(stream, conf_api_sub_commands[CONF_API_COMMAND_BGDIAL].psyntax); @@ -4210,6 +4212,7 @@ char *cid_name; char *cid_num; char *conference_name; + switch_memory_pool_t *pool; }; static void *SWITCH_THREAD_FUNC conference_outcall_run(switch_thread_t *thread, void *obj) @@ -4219,11 +4222,11 @@ if (call) { switch_call_cause_t cause; switch_event_t *event; - + conference_outcall(call->conference, call->conference_name, call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); - if (test_eflag(call->conference, EFLAG_BGDIAL_RESULT) && + if (call->conference && test_eflag(call->conference, EFLAG_BGDIAL_RESULT) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_data(call->conference, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "bgdial-result"); @@ -4235,6 +4238,9 @@ switch_safe_free(call->cid_name); switch_safe_free(call->cid_num); switch_safe_free(call->conference_name); + if (call->pool) { + switch_core_destroy_memory_pool(&call->pool); + } switch_safe_free(call); } @@ -4249,6 +4255,7 @@ struct bg_call *call = NULL; switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; + switch_memory_pool_t *pool = NULL; if (!(call = malloc(sizeof(*call)))) return SWITCH_STATUS_MEMERR; @@ -4258,6 +4265,13 @@ call->session = session; call->timeout = timeout; + if (conference) { + pool = conference->pool; + } else { + switch_core_new_memory_pool(&pool); + call->pool = pool; + } + if (bridgeto) { call->bridgeto = strdup(bridgeto); } @@ -4275,10 +4289,10 @@ call->conference_name = strdup(conference_name); } - switch_threadattr_create(&thd_attr, conference->pool); + switch_threadattr_create(&thd_attr, pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool); + switch_thread_create(&thread, thd_attr, conference_outcall_run, call, pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Launching BG Thread for outcall\n"); return SWITCH_STATUS_SUCCESS; @@ -4673,13 +4687,6 @@ xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); } - if (!xml_cfg.profile) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name); - switch_xml_free(cxml); - cxml = NULL; - goto done; - } - xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); /* if this is a bridging call, and it's not a duplicate, build a */ @@ -4700,7 +4707,6 @@ conference = conference_new(conf_name, xml_cfg, NULL); if (!conference) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); goto done; } @@ -4725,9 +4731,8 @@ if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { /* couldn't find the conference, create one */ conference = conference_new(conf_name, xml_cfg, NULL); - + if (!conference) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); goto done; } @@ -5213,6 +5218,7 @@ } /* parse the profile tree for param values */ + if (cfg.profile) for (xml_kvp = switch_xml_child(cfg.profile, "param"); xml_kvp; xml_kvp = xml_kvp->next) { char *var = (char *) switch_xml_attr_soft(xml_kvp, "name"); char *val = (char *) switch_xml_attr_soft(xml_kvp, "value"); @@ -5365,7 +5371,7 @@ /* initialize the conference object with settings from the specified profile */ conference->pool = pool; - conference->profile_name = switch_core_strdup(conference->pool, switch_xml_attr_soft(cfg.profile, "name")); + conference->profile_name = switch_core_strdup(conference->pool, cfg.profile ? switch_xml_attr_soft(cfg.profile, "name") : "none"); if (timer_name) { conference->timer_name = switch_core_strdup(conference->pool, timer_name); }

1 0

[commit] r12808 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: mrene Date: Fri Mar 27 13:39:02 2009 New Revision: 12808 Log: revert + fix typo Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Mar 27 13:39:02 2009 @@ -547,10 +547,15 @@ const char *var = switch_channel_get_variable(caller_channel, "inherit_codec"); if (switch_true(var)) { switch_codec_implementation_t impl; + char tmp[128] = ""; + switch_core_session_get_read_impl(originate_status[pindex].peer_session, &impl); - switch_channel_set_variable_printf(caller_channel, "absolute_codec_string", "%s@%uk@%ui", impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000); + switch_snprintf(tmp, sizeof(tmp), "%s@%uh@%ui", impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000); + switch_channel_set_variable(caller_channel, "absolute_codec_string", tmp); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting codec string on %s to %s\n", switch_channel_get_name(caller_channel), tmp); + + } }

1 0

[commit] r12807 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: mrene Date: Fri Mar 27 13:30:32 2009 New Revision: 12807 Log: Use switch_channel_set_variable_printf instead of snprintf of a stack-allocated buffer Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Mar 27 13:30:32 2009 @@ -547,15 +547,10 @@ const char *var = switch_channel_get_variable(caller_channel, "inherit_codec"); if (switch_true(var)) { switch_codec_implementation_t impl; - char tmp[128] = ""; - switch_core_session_get_read_impl(originate_status[pindex].peer_session, &impl); - switch_snprintf(tmp, sizeof(tmp), "%s@%uk@%ui", impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000); - switch_channel_set_variable(caller_channel, "absolute_codec_string", tmp); + switch_channel_set_variable_printf(caller_channel, "absolute_codec_string", "%s@%uk@%ui", impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting codec string on %s to %s\n", switch_channel_get_name(caller_channel), tmp); - - } }

1 0

[commit] r12806 - in freeswitch/trunk/src: . mod/applications/mod_commands
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Fri Mar 27 12:49:10 2009 New Revision: 12806 Log: MODAPP-227 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core_sqldb.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Mar 27 12:49:10 2009 @@ -2525,7 +2525,7 @@ return SWITCH_STATUS_SUCCESS; } -#define SHOW_SYNTAX "codec|application|api|dialplan|file|timer|calls [count]|channels [count]|aliases|complete|chat|endpoint|management|say|interfaces|interface_types" +#define SHOW_SYNTAX "codec|application|api|dialplan|file|timer|calls [count]|channels [count]|aliases|complete|chat|endpoint|management|modules|say|interfaces|interface_types" SWITCH_STANDARD_API(show_function) { char sql[1024]; @@ -2589,18 +2589,24 @@ if (end_of(command) == 's') { end_of(command) = '\0'; } - sprintf(sql, "select type, name from interfaces where type = '%s' order by type,name", command); + sprintf(sql, "select type, name, key from interfaces where name = '%s' order by type,name", command); + } else if (!strncasecmp(command, "module", 6)) { + if (argv[1]) { + sprintf(sql, "select distinct type, name, key, filename from interfaces where key = '%s' order by type,name", argv[1]); + } else { + sprintf(sql, "select distinct type, name, key, filename from interfaces order by type,name"); + } } else if (!strcasecmp(command, "interfaces")) { - sprintf(sql, "select type, name from interfaces order by type,name"); + sprintf(sql, "select type, name, key from interfaces order by type,name"); } else if (!strcasecmp(command, "interface_types")) { sprintf(sql, "select type,count(type) as total from interfaces group by type order by type"); } else if (!strcasecmp(command, "tasks")) { sprintf(sql, "select * from %s", command); } else if (!strcasecmp(command, "application") || !strcasecmp(command, "api")) { if (argv[1] && strcasecmp(argv[1], "as")) { - sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' and name = '%s' order by type,name", command, argv[1]); + sprintf(sql, "select name, description, syntax, key from interfaces where type = '%s' and description != '' and name = '%s' order by type,name", command, argv[1]); } else { - sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' order by type,name", command); + sprintf(sql, "select name, description, syntax, key from interfaces where type = '%s' and description != '' order by type,name", command); } } else if (!strcasecmp(command, "calls")) { sprintf(sql, "select * from calls order by created_epoch"); @@ -2629,10 +2635,10 @@ holder.print_title = 0; if ((cmdname = strchr(command, ' ')) && strcasecmp(cmdname, "as")) { *cmdname++ = '\0'; - switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' and name = '%s' order by name", + switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description, key from interfaces where type = 'api' and name = '%s' order by name", cmdname); } else { - switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' order by name"); + switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description, key from interfaces where type = 'api' order by name"); } } else { stream->write_function(stream, "-USAGE: %s\n", SHOW_SYNTAX); @@ -2651,6 +2657,8 @@ holder.delim = ","; } + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL: %s.\n", sql); */ + if (!strcasecmp(as, "delim") || !strcasecmp(as, "csv")) { if (switch_strlen_zero(holder.delim)) { if (!(holder.delim = argv[3])) { Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Fri Mar 27 12:49:10 2009 @@ -368,10 +368,12 @@ const char *name = switch_event_get_header_nil(event, "name"); const char *description = switch_event_get_header_nil(event, "description"); const char *syntax = switch_event_get_header_nil(event, "syntax"); + const char *key = switch_event_get_header_nil(event, "key"); + const char *filename = switch_event_get_header_nil(event, "filename"); if (!switch_strlen_zero(type) && !switch_strlen_zero(name)) { sql = - switch_mprintf("insert into interfaces (type,name,description,syntax) values('%q','%q','%q','%q')", - type, name, switch_str_nil(description), switch_str_nil(syntax) + switch_mprintf("insert into interfaces (type,name,description,syntax,key,filename) values('%q','%q','%q','%q','%q','%q')", + type, name, switch_str_nil(description), switch_str_nil(syntax), switch_str_nil(key), switch_str_nil(filename) ); } break; @@ -477,6 +479,8 @@ " type VARCHAR(255),\n" " name VARCHAR(255),\n" " description VARCHAR(255),\n" + " key VARCHAR(255),\n" + " filename VARCHAR(255),\n" " syntax VARCHAR(255)\n" ");\n"; char create_tasks_sql[] =

1 0

[commit] r12805 - freeswitch/trunk/libs/esl/ruby
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: mikej Date: Fri Mar 27 10:29:50 2009 New Revision: 12805 Log: fix ruby linking on debian (ESL-7) Modified: freeswitch/trunk/libs/esl/ruby/Makefile Modified: freeswitch/trunk/libs/esl/ruby/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/ruby/Makefile (original) +++ freeswitch/trunk/libs/esl/ruby/Makefile Fri Mar 27 10:29:50 2009 @@ -1,6 +1,6 @@ ## no idea how to simply ask ruby which one to use LOCAL_CFLAGS=-I$(shell ruby -e 'require "rbconfig"; puts RbConfig::CONFIG["topdir"]') -LOCAL_LDFLAGS=-lruby +LOCAL_LDFLAGS=$(shell ruby -e 'require "rbconfig"; puts RbConfig::CONFIG["LIBRUBYARG"]') all: ESL.so

1 0

[commit] r12804 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: anthm Date: Fri Mar 27 10:07:49 2009 New Revision: 12804 Log: MODAPP-241 Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Mar 27 10:07:49 2009 @@ -1387,7 +1387,7 @@ } switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_VARIABLE, application_interface->interface_name); - switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, expanded); + switch_channel_set_variable_var_check(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, expanded, SWITCH_FALSE); switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, NULL); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r12803 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: nmartin Date: Fri Mar 27 08:35:21 2009 New Revision: 12803 Log: evidently, Apple's Address Book stores telephone numbers willy nilly, and gives you no control over how the actual numbers are stored - added function to strip ()-. and spaces from the number before passing it to FS Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt ============================================================================== Binary files. No diff available.

1 0

[commit] r12802 - in freeswitch/trunk/conf: . directory/default
by FreeSWITCH SVN 27 Mar '09

27 Mar '09

Author: mikej Date: Thu Mar 26 20:44:28 2009 New Revision: 12802 Log: You can lead a horse to water But you can't make him drink You can send a kid to college But you can't make him think PLEASE THINK! /b Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/directory/default/brian.xml freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1000" mailbox="1000"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1000"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1001" mailbox="1001"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1001"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1002" mailbox="1002"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1002"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1003" mailbox="1003"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1003"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1004" mailbox="1004"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1004"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1005" mailbox="1005"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1005"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1006" mailbox="1006"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1006"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1007" mailbox="1007"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1007"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1008" mailbox="1008"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1008"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1009" mailbox="1009"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1009"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1010" mailbox="1010"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1010"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1011" mailbox="1011"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1011"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1012" mailbox="1012"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1012"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1013" mailbox="1013"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1013"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1014" mailbox="1014"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1014"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1015" mailbox="1015"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1015"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1016" mailbox="1016"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1016"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1017" mailbox="1017"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1017"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1018" mailbox="1018"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1018"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,7 @@ <include> <user id="1019" mailbox="1019"> <params> - <param name="password" value="1234"/> + <param name="password" value="${default_password}"/> <param name="vm-password" value="1019"/> </params> <variables> Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Thu Mar 26 20:44:28 2009 @@ -43,8 +43,8 @@ </gateways> <params>  - <param name="password" value="1234"/> - <param name="vm-password" value="1234"/> + <param name="password" value="${default_password}"/> + <param name="vm-password" value="9999"/>    Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Thu Mar 26 20:44:28 2009 @@ -1,7 +1,20 @@ +<include>  + + WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING + + YOU SHOULD CHANGE THIS default_password value if you don't want to be subject to any + toll fraud in the future. It's your responsibility to secure your own system. + + This default config is used to demonstrate the feature set of FreeSWITCH. + + WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING + --> + <X-PRE-PROCESS cmd="set" data="default_password=1234"/> +  + <X-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/callie"/> <!-- This setting is what sets the default domain FreeSWITCH will use if all else fails. @@ -175,3 +188,4 @@ <X-PRE-PROCESS cmd="set" data="external_tls_port=5081"/> <X-PRE-PROCESS cmd="set" data="external_ssl_enable=false"/> <X-PRE-PROCESS cmd="set" data="external_ssl_dir=$${base_dir}/conf/ssl"/> +</include>

1 0