kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1627 in FS/freeswitch from ~C960657/freeswitch:FS-11520-mod_curl-max_bytes to master 

* commit '65e20af3474e1099b380193f4e5a83ce9ee88949':
  FS-11520: [mod_curl] Make max_bytes configurable
This commit is contained in:
Mike Jerris 2018-11-26 17:43:46 +00:00
parent 72298ce317 65e20af347
commit e3f5060ecb
3 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf/vanilla/autoload_configs/curl.conf.xml Normal file
View File

@ -0,0 +1,5 @@
<configuration name="curl.conf" description="cURL module">
<settings>
<param name="max-bytes" value="64000"/>
</settings>
</configuration>

5
src/mod/applications/mod_curl/conf/autoload_configs/curl.conf.xml Normal file
View File

@ -0,0 +1,5 @@
<configuration name="curl.conf" description="cURL module">
<settings>
<param name="max-bytes" value="64000"/>
</settings>
</configuration>

39
src/mod/applications/mod_curl/mod_curl.c
View File

@ -55,11 +55,20 @@ static char *SYNTAX = "curl url [headers|json|content-type <mime-type>|connect-t
#define HTTP_SENDFILE_ACK_EVENT "curl_sendfile::ack" #define HTTP_SENDFILE_ACK_EVENT "curl_sendfile::ack"
#define HTTP_SENDFILE_RESPONSE_SIZE 32768 #define HTTP_SENDFILE_RESPONSE_SIZE 32768
#define HTTP_MAX_APPEND_HEADERS 10 #define HTTP_MAX_APPEND_HEADERS 10
#define HTTP_DEFAULT_MAX_BYTES 64000
static struct { static struct {
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
switch_event_node_t *node;
int max_bytes;
} globals; } globals;
static switch_xml_config_item_t instructions[] = {
/* parameter name type reloadable pointer default value options structure */
SWITCH_CONFIG_ITEM("max-bytes", SWITCH_CONFIG_INT, CONFIG_RELOADABLE, &globals.max_bytes, (void *) HTTP_DEFAULT_MAX_BYTES, NULL,NULL, NULL),
SWITCH_CONFIG_ITEM_END()
};
typedef enum { typedef enum {
CSO_NONE = (1 << 0), CSO_NONE = (1 << 0),
CSO_EVENT = (1 << 1), CSO_EVENT = (1 << 1),
@ -173,7 +182,7 @@ static http_data_t *do_lookup_url(switch_memory_pool_t *pool, const char *url, c
memset(http_data, 0, sizeof(http_data_t)); memset(http_data, 0, sizeof(http_data_t));
http_data->pool = pool; http_data->pool = pool;
http_data->max_bytes = 64000; http_data->max_bytes = globals.max_bytes;
SWITCH_STANDARD_STREAM(http_data->stream); SWITCH_STANDARD_STREAM(http_data->stream);
if (!method) { if (!method) {
@ -1037,24 +1046,44 @@ SWITCH_STANDARD_API(curl_function)
return status; return status;
} }
static void do_config(switch_bool_t reload)
{
globals.max_bytes = HTTP_DEFAULT_MAX_BYTES;
switch_xml_config_parse_module_settings("curl.conf", reload, instructions);
}
static void event_handler(switch_event_t *event)
{
do_config(SWITCH_TRUE);
}
/* Macro expands to: switch_status_t mod_cidlookup_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */ /* Macro expands to: switch_status_t mod_cidlookup_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
SWITCH_MODULE_LOAD_FUNCTION(mod_curl_load) SWITCH_MODULE_LOAD_FUNCTION(mod_curl_load)
{ {
switch_api_interface_t *api_interface; switch_api_interface_t *api_interface;
switch_application_interface_t *app_interface; switch_application_interface_t *app_interface;
memset(&globals, 0, sizeof(globals));
if (switch_event_reserve_subclass(HTTP_SENDFILE_ACK_EVENT) != SWITCH_STATUS_SUCCESS) { if (switch_event_reserve_subclass(HTTP_SENDFILE_ACK_EVENT) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", HTTP_SENDFILE_ACK_EVENT); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", HTTP_SENDFILE_ACK_EVENT);
return SWITCH_STATUS_TERM; return SWITCH_STATUS_TERM;
} }
if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event!\n");
switch_event_free_subclass(HTTP_SENDFILE_ACK_EVENT);
return SWITCH_STATUS_TERM;
}
/* connect my internal structure to the blank pointer passed to me */ /* connect my internal structure to the blank pointer passed to me */
*module_interface = switch_loadable_module_create_module_interface(pool, modname); *module_interface = switch_loadable_module_create_module_interface(pool, modname);
memset(&globals, 0, sizeof(globals));
globals.pool = pool; globals.pool = pool;
do_config(SWITCH_FALSE);
SWITCH_ADD_API(api_interface, "curl", "curl API", curl_function, SYNTAX); SWITCH_ADD_API(api_interface, "curl", "curl API", curl_function, SYNTAX);
SWITCH_ADD_APP(app_interface, "curl", "Perform a http request", "Perform a http request", SWITCH_ADD_APP(app_interface, "curl", "Perform a http request", "Perform a http request",
curl_app_function, SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC); curl_app_function, SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC);
@ -1074,6 +1103,10 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_curl_shutdown)
switch_event_free_subclass(HTTP_SENDFILE_ACK_EVENT); switch_event_free_subclass(HTTP_SENDFILE_ACK_EVENT);
switch_xml_config_cleanup(instructions);
switch_event_unbind(&globals.node);
/* Cleanup dynamically allocated config settings */ /* Cleanup dynamically allocated config settings */
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }