- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12471 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 15:09:46 2009 New Revision: 12471 Log: oops[] Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Thu Mar 5 15:09:46 2009 @@ -41,7 +41,7 @@ if (!*event) { switch_event_create(event, SWITCH_EVENT_REQUEST_PARAMS); - switch_assert(event); + switch_assert(*event); } for (node = xml; node; node = node->next) { @@ -58,7 +58,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions) { - switch_event_t *event; + switch_event_t *event = NULL; switch_status_t result; int count = switch_event_import_xml(xml, "name", "value", &event); @@ -165,14 +165,14 @@ /* We have a preallocated buffer */ char *dest = (char*)item->ptr; - if (strncasecmp(dest, newstring, string_options->length)) { + if (!dest || strncasecmp(dest, newstring, string_options->length)) { switch_copy_string(dest, newstring, string_options->length); changed = SWITCH_TRUE; } } else { char **dest = (char**)item->ptr; - if (strcasecmp(*dest, newstring)) { + if (!*dest || strcasecmp(*dest, newstring)) { if (string_options->pool) { *dest = switch_core_strdup(string_options->pool, newstring); } else {

1 0

[commit] r12470 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 14:51:23 2009 New Revision: 12470 Log: fix gcc visibility Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/include/switch_xml_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml_config.h (original) +++ freeswitch/trunk/src/include/switch_xml_config.h Thu Mar 5 14:51:23 2009 @@ -58,7 +58,7 @@ char *validation_regex; /*< Enforce validation using this regular expression */ } switch_xml_config_string_options_t; -extern switch_xml_config_string_options_t switch_config_string_strdup; /*< String options structure for strdup, no validation */ +SWITCH_DECLARE_DATA extern switch_xml_config_string_options_t switch_config_string_strdup; /*< String options structure for strdup, no validation */ typedef struct { switch_bool_t enforce_min; Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Thu Mar 5 14:51:23 2009 @@ -32,7 +32,7 @@ #include <switch.h> -switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL }; +SWITCH_DECLARE_DATA switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL }; SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event) {

1 0

[commit] r12469 - in freeswitch/trunk/src: . include mod/applications/mod_skel
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 14:18:27 2009 New Revision: 12469 Log: replace reloadable bool by a flags structure and add required flag Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/include/switch_xml_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml_config.h (original) +++ freeswitch/trunk/src/include/switch_xml_config.h Thu Mar 5 14:18:27 2009 @@ -58,6 +58,8 @@ char *validation_regex; /*< Enforce validation using this regular expression */ } switch_xml_config_string_options_t; +extern switch_xml_config_string_options_t switch_config_string_strdup; /*< String options structure for strdup, no validation */ + typedef struct { switch_bool_t enforce_min; int min; @@ -74,6 +76,11 @@ CONFIG_SHUTDOWN } switch_config_callback_type_t; +typedef enum { + CONFIG_RELOADABLE = (1 << 0), + CONFIG_REQUIRED = (1 << 1) +} switch_config_flags_t; + typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed); /*! @@ -82,16 +89,16 @@ struct switch_xml_config_item { char *key; /*< The key of the element, or NULL to indicate the end of the list */ switch_xml_config_type_t type; /*< The type of variable */ - switch_bool_t reloadable; /*< True if the var can be changed on reload */ + switch_config_flags_t flags; /*< True if the var can be changed on reload */ void *ptr; /*< Ptr to the var to be changed */ void *defaultvalue; /*< Default value */ void *data; /*< Custom data (depending on the type) */ switch_xml_config_callback_t function; /*< Callback to be called after the var is parsed */ -} ; - +}; -#define SWITCH_CONFIG_ITEM(_key, _type, _reloadable, _ptr, _defaultvalue, _data) { _key, _type, _reloadable, _ptr, _defaultvalue, _data, NULL } -#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _reloadable, _ptr, _defaultvalue, _data, _functiondata) { _key, _type, _reloadable, _ptr, _defaultvalue, _functiondata, _data } +#define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data) { _key, _type, _flags, _ptr, _defaultvalue, _data, NULL } +#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue) { _key, SWITCH_CONFIG_STRING, _flags, _ptr, _defaultvalue, &switch_config_string_strdup, NULL } +#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _data, _functiondata) { _key, _type, _flags, _ptr, _defaultvalue, _functiondata, _data } #define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL } /*! Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Thu Mar 5 14:18:27 2009 @@ -83,10 +83,10 @@ static switch_xml_config_item_t instructions[] = { /* parameter name type reloadable pointer default value options structure */ - SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation), - SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, SWITCH_TRUE, &globals.codec_negotiation, (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum), - SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, SWITCH_TRUE, &globals.sip_trace, (void*)SWITCH_FALSE, config_callback_siptrace, NULL ), - SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, SWITCH_FALSE, &globals.integer, (void*)100, &config_opt_integer), + SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation), + SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, CONFIG_RELOADABLE, &globals.codec_negotiation, (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum), + SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, CONFIG_RELOADABLE, &globals.sip_trace, (void*)SWITCH_FALSE, config_callback_siptrace, NULL ), + SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, CONFIG_RELOADABLE | CONFIG_REQUIRED, &globals.integer, (void*)100, &config_opt_integer), SWITCH_CONFIG_ITEM_END() }; Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Thu Mar 5 14:18:27 2009 @@ -32,6 +32,8 @@ #include <switch.h> +switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL }; + SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event) { switch_xml_t node; @@ -79,10 +81,15 @@ switch_bool_t changed = SWITCH_FALSE; switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function; - if (reload && !item->reloadable) { + if (reload && !switch_test_flag(item, CONFIG_RELOADABLE)) { continue; } + if (!value && switch_test_flag(item, CONFIG_REQUIRED)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Required parameter [%s] is missing\n", item->key); + return SWITCH_STATUS_FALSE; + } + switch(item->type) { case SWITCH_CONFIG_INT: {

1 0

[commit] r12468 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 13:48:15 2009 New Revision: 12468 Log: Sofia logger goes to LOG_CONSOLE Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Thu Mar 5 13:48:15 2009 @@ -928,9 +928,9 @@ static void logger(void *logarg, char const *fmt, va_list ap) { if (fmt && ap) { - switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, fmt, ap); + switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, fmt, ap); } else if (fmt && !ap) { - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "%s", fmt); + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "%s", fmt); } }

1 0

[commit] r12467 - in freeswitch/trunk/src: . include mod/applications/mod_skel
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 10:57:26 2009 New Revision: 12467 Log: Lets make the parser free its stuff on shutdown, and let the callbacks do something if required Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/include/switch_xml_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml_config.h (original) +++ freeswitch/trunk/src/include/switch_xml_config.h Thu Mar 5 10:57:26 2009 @@ -68,7 +68,13 @@ struct switch_xml_config_item; typedef struct switch_xml_config_item switch_xml_config_item_t; -typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data, switch_bool_t changed); +typedef enum { + CONFIG_LOAD, + CONFIG_RELOAD, + CONFIG_SHUTDOWN +} switch_config_callback_type_t; + +typedef switch_status_t (*switch_xml_config_callback_t)(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed); /*! * \brief A configuration instruction read by switch_xml_config_parse @@ -114,6 +120,13 @@ * \param event [out] event (if *event is NOT NULL, the headers will be appended to the existing event) */ SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event); + + +/*! + * \brief Free any memory allocated by the configuration + * \param instructions instrutions on how to parse the elements + */ +SWITCH_DECLARE(void) switch_xml_config_cleanup(switch_xml_config_item_t *instructions); #endif /* !defined(SWITCH_XML_CONFIG_H) */ /* For Emacs: Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Thu Mar 5 10:57:26 2009 @@ -55,14 +55,15 @@ int integer; } globals; -static switch_status_t config_callback_siptrace(switch_xml_config_item_t *data, switch_bool_t changed) +static switch_status_t config_callback_siptrace(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed) { switch_bool_t value = *(switch_bool_t*)data->ptr; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "In siptrace callback: value %s changed %s\n", value ? "true" : "false", changed ? "true" : "false"); + /* - if (changed) { + if ((callback_type == CONFIG_LOG || callback_type == CONFIG_RELOAD) && changed) { nua_set_params(((sofia_profile_t*)data->functiondata)->nua, TPTAG_LOG(value), TAG_END()); } */ @@ -143,6 +144,8 @@ Macro expands to: switch_status_t mod_skel_shutdown() */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown) { + /* Cleanup dynamically allocated config settings */ + switch_xml_config_cleanup(instructions); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Thu Mar 5 10:57:26 2009 @@ -273,7 +273,7 @@ } if (callback) { - callback(item, changed); + callback(item, (reload ? CONFIG_RELOAD : CONFIG_LOAD), changed); } } @@ -299,6 +299,36 @@ return SWITCH_STATUS_SUCCESS; } + +SWITCH_DECLARE(void) switch_xml_config_cleanup(switch_xml_config_item_t *instructions) +{ + switch_xml_config_item_t *item; + + for (item = instructions; item->key; item++) { + switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function; + + switch (item->type) { + case SWITCH_CONFIG_STRING: + { + char **ptr = (char**)item->ptr; + switch_xml_config_string_options_t *string_options = (switch_xml_config_string_options_t*)item->data; + /* if (using_strdup) */ + if (string_options && !string_options->pool && !string_options->length) { + switch_safe_free(*ptr); + } + } + break; + default: + break; + } + + if (callback) { + callback(item, CONFIG_SHUTDOWN, SWITCH_FALSE); + } + + } +} + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r12466 - in freeswitch/trunk/src: . mod/applications/mod_conference
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: anthm Date: Thu Mar 5 10:53:31 2009 New Revision: 12466 Log: MODAPP-226 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_ivr.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 Thu Mar 5 10:53:31 2009 @@ -1563,7 +1563,7 @@ while (switch_test_flag(member, MFLAG_RUNNING) && switch_channel_ready(channel)) { - if (switch_channel_test_flag(channel, CF_SERVICE)) { + if (switch_channel_test_app_flag(channel, CF_APP_TAGGED)) { switch_yield(100000); continue; } @@ -1878,7 +1878,7 @@ } if (restarting) { - switch_channel_clear_flag(channel, CF_SERVICE); + switch_channel_clear_app_flag(channel, CF_APP_TAGGED); } /* Fair WARNING, If you expect the caller to hear anything or for digit handling to be processed, */ @@ -2094,9 +2094,9 @@ if (switch_core_session_private_event_count(member->session)) { - switch_channel_set_flag(channel, CF_SERVICE); + switch_channel_set_app_flag(channel, CF_APP_TAGGED); switch_ivr_parse_all_events(member->session); - switch_channel_clear_flag(channel, CF_SERVICE); + switch_channel_clear_app_flag(channel, CF_APP_TAGGED); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); switch_core_session_set_read_codec(member->session, &member->read_codec); } @@ -3697,7 +3697,7 @@ if (setup_media(member, new_conference)) { switch_clear_flag_locked(member, MFLAG_RUNNING); } else { - switch_channel_set_flag(channel, CF_SERVICE); + switch_channel_set_app_flag(channel, CF_APP_TAGGED); switch_set_flag_locked(member, MFLAG_RESTART); } } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Mar 5 10:53:31 2009 @@ -975,9 +975,10 @@ switch_ivr_parse_all_events(session); } - + if (eff_timeout) { digit_elapsed = (uint32_t) ((switch_micro_time_now() - digit_started) / 1000); + if (digit_elapsed >= eff_timeout) { status = SWITCH_STATUS_TIMEOUT; break; @@ -987,7 +988,7 @@ if (switch_channel_has_dtmf(channel)) { switch_dtmf_t dtmf = { 0 }; switch_size_t y; - + if (eff_timeout) { eff_timeout = digit_timeout; digit_started = switch_micro_time_now(); @@ -1006,6 +1007,7 @@ buf[x++] = dtmf.digit; buf[x] = '\0'; + if (x >= buflen || x >= maxdigits) { return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12465 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mikej Date: Thu Mar 5 10:44:28 2009 New Revision: 12465 Log: fix assert when calling speech_open without a pool Modified: freeswitch/trunk/src/switch_core_speech.c Modified: freeswitch/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/trunk/src/switch_core_speech.c (original) +++ freeswitch/trunk/src/switch_core_speech.c Thu Mar 5 10:44:28 2009 @@ -78,7 +78,7 @@ } sh->rate = rate; - sh->name = switch_core_strdup(pool, module_name); + sh->name = switch_core_strdup(sh->memory_pool, module_name); sh->samples = switch_samples_per_packet(rate, interval); sh->samplerate = rate; sh->native_rate = rate;

1 0

[commit] r12464 - in freeswitch/trunk: . src/mod/applications/mod_skel
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mikej Date: Thu Mar 5 10:38:30 2009 New Revision: 12464 Log: testing switch_xml_config on windows Added: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.2008.vcproj Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Thu Mar 5 10:38:30 2009 @@ -987,6 +987,11 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\spandsp\src\msvc\make_modem_filter.2008.vcproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skel", "src\mod\applications\mod_skel\mod_skel.2008.vcproj", "{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution All|Win32 = All|Win32 @@ -2384,6 +2389,13 @@ {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|Win32.Build.0 = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.ActiveCfg = All|Win32 {329A6FA0-0FCC-4435-A950-E670AEFA9838}.Release|x64.Build.0 = All|Win32 + {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|Win32.ActiveCfg = Release|x64 + {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|x64.ActiveCfg = Release|x64 + {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.All|x64.Build.0 = Release|x64 + {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|Win32.ActiveCfg = Debug|Win32 + {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|x64.ActiveCfg = Debug|x64 + {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|Win32.ActiveCfg = Release|Win32 + {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2419,6 +2431,7 @@ {329FD5B0-EF28-4606-86D0-F6EA21CF8E36} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {1A3793D1-05D1-4B57-9B0F-5AF3E79DC439} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {7877EFC8-4807-484B-B573-D7B7FD058FAA} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {A27CCA23-1541-4337-81A4-F0A6413078A0} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} Added: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.2008.vcproj Thu Mar 5 10:38:30 2009 @@ -0,0 +1,287 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_skel" + ProjectGUID="{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}" + RootNamespace="mod_skel" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_skel.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Thu Mar 5 10:38:30 2009 @@ -70,27 +70,28 @@ return SWITCH_STATUS_SUCCESS; } +static switch_xml_config_string_options_t config_opt_codec_negotiation = { NULL, 0, "greedy|generous|evil" }; +/* enforce_min, min, enforce_max, max */ +static switch_xml_config_int_options_t config_opt_integer = { SWITCH_TRUE, 0, SWITCH_TRUE, 10 }; +static switch_xml_config_enum_item_t config_opt_codec_negotiation_enum[] = { + { "greedy", CODEC_NEGOTIATION_GREEDY }, + { "generous", CODEC_NEGOTIATION_GENEROUS }, + { "evil", CODEC_NEGOTIATION_EVIL }, + { NULL, 0 } +}; + +static switch_xml_config_item_t instructions[] = { + /* parameter name type reloadable pointer default value options structure */ + SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation), + SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, SWITCH_TRUE, &globals.codec_negotiation, (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum), + SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, SWITCH_TRUE, &globals.sip_trace, (void*)SWITCH_FALSE, config_callback_siptrace, NULL ), + SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, SWITCH_FALSE, &globals.integer, (void*)100, &config_opt_integer), + SWITCH_CONFIG_ITEM_END() +}; + static switch_status_t do_config(switch_bool_t reload) { switch_xml_t cfg, xml, settings; - switch_xml_config_string_options_t config_opt_codec_negotiation = { NULL, 0, "greedy|generous|evil" }; - /* enforce_min, min, enforce_max, max */ - switch_xml_config_int_options_t config_opt_integer = { SWITCH_TRUE, 0, SWITCH_TRUE, 10 }; - switch_xml_config_enum_item_t config_opt_codec_negotiation_enum[] = { - { "greedy", CODEC_NEGOTIATION_GREEDY }, - { "generous", CODEC_NEGOTIATION_GENEROUS }, - { "evil", CODEC_NEGOTIATION_EVIL }, - { NULL, 0 } - }; - - switch_xml_config_item_t instructions[] = { - /* parameter name type reloadable pointer default value options structure */ - SWITCH_CONFIG_ITEM("codec-negotiation-str", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.codec_negotiation_str, "greedy", &config_opt_codec_negotiation), - SWITCH_CONFIG_ITEM("codec-negotiation", SWITCH_CONFIG_ENUM, SWITCH_TRUE, &globals.codec_negotiation, (void*)CODEC_NEGOTIATION_GREEDY, &config_opt_codec_negotiation_enum), - SWITCH_CONFIG_ITEM_CALLBACK("sip-trace", SWITCH_CONFIG_BOOL, SWITCH_TRUE, &globals.sip_trace, (void*)SWITCH_FALSE, config_callback_siptrace, NULL ), - SWITCH_CONFIG_ITEM("integer", SWITCH_CONFIG_INT, SWITCH_FALSE, &globals.integer, (void*)100, &config_opt_integer), - SWITCH_CONFIG_ITEM_END() - }; memset(&globals, 0, sizeof(globals));

1 0

[commit] r12463 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Thu Mar 5 10:16:20 2009 New Revision: 12463 Log: refactor Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/include/switch_xml_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml_config.h (original) +++ freeswitch/trunk/src/include/switch_xml_config.h Thu Mar 5 10:16:20 2009 @@ -97,6 +97,23 @@ */ SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions); +/*! + * \brief Parses all of an event's elements, following a ruleset defined by an array of switch_xml_config_item_t + * \param event The event structure containing the key and values to parse + * \param reload true to skip all non-reloadable options + * \param instructions instrutions on how to parse the elements + * \see switch_xml_config_item_t + */ +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions); + +/*! + * \brief Parses a list of xml elements into an event + * \param xml First element of the xml list to parse + * \param keyname Name of the key attribute + * \param keyvalue Name of the value attribute + * \param event [out] event (if *event is NOT NULL, the headers will be appended to the existing event) + */ +SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event); #endif /* !defined(SWITCH_XML_CONFIG_H) */ /* For Emacs: Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Thu Mar 5 10:16:20 2009 @@ -32,22 +32,48 @@ #include <switch.h> -SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions) +SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event) { - switch_xml_config_item_t *item; switch_xml_t node; - switch_event_t *event; - int file_count = 0, matched_count = 0; + switch_size_t count = 0; - switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS); - switch_assert(event); - + if (!*event) { + switch_event_create(event, SWITCH_EVENT_REQUEST_PARAMS); + switch_assert(event); + } for (node = xml; node; node = node->next) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, switch_xml_attr_soft(node, "name"), switch_xml_attr_soft(node, "value")); - file_count++; + const char *key = switch_xml_attr_soft(node, keyname); + const char *value = switch_xml_attr_soft(node, valuename); + if (key && value) { + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, key, value); + count++; + } } + return count; +} + +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions) +{ + switch_event_t *event; + switch_status_t result; + int count = switch_event_import_xml(xml, "name", "value", &event); + + result = switch_xml_config_parse_event(event, count, reload, instructions); + + if (event) { + switch_event_destroy(&event); + } + + return result; +} + +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions) +{ + switch_xml_config_item_t *item; + int file_count = 0, matched_count = 0; + for (item = instructions; item->key; item++) { const char *value = switch_event_get_header(event, item->key); switch_bool_t changed = SWITCH_FALSE; @@ -252,67 +278,26 @@ } if (file_count > matched_count) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Config file had %d params but only %d were valid\n", file_count, matched_count); - } - - switch_event_destroy(&event); - - return SWITCH_STATUS_SUCCESS; -} - - -#ifdef SWITCH_XML_CONFIG_TEST -typedef enum { - MYENUM_TEST1 = 1, - MYENUM_TEST2 = 2, - MYENUM_TEST3 = 3 -} myenum_t; - -static struct { - char *stringalloc; - char string[50]; - myenum_t enumm; - int yesno; - -} globals; - - -SWITCH_DECLARE(void) switch_xml_config_test() -{ - char *cf = "test.conf"; - switch_xml_t cfg, xml, settings; - switch_xml_config_string_options_t config_opt_stringalloc = { NULL, 0, NULL }; /* No pool, use strdup, no regex */ - switch_xml_config_string_options_t config_opt_buffer = { NULL, 50, NULL }; /* No pool, use current var as buffer, no regex */ - switch_xml_config_enum_item_t enumm_options[] = { - { "test1", MYENUM_TEST1 }, - { "test2", MYENUM_TEST2 }, - { "test3", MYENUM_TEST3 }, - { NULL, 0 } - }; - - switch_xml_config_item_t instructions[] = { - SWITCH_CONFIG_ITEM("db_host", SWITCH_CONFIG_STRING, SWITCH_TRUE, &globals.stringalloc, "blah", &config_opt_stringalloc), - SWITCH_CONFIG_ITEM("db_user", SWITCH_CONFIG_STRING, SWITCH_TRUE, globals.string, "dflt", &config_opt_buffer ), - SWITCH_CONFIG_ITEM("test", SWITCH_CONFIG_ENUM, SWITCH_FALSE, &globals.enumm, (void*)MYENUM_TEST1, enumm_options), - SWITCH_CONFIG_ITEM_END() - }; - - if (!(xml = switch_xml_open_cfg("blaster.conf", &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open %s\n", cf); - return; - } - - if ((settings = switch_xml_child(cfg, "settings"))) { - if (switch_xml_config_parse(switch_xml_child(settings, "param"), 0, instructions) == SWITCH_STATUS_SUCCESS) { - printf("YAY!\n"); + /* User made a mistake, find it */ + switch_event_header_t *header; + for (header = event->headers; header; header = header->next) { + switch_bool_t found = SWITCH_FALSE; + for (item = instructions; item->key; item++) { + if (strcasecmp(header->name, item->key)) { + found = SWITCH_TRUE; + break; + } + } + + if (!found) { + /* Tell the user */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Configuration parameter [%s] is unfortunately not valid, you might want to double-check that.\n", header->name); + } } } - if (cfg) { - switch_xml_free(cfg); - } + return SWITCH_STATUS_SUCCESS; } -#endif /* For Emacs: * Local Variables:

1 0

[commit] r12462 - freeswitch/trunk
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mikej Date: Thu Mar 5 10:14:35 2009 New Revision: 12462 Log: silence some useless sun cc warnings Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Mar 5 10:14:35 2009 @@ -131,6 +131,9 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -KPIC) APR_ADDTO(SWITCH_AM_CFLAGS, -DPIC) + APR_ADDTO(SWITCH_AM_CFLAGS, -erroff=E_END_OF_LOOP_CODE_NOT_REACHED) + APR_ADDTO(SWITCH_AM_CFLAGS, -errtags=yes) + APR_ADDTO(SWITCH_AM_CXXFLAGS, -errtags=yes) APR_ADDTO(SWITCH_AM_CXXFLAGS, -KPIC) APR_ADDTO(SWITCH_AM_CXXFLAGS, -DPIC) APR_ADDTO(SWITCH_AM_CXXFLAGS, "-features=extensions")

1 0