- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3603 - freeswitch/branches/rsanders
by Freeswitch SVN 11 Dec '06

11 Dec '06

Author: sphere Date: Mon Dec 11 09:06:32 2006 New Revision: 3603 Added: freeswitch/branches/rsanders/ Log: Creating empty folder for rsanders

1 0

[commit] r3602 - freeswitch/branches/miguel
by Freeswitch SVN 11 Dec '06

11 Dec '06

Author: sphere Date: Sun Dec 10 22:42:29 2006 New Revision: 3602 Added: freeswitch/branches/miguel/ Log: Creating empty folder for miguel

1 0

[commit] r3601 - in freeswitch/trunk/src: . include
by Freeswitch SVN 10 Dec '06

10 Dec '06

Author: mikej Date: Sun Dec 10 17:22:28 2006 New Revision: 3601 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/switch_ivr.c Log: separate the stream context from the parser context merged from knhor branch, thanks Neal. Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Sun Dec 10 17:22:28 2006 @@ -406,8 +406,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_transfer_variable(switch_core_session_t *sessa, switch_core_session_t *sessb, char *var); +/******************************************************************************************************/ + struct switch_ivr_digit_stream_parser; typedef struct switch_ivr_digit_stream_parser switch_ivr_digit_stream_parser_t; +struct switch_ivr_digit_stream; +typedef struct switch_ivr_digit_stream switch_ivr_digit_stream_t; /*! \brief Create a digit stream parser object \param pool the pool to use for the new hash @@ -418,12 +422,27 @@ /*! \brief Destroy a digit stream parser object - \param parser a pointer to the object pointer + \param parser a pointer to the parser object \return SWITCH_STATUS_SUCCESS if all is well */ -SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_parser_destroy(switch_ivr_digit_stream_parser_t **parser); +SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_parser_destroy(switch_ivr_digit_stream_parser_t *parser); /*! + \brief Create a new digit stream object + \param parser a pointer to the parser object created by switch_ivr_digit_stream_parser_new + \param stream a pointer to the stream object pointer + \return NULL if no match found or consumer data that was associated with a given digit string when matched +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_new(switch_ivr_digit_stream_parser_t *parser, switch_ivr_digit_stream_t **stream); + +/*! + \brief Destroys a digit stream object + \param stream a pointer to the stream object + \return NULL if no match found or consumer data that was associated with a given digit string when matched +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_destroy(switch_ivr_digit_stream_t *stream); + +/*! \brief Set a digit string to action mapping \param parser a pointer to the parser object created by switch_ivr_digit_stream_parser_new \param digits a string of digits to associate with an action @@ -446,14 +465,14 @@ \param digit a digit to collect and test against the map of digit strings \return NULL if no match found or consumer data that was associated with a given digit string when matched */ -SWITCH_DECLARE(void *) switch_ivr_digit_stream_parser_feed(switch_ivr_digit_stream_parser_t *parser, char digit); +SWITCH_DECLARE(void *) switch_ivr_digit_stream_parser_feed(switch_ivr_digit_stream_parser_t *parser, switch_ivr_digit_stream_t *stream, char digit); /*! \brief Reset the collected digit stream to nothing - \param parser a pointer to the parser object created by switch_ivr_digit_stream_parser_new + \param stream a pointer to the parser stream object created by switch_ivr_digit_stream_new \return SWITCH_STATUS_SUCCESS if all is well */ -SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_parser_reset(switch_ivr_digit_stream_parser_t *parser); +SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_reset(switch_ivr_digit_stream_t *stream); /*! \brief Set a digit string terminator @@ -462,6 +481,10 @@ \return SWITCH_STATUS_SUCCESS if all is well */ SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_parser_set_terminator(switch_ivr_digit_stream_parser_t *parser, char digit); + + +/******************************************************************************************************/ + /** @} */ Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sun Dec 10 17:22:28 2006 @@ -3495,11 +3495,14 @@ int pool_auto_created; switch_memory_pool_t *pool; switch_hash_t *hash; - char *digits; - char terminator; switch_size_t maxlen; switch_size_t minlen; + char terminator; unsigned int digit_timeout_ms; +}; + +struct switch_ivr_digit_stream { + char *digits; switch_time_t last_digit_time; }; @@ -3544,25 +3547,50 @@ return status; } -SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_parser_destroy(switch_ivr_digit_stream_parser_t **parser) +SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_parser_destroy(switch_ivr_digit_stream_parser_t *parser) { switch_status_t status = SWITCH_STATUS_FALSE; - if (parser != NULL && *parser != NULL) { - if ((*parser)->hash != NULL) { - switch_core_hash_destroy((*parser)->hash); - (*parser)->hash = NULL; + if (parser != NULL) { + if (parser->hash != NULL) { + switch_core_hash_destroy(parser->hash); + parser->hash = NULL; } // free the memory pool if we created it - if ((*parser)->pool_auto_created && (*parser)->pool != NULL) { - status = switch_core_destroy_memory_pool(&(*parser)->pool); + if (parser->pool_auto_created && parser->pool != NULL) { + status = switch_core_destroy_memory_pool(&parser->pool); } - // clean up for the caller - *parser = NULL; } return status; } +SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_new(switch_ivr_digit_stream_parser_t *parser, switch_ivr_digit_stream_t **stream) +{ switch_status_t status = SWITCH_STATUS_FALSE; + + // if we have a paser object memory pool and a stream object pointer that is null + if (parser != NULL && parser->pool && stream != NULL && *stream == NULL) { + *stream = (switch_ivr_digit_stream_t *)switch_core_alloc(parser->pool,sizeof(switch_ivr_digit_stream_t)); + if (*stream != NULL) { + memset(*stream,0,sizeof(switch_ivr_digit_stream_t)); + status = SWITCH_STATUS_SUCCESS; + } + } + + return status; +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_destroy(switch_ivr_digit_stream_t *stream) +{ switch_status_t status = SWITCH_STATUS_FALSE; + + if (stream == NULL && stream->digits != NULL) { + free(stream->digits); + stream->digits = NULL; + status = SWITCH_STATUS_SUCCESS; + } + + return status; +} + SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_parser_set_event(switch_ivr_digit_stream_parser_t *parser, char *digits, void *data) { switch_status_t status = SWITCH_STATUS_FALSE; @@ -3613,11 +3641,11 @@ return status; } -SWITCH_DECLARE(void *) switch_ivr_digit_stream_parser_feed(switch_ivr_digit_stream_parser_t *parser, char digit) +SWITCH_DECLARE(void *) switch_ivr_digit_stream_parser_feed(switch_ivr_digit_stream_parser_t *parser, switch_ivr_digit_stream_t *stream, char digit) { void *result = NULL; - if (parser != NULL) { - switch_size_t len = (parser->digits != NULL ? strlen(parser->digits) : 0); + if (parser != NULL && stream != NULL) { + switch_size_t len = (stream->digits != NULL ? strlen(stream->digits) : 0); // handle new digit arrivals if(digit != '\0') { @@ -3627,37 +3655,37 @@ // if collected digits length >= the max length of the keys // in the hash table, then left shift the digit string if (len > 0 && parser->maxlen != 0 && len >= parser->maxlen) { - char *src = parser->digits + 1; - char *dst = parser->digits; + char *src = stream->digits + 1; + char *dst = stream->digits; while (*src) { *(dst++) = *(src++); } *dst = digit; } else { - parser->digits = realloc(parser->digits,len+2); - *(parser->digits+(len++)) = digit; - *(parser->digits+len) = '\0'; - parser->last_digit_time = switch_time_now() / 1000; + stream->digits = realloc(stream->digits,len+2); + *(stream->digits+(len++)) = digit; + *(stream->digits+len) = '\0'; + stream->last_digit_time = switch_time_now() / 1000; } } } // don't allow collected digit string testing if there are varying sized keys until timeout if ( parser->maxlen - parser->minlen > 0 - && (switch_time_now() / 1000) - parser->last_digit_time < parser->digit_timeout_ms + && (switch_time_now() / 1000) - stream->last_digit_time < parser->digit_timeout_ms ) { len = 0; } // if we have digits to test if (len) { - result = switch_core_hash_find(parser->hash,parser->digits); + result = switch_core_hash_find(parser->hash, stream->digits); // if we matched the digit string, or this digit is the terminator // reset the collected digits for next digit string if (result != NULL || parser->terminator == digit) { - free(parser->digits); - parser->digits = NULL; + free(stream->digits); + stream->digits = NULL; } } } @@ -3665,12 +3693,13 @@ return result; } -SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_parser_reset(switch_ivr_digit_stream_parser_t *parser) +SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_reset(switch_ivr_digit_stream_t *stream) { switch_status_t status = SWITCH_STATUS_FALSE; - if (parser != NULL && parser->digits != NULL) { - free(parser->digits); - parser->digits = NULL; + if (stream != NULL && stream->digits != NULL) { + free(stream->digits); + stream->digits = NULL; + stream->last_digit_time = 0; status = SWITCH_STATUS_SUCCESS; }

1 0

[commit] r3600 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 10 Dec '06

10 Dec '06

Author: mikej Date: Sun Dec 10 17:19:22 2006 New Revision: 3600 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: actually add the application. (thanks knhor) 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 Sun Dec 10 17:19:22 2006 @@ -403,7 +403,7 @@ /* long_desc */ "Detect speech on a channel.", /* short_desc */ "Detect speech", /* syntax */ "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR pause OR resume", - /*.next */ NULL + /*.next */ &ivr_application_interface }; static const switch_application_interface_t ringback_application_interface = {

1 0

[commit] r3599 - in freeswitch/branches/knhor/trunk: . conf src src/mod/endpoints/mod_sofia src/mod/xml_int/mod_xml_curl src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 10 Dec '06

10 Dec '06

Author: knhor Date: Sun Dec 10 16:11:00 2006 New Revision: 3599 Added: freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/ - copied from r3593, /freeswitch/trunk/src/mod/xml_int/mod_xml_curl/ freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/Makefile - copied unchanged from r3593, /freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c - copied unchanged from r3593, /freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj - copied unchanged from r3593, /freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj Modified: freeswitch/branches/knhor/trunk/ (props changed) freeswitch/branches/knhor/trunk/Freeswitch.sln freeswitch/branches/knhor/trunk/conf/freeswitch.xml freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/Makefile freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/branches/knhor/trunk/src/switch_ivr.c Log: Merged revisions 3588-3598 via svnmerge trunk Modified: freeswitch/branches/knhor/trunk/Freeswitch.sln ============================================================================== --- freeswitch/branches/knhor/trunk/Freeswitch.sln (original) +++ freeswitch/branches/knhor/trunk/Freeswitch.sln Sun Dec 10 16:11:00 2006 @@ -273,7 +273,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} @@ -282,6 +281,7 @@ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" @@ -616,6 +616,16 @@ {7E60CC2D-E818-4712-8F16-C0E6EC64982F} = {7E60CC2D-E818-4712-8F16-C0E6EC64982F} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1006,6 +1016,10 @@ {7E60CC2D-E818-4712-8F16-C0E6EC64982F}.Release|Win32.ActiveCfg = Release|Win32 {DEB84241-385F-471F-A6B6-0C93FBB3B03D}.Debug|Win32.ActiveCfg = Debug|Win32 {DEB84241-385F-471F-A6B6-0C93FBB3B03D}.Release|Win32.ActiveCfg = Release|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.ActiveCfg = Debug|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.Build.0 = Debug|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.ActiveCfg = Release|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1091,6 +1105,7 @@ {692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A} {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} + {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C120A020-773F-4EA3-923F-B67AF28B750D} {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E969F3E0-1043-482A-AD49-787B8356BA92} = {C120A020-773F-4EA3-923F-B67AF28B750D} Modified: freeswitch/branches/knhor/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/branches/knhor/trunk/conf/freeswitch.xml (original) +++ freeswitch/branches/knhor/trunk/conf/freeswitch.xml Sun Dec 10 16:11:00 2006 @@ -28,6 +28,7 @@   +    @@ -334,6 +335,16 @@ </configuration> + <configuration name="xml_curl.conf" description="cURL XML Gateway"> + <settings> +  +  +  + </settings> + </configuration> + <configuration name="xml_rpc.conf" description="XML RPC"> <settings>  @@ -342,10 +353,6 @@ <param name="auth-realm" value="freeswitch"/> <param name="auth-user" value="freeswitch"/> <param name="auth-pass" value="works"/> -  -  -  -  </settings> </configuration> Modified: freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sun Dec 10 16:11:00 2006 @@ -3705,14 +3705,13 @@ switch_core_session_t *bsession; if ((bsession = switch_core_session_locate(br))) { - channel = switch_core_session_get_channel(bsession); switch_channel_set_variable(channel, "TRANSFER_FALLBACK", (char *) from->a_user); switch_ivr_session_transfer(bsession, exten, profile->dialplan, profile->context); switch_core_session_rwunlock(bsession); } - + switch_channel_set_variable(channel, "endpoint_disposition", "BLIND_TRANSFER"); - + nua_notify(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), @@ -4008,8 +4007,8 @@ } attach_private(session, profile, tech_pvt, username); - switch_core_session_read_lock(session); - switch_set_flag(tech_pvt, TFLAG_RWLOCK); + //switch_core_session_read_lock(session); + //switch_set_flag(tech_pvt, TFLAG_RWLOCK); channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, "endpoint_disposition", "INBOUND CALL"); set_chat_hash(tech_pvt, sip); Modified: freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Sun Dec 10 16:11:00 2006 @@ -1,9 +1,8 @@ -LDFLAGS += -lxmlrpc -lxmlrpc_abyss -lxmlrpc_server -lxmlrpc_server_abyss -lxmlrpc_xmlparse -lcurl +LDFLAGS += -lxmlrpc -lxmlrpc_abyss -lxmlrpc_server -lxmlrpc_server_abyss -lxmlrpc_xmlparse all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install xmlrpc-c-1.03.14.tgz --prefix=$(PREFIX) --disable-cplusplus --disable-wininet-client --disable-libwww-client Modified: freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Sun Dec 10 16:11:00 2006 @@ -37,104 +37,9 @@ #include <xmlrpc-c/abyss.h> #include <xmlrpc-c/server.h> #include <xmlrpc-c/server_abyss.h> -#include <curl/curl.h> - - static const char modname[] = "mod_xml_rpc"; - - -static struct { - uint16_t port; - uint8_t running; - char *url; - char *bindings; - char *realm; - char *user; - char *pass; -} globals; - -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_url, globals.url); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_bindings, globals.bindings); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_realm, globals.realm); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_user, globals.user); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_pass, globals.pass); - -struct config_data { - char *name; - int fd; -}; - -static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data) -{ - register unsigned int realsize = (unsigned int)(size * nmemb); - struct config_data *config_data = data; - - write(config_data->fd, ptr, realsize); - return realsize; -} - - -static switch_xml_t xml_url_fetch(char *section, - char *tag_name, - char *key_name, - char *key_value, - char *params) -{ - char filename[1024] = ""; - CURL *curl_handle = NULL; - struct config_data config_data; - switch_xml_t xml = NULL; - char *data = NULL; - - if (!(data = switch_mprintf("section=%s&tag_name=%s&key_name=%s&key_value=%s%s%s\n", - section, - tag_name ? tag_name : "", - key_name ? key_name : "", - key_value ? key_value : "", - params ? "&" : "", params ? params : ""))) { - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - return NULL; - } - - srand((unsigned int)(time(NULL) + strlen(globals.url))); - snprintf(filename, sizeof(filename), "%s%04x.tmp", SWITCH_GLOBAL_dirs.temp_dir, (rand() & 0xffff)); - curl_handle = curl_easy_init(); - if (!strncasecmp(globals.url, "https", 5)) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); - } - - config_data.name = filename; - if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC)) > -1) { - curl_easy_setopt(curl_handle, CURLOPT_POST, 1); - curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, data); - curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); - curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&config_data); - curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); - curl_easy_perform(curl_handle); - curl_easy_cleanup(curl_handle); - close(config_data.fd); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); - } - - switch_safe_free(data); - - if (!(xml = switch_xml_parse_file(filename))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); - } - - unlink(filename); - - return xml; -} - - - static switch_loadable_module_interface_t xml_rpc_module_interface = { /*.module_name */ modname, /*.endpoint_interface */ NULL, @@ -148,6 +53,18 @@ /*.directory_interface */ NULL }; +static struct { + uint16_t port; + uint8_t running; + char *realm; + char *user; + char *pass; +} globals; + +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_realm, globals.realm); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_user, globals.user); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_pass, globals.pass); + static switch_status_t do_config(void) { char *cf = "xml_rpc.conf"; @@ -171,10 +88,6 @@ user = val; } else if (!strcasecmp(var, "auth-pass")) { pass = val; - } else if (!strcasecmp(var, "gateway-url")) { - char *bindings = (char *) switch_xml_attr_soft(param, "bindings"); - set_global_bindings(bindings); - set_global_url(val); } else if (!strcasecmp(var, "http-port")) { globals.port = (uint16_t)atoi(val); } @@ -191,7 +104,7 @@ } switch_xml_free(xml); - return globals.url ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; + return SWITCH_STATUS_SUCCESS; } @@ -202,13 +115,8 @@ memset(&globals, 0, sizeof(globals)); - if (do_config() == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding XML Fetch Function [%s] [%s]\n", globals.url, globals.bindings ? globals.bindings : "all"); - switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(globals.bindings)); - } + do_config(); - curl_global_init(CURL_GLOBAL_ALL); - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } @@ -353,7 +261,6 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) { globals.running = 0; - curl_global_cleanup(); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/knhor/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/switch_ivr.c (original) +++ freeswitch/branches/knhor/trunk/src/switch_ivr.c Sun Dec 10 16:11:00 2006 @@ -3287,9 +3287,18 @@ switch_channel_event_set_data(caller_channel, event); switch_event_fire(&event); } + + if (switch_channel_get_state(caller_channel) != CS_EXECUTE && !switch_channel_test_flag(caller_channel, CF_TRANSFER)) { switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_CLEARING); } + + if (switch_channel_test_flag(caller_channel, CF_TRANSFER) && !switch_channel_test_flag(peer_channel, CF_TRANSFER)) { + switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING); + } + if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && switch_channel_test_flag(peer_channel, CF_TRANSFER)) { + switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_CLEARING); + } this_audio_thread->objs[0] = NULL; this_audio_thread->objs[1] = NULL;

1 0

[commit] r3598 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 10 Dec '06

10 Dec '06

Author: knhor Date: Sun Dec 10 16:08:25 2006 New Revision: 3598 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: move both caller controls and ivr menus out of the conference profile into their own sections with conference.conf xml section Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Sun Dec 10 16:08:25 2006 @@ -147,6 +147,15 @@ struct confernce_file_node *next; } confernce_file_node_t; +/* conference xml config sections */ +typedef struct conf_xml_cfg { + switch_xml_t profile; + switch_xml_t controls; +#ifdef OPTION_IVR_MENU_SUPPORT + switch_xml_t menus; +#endif +} conf_xml_cfg_t; + /* Conference Object */ typedef struct conference_obj { char *name; @@ -272,7 +281,7 @@ static switch_status_t conference_member_play_file(conference_member_t *member, char *file, uint32_t leadin); static switch_status_t conference_member_say(conference_member_t *member, char *text, uint32_t leadin); static uint32_t conference_member_stop_file(conference_member_t *member, file_stop_t stop); -static conference_obj_t *conference_new(char *name, switch_xml_t profile, switch_memory_pool_t *pool); +static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_memory_pool_t *pool); static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint); static void launch_conference_record_thread(conference_obj_t *conference, char *path); @@ -2457,7 +2466,7 @@ switch_channel_t *channel; switch_event_t *event; char *profile_name; - switch_xml_t cxml = NULL, cfg = NULL, profile = NULL, profiles = NULL; + switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; if (!(member = conference_member_get(conference, id))) { stream->write_function(stream, "No Member %u in conference %s.\n", id, conference->name); @@ -2470,6 +2479,7 @@ if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[3]))) { switch_memory_pool_t *pool; char *conf_name; + conf_xml_cfg_t xml_cfg; /* Setup a memory pool to use. */ if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { @@ -2489,8 +2499,12 @@ } if ((profiles = switch_xml_child(cfg, "profiles"))) { - profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); } + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); +#ifdef OPTION_IVR_MENU_SUPPORT + xml_cfg.menus = switch_xml_child(cfg, "menus"); +#endif } /* Release the config registry handle */ @@ -2500,7 +2514,7 @@ } /* Create the conference object. */ - new_conference = conference_new(conf_name, profile, pool); + new_conference = conference_new(conf_name, xml_cfg, pool); if (!new_conference) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); @@ -2907,12 +2921,13 @@ char *flags_prefix = "+flags{"; char *bridgeto = NULL; char *profile_name = NULL; - switch_xml_t cxml = NULL, cfg = NULL, profile = NULL, profiles = NULL; + switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; char *flags_str; member_flag_t uflags = MFLAG_CAN_SPEAK | MFLAG_CAN_HEAR; switch_core_session_message_t msg = {0}; uint8_t rl = 0, isbr = 0; char *dpin = NULL; + conf_xml_cfg_t xml_cfg; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -2975,8 +2990,13 @@ } if ((profiles = switch_xml_child(cfg, "profiles"))) { - profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); } + + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); +#ifdef OPTION_IVR_MENU_SUPPORT + xml_cfg.menus = switch_xml_child(cfg, "menus"); +#endif } /* if this is a bridging call, and it's not a duplicate, build a */ @@ -2994,7 +3014,7 @@ } /* Create the conference object. */ - conference = conference_new(conf_name, profile, pool); + conference = conference_new(conf_name, xml_cfg, pool); if (!conference) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); @@ -3021,7 +3041,7 @@ freepool = pool; /* couldn't find the conference, create one */ } else { - conference = conference_new(conf_name, profile, pool); + conference = conference_new(conf_name, xml_cfg, pool); if (!conference) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); @@ -3487,15 +3507,15 @@ } */ -static switch_status_t conference_caller_control_menu_build(caller_control_menu_ctx_t **ctx, conference_obj_t *conference, switch_xml_t profile, char *menu_name) +static switch_status_t conference_caller_control_menu_build(caller_control_menu_ctx_t **ctx, conference_obj_t *conference, switch_xml_t menu_group, char *menu_name) { switch_status_t status = SWITCH_STATUS_FALSE; - if (ctx != NULL && conference != NULL && profile != NULL && menu_name != NULL) { - switch_xml_t xml_menus = switch_xml_child(profile, "menus"); + if (ctx != NULL && conference != NULL && menu_group != NULL && menu_name != NULL) { + switch_xml_t xml_menus = switch_xml_child(menu_group, "menus"); switch_xml_t xml_menu = (xml_menus != NULL ? switch_xml_find_child(xml_menus, "menu", "name", menu_name) : NULL); - /* if we found the requested menu in our profile */ + /* if we found the requested menu in our menu_group */ if (xml_menu != NULL && xml_menu != NULL) { *ctx = (caller_control_menu_ctx_t *)switch_core_alloc(conference->pool,sizeof(caller_control_menu_ctx_t)); @@ -3575,11 +3595,11 @@ return status; } -static switch_status_t conference_new_install_caller_controls_custom(conference_obj_t *conference, switch_xml_t profile, switch_xml_t xml_controls) +static switch_status_t conference_new_install_caller_controls_custom(conference_obj_t *conference, switch_xml_t xml_controls, switch_xml_t xml_menus) { switch_status_t status = SWITCH_STATUS_FALSE; - if (conference != NULL && profile != NULL && xml_controls != NULL) { + if (conference != NULL && xml_controls != NULL) { switch_xml_t xml_kvp; /* parse the controls tree for caller control digit strings */ @@ -3599,15 +3619,34 @@ if(strcasecmp(ccfntbl[i].key,key) == 0) { status = SWITCH_STATUS_SUCCESS; #ifdef OPTION_IVR_MENU_SUPPORT - if (ccfntbl[i].action == CALLER_CONTROL_MENU) { - caller_control_menu_ctx_t *menu_ctx = NULL; + if (xml_menus != NULL && ccfntbl[i].action == CALLER_CONTROL_MENU) { + char *menu_group_name = strdup(data); + char *menu_name = (menu_group_name != NULL ? strchr(menu_group_name,'/') : NULL); - status = conference_caller_control_menu_build(&menu_ctx,conference,profile,data); - data = (char *)menu_ctx; + /* format: "menu_group_name/menu_name" */ + /* separate the menu name from the menu group */ + if (menu_name != NULL) { + *(menu_name++) = '\0'; + } + /* if there is a menu name, build the menu */ + if (menu_name != NULL) { + caller_control_menu_ctx_t *menu_ctx = NULL; + switch_xml_t menu_group = switch_xml_find_child(xml_menus, "group", "name", menu_group_name); + status = conference_caller_control_menu_build(&menu_ctx, conference, menu_group, menu_name); + data = (char *)menu_ctx; + } else { + status = SWITCH_STATUS_FALSE; + } + if (status != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to build menu '%s' bound to '%s'\n",data,val); } + + /* clean up */ + if (menu_group_name != NULL) { + free(menu_group_name); + } } #endif @@ -3640,12 +3679,10 @@ } /* create a new conferene with a specific profile */ -static conference_obj_t *conference_new(char *name, switch_xml_t profile, switch_memory_pool_t *pool) +static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_memory_pool_t *pool) { conference_obj_t *conference; switch_xml_t xml_kvp; - switch_xml_t xml_controls; - char *controls_set = NULL; char *rate_name = NULL; char *interval_name = NULL; char *timer_name = NULL; @@ -3667,6 +3704,7 @@ char *energy_level = NULL; char *caller_id_name = NULL; char *caller_id_number = NULL; + char *caller_controls = NULL; uint32_t rate = 8000, interval = 20; switch_status_t status; @@ -3677,7 +3715,7 @@ } /* parse the profile tree for param values */ - for (xml_kvp = switch_xml_child(profile, "param"); xml_kvp; xml_kvp = xml_kvp->next) { + 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"); char buf[128] = ""; @@ -3735,6 +3773,8 @@ caller_id_name = val; } else if (!strcasecmp(var, "caller-id-number")) { caller_id_number = val; + } else if (!strcasecmp(var, "caller-controls")) { + caller_controls = val; } } @@ -3858,26 +3898,25 @@ conference->interval = interval; conference->dtmf_parser = NULL; - if(switch_ivr_digit_stream_parser_new(conference->pool,&conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) { + /* caller control configuration chores */ + if(switch_ivr_digit_stream_parser_new(conference->pool, &conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) { - /* caller control configuration chores */ - xml_controls = switch_xml_child(profile, "controls"); - controls_set = (xml_controls != NULL ? (char *) switch_xml_attr_soft(xml_controls, "set") : NULL); - - if (xml_controls == NULL) { - /* if no controls specified in the config, assume all should be specified */ + /* if no controls, or default controls specified, install default */ + if (caller_controls == NULL || *caller_controls == '\0' || strcasecmp(caller_controls, "default") == 0) { status = conference_new_install_caller_controls_default(conference); - } else if (xml_controls != NULL && controls_set != NULL && strcasecmp(controls_set,"none") != 0) { - /* try to build caller control if the set has been specified and != "none" */ - if (strcasecmp(controls_set,"default") == 0) { - status = conference_new_install_caller_controls_default(conference); - } else if (strcasecmp(controls_set,"custom") == 0) { - status = conference_new_install_caller_controls_custom(conference,profile,xml_controls); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown caller control set.\n"); + } else if (strcasecmp(caller_controls,"none") != 0) { + /* try to build caller control if the group has been specified and != "none" */ + switch_xml_t xml_controls = switch_xml_find_child(cfg.controls, "group", "name", caller_controls); +#ifdef OPTION_IVR_MENU_SUPPORT + status = conference_new_install_caller_controls_custom(conference, xml_controls, cfg.menus); +#else + status = conference_new_install_caller_controls_custom(conference, xml_controls, NULL); +#endif + if (status != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to install caller controls group '%s'\n",caller_controls); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no caller controls intalled.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "no caller controls intalled.\n"); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate caller control digit parser.\n");

1 0

[commit] r3593 - in freeswitch/trunk: . src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 10 Dec '06

10 Dec '06

Author: mikej Date: Sun Dec 10 03:07:20 2006 New Revision: 3593 Added: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj Modified: freeswitch/trunk/Freeswitch.sln Log: mod_xml_curl windows build. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sun Dec 10 03:07:20 2006 @@ -273,7 +273,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} @@ -282,6 +281,7 @@ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" @@ -616,6 +616,16 @@ {7E60CC2D-E818-4712-8F16-C0E6EC64982F} = {7E60CC2D-E818-4712-8F16-C0E6EC64982F} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1006,6 +1016,10 @@ {7E60CC2D-E818-4712-8F16-C0E6EC64982F}.Release|Win32.ActiveCfg = Release|Win32 {DEB84241-385F-471F-A6B6-0C93FBB3B03D}.Debug|Win32.ActiveCfg = Debug|Win32 {DEB84241-385F-471F-A6B6-0C93FBB3B03D}.Release|Win32.ActiveCfg = Release|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.ActiveCfg = Debug|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.Build.0 = Debug|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.ActiveCfg = Release|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1091,6 +1105,7 @@ {692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A} {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} + {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C120A020-773F-4EA3-923F-B67AF28B750D} {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {C120A020-773F-4EA3-923F-B67AF28B750D} {E969F3E0-1043-482A-AD49-787B8356BA92} = {C120A020-773F-4EA3-923F-B67AF28B750D} Added: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj Sun Dec 10 03:07:20 2006 @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="mod_xml_curl" + ProjectGUID="{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" + RootNamespace="mod_xml_curl" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="Winmm.lib Ws2_32.lib" + OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" + LinkIncremental="1" + AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)";..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + SubSystem="2" + ImportLibrary="$(OutDir)/mod_xml_curl.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="Winmm.lib Ws2_32.lib" + OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" + LinkIncremental="1" + AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)";..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)/mod_xml_curl.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\mod_xml_curl.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject>

1 0

[commit] r3592 - in freeswitch/trunk: conf src/mod/xml_int/mod_xml_curl src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 10 Dec '06

10 Dec '06

Author: anthm Date: Sat Dec 9 21:02:30 2006 New Revision: 3592 Added: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: separate xml gateway code from mod_xml_rpc into it's own mod_xml_curl Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Sat Dec 9 21:02:30 2006 @@ -28,6 +28,7 @@   +    @@ -334,6 +335,16 @@ </configuration> + <configuration name="xml_curl.conf" description="cURL XML Gateway"> + <settings> +  +  +  + </settings> + </configuration> + <configuration name="xml_rpc.conf" description="XML RPC"> <settings>  @@ -342,10 +353,6 @@ <param name="auth-realm" value="freeswitch"/> <param name="auth-user" value="freeswitch"/> <param name="auth-pass" value="works"/> -  -  -  -  </settings> </configuration> Added: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile Sat Dec 9 21:02:30 2006 @@ -0,0 +1,18 @@ +LDFLAGS += -lcurl + +all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +depends: + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) + + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c + $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o + $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) + + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Added: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Sat Dec 9 21:02:30 2006 @@ -0,0 +1,196 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * mod_xml_curl.c -- CURL XML Gateway + * + */ +#include <switch.h> +#include <curl/curl.h> + +static const char modname[] = "mod_xml_curl"; + +static struct { + char *url; + char *bindings; +} globals; + +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_url, globals.url); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_bindings, globals.bindings); + +struct config_data { + char *name; + int fd; +}; + +static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data) +{ + register unsigned int realsize = (unsigned int)(size * nmemb); + struct config_data *config_data = data; + + write(config_data->fd, ptr, realsize); + return realsize; +} + + +static switch_xml_t xml_url_fetch(char *section, + char *tag_name, + char *key_name, + char *key_value, + char *params) +{ + char filename[512] = ""; + CURL *curl_handle = NULL; + struct config_data config_data; + switch_xml_t xml = NULL; + char *data = NULL; + switch_uuid_t uuid; + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + + if (!(data = switch_mprintf("section=%s&tag_name=%s&key_name=%s&key_value=%s%s%s\n", + section, + tag_name ? tag_name : "", + key_name ? key_name : "", + key_value ? key_value : "", + params ? "&" : "", params ? params : ""))) { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + return NULL; + } + + switch_uuid_get(&uuid); + switch_uuid_format(uuid_str, &uuid); + + snprintf(filename, sizeof(filename), "%s%s.tmp.xml", SWITCH_GLOBAL_dirs.temp_dir, uuid_str); + curl_handle = curl_easy_init(); + if (!strncasecmp(globals.url, "https", 5)) { + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); + } + + config_data.name = filename; + if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC)) > -1) { + curl_easy_setopt(curl_handle, CURLOPT_POST, 1); + curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, data); + curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); + curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); + curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&config_data); + curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); + curl_easy_perform(curl_handle); + curl_easy_cleanup(curl_handle); + close(config_data.fd); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); + } + + switch_safe_free(data); + + if (!(xml = switch_xml_parse_file(filename))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); + } + + unlink(filename); + + return xml; +} + + +static switch_loadable_module_interface_t xml_curl_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ NULL, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL +}; + +static switch_status_t do_config(void) +{ + char *cf = "xml_curl.conf"; + switch_xml_t cfg, xml, settings, param; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "gateway-url")) { + char *bindings = (char *) switch_xml_attr_soft(param, "bindings"); + set_global_bindings(bindings); + set_global_url(val); + } + } + } + + switch_xml_free(xml); + + return globals.url ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; +} + + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &xml_curl_module_interface; + + if (do_config() == SWITCH_STATUS_SUCCESS) { + curl_global_init(CURL_GLOBAL_ALL); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding XML Fetch Function [%s] [%s]\n", + globals.url, globals.bindings ? globals.bindings : "all"); + switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(globals.bindings)); + } else { + return SWITCH_STATUS_FALSE; + } + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +{ + curl_global_cleanup(); + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Sat Dec 9 21:02:30 2006 @@ -1,9 +1,8 @@ -LDFLAGS += -lxmlrpc -lxmlrpc_abyss -lxmlrpc_server -lxmlrpc_server_abyss -lxmlrpc_xmlparse -lcurl +LDFLAGS += -lxmlrpc -lxmlrpc_abyss -lxmlrpc_server -lxmlrpc_server_abyss -lxmlrpc_xmlparse all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install xmlrpc-c-1.03.14.tgz --prefix=$(PREFIX) --disable-cplusplus --disable-wininet-client --disable-libwww-client Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Sat Dec 9 21:02:30 2006 @@ -37,104 +37,9 @@ #include <xmlrpc-c/abyss.h> #include <xmlrpc-c/server.h> #include <xmlrpc-c/server_abyss.h> -#include <curl/curl.h> - - static const char modname[] = "mod_xml_rpc"; - - -static struct { - uint16_t port; - uint8_t running; - char *url; - char *bindings; - char *realm; - char *user; - char *pass; -} globals; - -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_url, globals.url); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_bindings, globals.bindings); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_realm, globals.realm); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_user, globals.user); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_pass, globals.pass); - -struct config_data { - char *name; - int fd; -}; - -static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data) -{ - register unsigned int realsize = (unsigned int)(size * nmemb); - struct config_data *config_data = data; - - write(config_data->fd, ptr, realsize); - return realsize; -} - - -static switch_xml_t xml_url_fetch(char *section, - char *tag_name, - char *key_name, - char *key_value, - char *params) -{ - char filename[1024] = ""; - CURL *curl_handle = NULL; - struct config_data config_data; - switch_xml_t xml = NULL; - char *data = NULL; - - if (!(data = switch_mprintf("section=%s&tag_name=%s&key_name=%s&key_value=%s%s%s\n", - section, - tag_name ? tag_name : "", - key_name ? key_name : "", - key_value ? key_value : "", - params ? "&" : "", params ? params : ""))) { - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - return NULL; - } - - srand((unsigned int)(time(NULL) + strlen(globals.url))); - snprintf(filename, sizeof(filename), "%s%04x.tmp", SWITCH_GLOBAL_dirs.temp_dir, (rand() & 0xffff)); - curl_handle = curl_easy_init(); - if (!strncasecmp(globals.url, "https", 5)) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); - } - - config_data.name = filename; - if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC)) > -1) { - curl_easy_setopt(curl_handle, CURLOPT_POST, 1); - curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, data); - curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); - curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&config_data); - curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); - curl_easy_perform(curl_handle); - curl_easy_cleanup(curl_handle); - close(config_data.fd); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); - } - - switch_safe_free(data); - - if (!(xml = switch_xml_parse_file(filename))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); - } - - unlink(filename); - - return xml; -} - - - static switch_loadable_module_interface_t xml_rpc_module_interface = { /*.module_name */ modname, /*.endpoint_interface */ NULL, @@ -148,6 +53,18 @@ /*.directory_interface */ NULL }; +static struct { + uint16_t port; + uint8_t running; + char *realm; + char *user; + char *pass; +} globals; + +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_realm, globals.realm); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_user, globals.user); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_pass, globals.pass); + static switch_status_t do_config(void) { char *cf = "xml_rpc.conf"; @@ -171,10 +88,6 @@ user = val; } else if (!strcasecmp(var, "auth-pass")) { pass = val; - } else if (!strcasecmp(var, "gateway-url")) { - char *bindings = (char *) switch_xml_attr_soft(param, "bindings"); - set_global_bindings(bindings); - set_global_url(val); } else if (!strcasecmp(var, "http-port")) { globals.port = (uint16_t)atoi(val); } @@ -191,7 +104,7 @@ } switch_xml_free(xml); - return globals.url ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; + return SWITCH_STATUS_SUCCESS; } @@ -202,13 +115,8 @@ memset(&globals, 0, sizeof(globals)); - if (do_config() == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding XML Fetch Function [%s] [%s]\n", globals.url, globals.bindings ? globals.bindings : "all"); - switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(globals.bindings)); - } + do_config(); - curl_global_init(CURL_GLOBAL_ALL); - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } @@ -353,7 +261,6 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) { globals.running = 0; - curl_global_cleanup(); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r3591 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 09 Dec '06

09 Dec '06

Author: knhor Date: Fri Dec 8 23:54:24 2006 New Revision: 3591 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add ivr application to the application_interface chain Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Dec 8 23:54:24 2006 @@ -403,7 +403,7 @@ /* long_desc */ "Detect speech on a channel.", /* short_desc */ "Detect speech", /* syntax */ "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR pause OR resume", - /*.next */ NULL + /*.next */ &ivr_application_interface }; static const switch_application_interface_t ringback_application_interface = {

1 0

[commit] r3590 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 09 Dec '06

09 Dec '06

Author: knhor Date: Fri Dec 8 23:53:42 2006 New Revision: 3590 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: let caller control work Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Dec 8 23:53:42 2006 @@ -3858,7 +3858,7 @@ conference->interval = interval; conference->dtmf_parser = NULL; - if(0 && switch_ivr_digit_stream_parser_new(conference->pool,&conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) { + if(switch_ivr_digit_stream_parser_new(conference->pool,&conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) { /* caller control configuration chores */ xml_controls = switch_xml_child(profile, "controls");

1 0