November 2015 - sr-dev - kamailio.org

git:master:3a0888f3: core: mem - api extended to track module name in debugging mode
by Daniel-Constantin Mierla 02 Nov '15

02 Nov '15

Module: kamailio Branch: master Commit: 3a0888f392c8e0e056c6b03cbd0013bfaba9e8aa URL: https://github.com/kamailio/kamailio/commit/3a0888f392c8e0e056c6b03cbd0013b… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-02T13:41:04+01:00 core: mem - api extended to track module name in debugging mode - memory operations will keep reference to module --- Modified: mem/memapi.h --- Diff: https://github.com/kamailio/kamailio/commit/3a0888f392c8e0e056c6b03cbd0013b… Patch: https://github.com/kamailio/kamailio/commit/3a0888f392c8e0e056c6b03cbd0013b… --- diff --git a/mem/memapi.h b/mem/memapi.h index e1b78a0..9f918f3 100644 --- a/mem/memapi.h +++ b/mem/memapi.h @@ -27,13 +27,13 @@ #ifdef DBG_SR_MEMORY typedef void* (*sr_malloc_f)(void* mbp, unsigned long size, - const char* file, const char* func, unsigned int line); -typedef void (*sr_free_f)(void* mbp, void* p, const char* file, const char* func, - unsigned int line); + const char* file, const char* func, unsigned int line, const char* mname); +typedef void (*sr_free_f)(void* mbp, void* p, const char* file, const char* func, + unsigned int line, const char* mname); typedef void* (*sr_realloc_f)(void* mbp, void* p, unsigned long size, - const char* file, const char* func, unsigned int line); + const char* file, const char* func, unsigned int line, const char* mname); typedef void* (*sr_resize_f)(void* mbp, void* p, unsigned long size, - const char* file, const char* func, unsigned int line); + const char* file, const char* func, unsigned int line, const char* mname); #else /*DBG_SR_MEMORY*/ @@ -51,6 +51,9 @@ typedef void (*sr_mem_sums_f)(void* mbp); typedef void (*sr_mem_destroy_f)(void); +typedef void (*sr_mem_mod_get_stats_f)(void* mbp, void **p); +typedef void (*sr_mem_mod_free_stats_f)(void* mbp); + /*private memory api*/ typedef struct sr_pkg_api { /*memory manager name - soft copy*/ @@ -75,6 +78,10 @@ typedef struct sr_pkg_api { sr_mem_sums_f xsums; /*memory destroy manager*/ sr_mem_destroy_f xdestroy; + /*memory stats per module*/ + sr_mem_mod_get_stats_f xstats; + /*memory stats free per module*/ + sr_mem_mod_free_stats_f xfstats; } sr_pkg_api_t; /*shared memory api*/ @@ -107,6 +114,10 @@ typedef struct sr_shm_api { sr_mem_sums_f xsums; /*memory destroy manager*/ sr_mem_destroy_f xdestroy; + /*memory stats per module*/ + sr_mem_mod_get_stats_f xstats; + /*memory stats free per module*/ + sr_mem_mod_free_stats_f xfstats; } sr_shm_api_t; #endif

1 0

git:master:b1d96ffc: kex: per module memory statistics when in debugging mode
by Daniel-Constantin Mierla 02 Nov '15

02 Nov '15

Module: kamailio Branch: master Commit: b1d96ffc24e92887cc3bf0dcc66ead94e357f081 URL: https://github.com/kamailio/kamailio/commit/b1d96ffc24e92887cc3bf0dcc66ead9… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-02T13:34:44+01:00 kex: per module memory statistics when in debugging mode - return details about memory used by each module via rpc commands --- Added: modules/kex/mod_stats.c Added: modules/kex/mod_stats.h Modified: modules/kex/doc/kex_admin.xml Modified: modules/kex/kex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b1d96ffc24e92887cc3bf0dcc66ead9… Patch: https://github.com/kamailio/kamailio/commit/b1d96ffc24e92887cc3bf0dcc66ead9…

1 0

git:master:19756eec: ctl: increased default buffers size for rpc responses
by Daniel-Constantin Mierla 02 Nov '15

02 Nov '15

Module: kamailio Branch: master Commit: 19756eecb2048320182667cc440cfa7d275304c9 URL: https://github.com/kamailio/kamailio/commit/19756eecb2048320182667cc440cfa7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-02T13:30:32+01:00 ctl: increased default buffers size for rpc responses - binrpc_max_body_size = 32 - binrpc_struct_max_body_size = 8 --- Modified: modules/ctl/README Modified: modules/ctl/binrpc_run.c Modified: modules/ctl/doc/ctl_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/19756eecb2048320182667cc440cfa7… Patch: https://github.com/kamailio/kamailio/commit/19756eecb2048320182667cc440cfa7… --- diff --git a/modules/ctl/README b/modules/ctl/README index 09f35d4..2de6fcb 100644 --- a/modules/ctl/README +++ b/modules/ctl/README @@ -235,20 +235,20 @@ modparam("ctl", "autoconversion", 1) Set the size of binrpc buffer for RPC reply. Value represents kilobytes. - Default: 4 (meaning 4KB); + Default: 32 (meaning 32KB); Example 1.8. Set the binrpc_max_body_size parameter -modparam("ctl", "binrpc_max_body_size", 10) +modparam("ctl", "binrpc_max_body_size", 16) 3.8. binrpc_struct_max_body_size (integer) Set the size of binrpc structure buffer for RPC reply. Value represents kilobytes. - Default: 1 (meaning 1KB); + Default: 8 (meaning 8KB); Example 1.9. Set the binrpc_struct_max_body_size parameter -modparam("ctl", "binrpc_struct_max_body_size", 3) +modparam("ctl", "binrpc_struct_max_body_size", 4) 4. SIP-router RPC Functions diff --git a/modules/ctl/binrpc_run.c b/modules/ctl/binrpc_run.c index c4b7297..2355a50 100644 --- a/modules/ctl/binrpc_run.c +++ b/modules/ctl/binrpc_run.c @@ -36,8 +36,9 @@ rpc->scan (default: not set) */ int autoconvert=0; -int binrpc_max_body_size = 4; /* multiplied by 1024 in mod init */ -int binrpc_struct_max_body_size = 1; /* multiplied by 1024 in mod init */ +int binrpc_max_body_size = 32; /* multiplied by 1024 in mod init */ +int binrpc_struct_max_body_size = 8; /* multiplied by 1024 in mod init */ + #define BINRPC_MAX_BODY binrpc_max_body_size /* maximum body for send */ #define STRUCT_MAX_BODY binrpc_struct_max_body_size #define MAX_MSG_CHUNKS 96 diff --git a/modules/ctl/doc/ctl_params.xml b/modules/ctl/doc/ctl_params.xml index 3bd2553..09041bd 100644 --- a/modules/ctl/doc/ctl_params.xml +++ b/modules/ctl/doc/ctl_params.xml @@ -200,13 +200,13 @@ modparam("ctl", "autoconversion", 1) kilobytes. </para> <para> - Default: 4 (meaning 4KB); + Default: 32 (meaning 32KB); </para> <example> <title>Set the <varname>binrpc_max_body_size</varname> parameter </title> <programlisting> -modparam("ctl", "binrpc_max_body_size", 10) +modparam("ctl", "binrpc_max_body_size", 16) </programlisting> </example> </section> @@ -218,13 +218,13 @@ modparam("ctl", "binrpc_max_body_size", 10) kilobytes. </para> <para> - Default: 1 (meaning 1KB); + Default: 8 (meaning 8KB); </para> <example> <title>Set the <varname>binrpc_struct_max_body_size</varname> parameter </title> <programlisting> -modparam("ctl", "binrpc_struct_max_body_size", 3) +modparam("ctl", "binrpc_struct_max_body_size", 4) </programlisting> </example> </section>

1 0

git:master:f12e03e1: curl Enforce max data size when downloading data. Stop re-allocating memory for data we do not bother with.
by Olle E. Johansson 02 Nov '15

02 Nov '15

Module: kamailio Branch: master Commit: f12e03e1c171a723097eb14f1074d705ed1404e4 URL: https://github.com/kamailio/kamailio/commit/f12e03e1c171a723097eb14f1074d70… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-11-02T11:44:49+01:00 curl Enforce max data size when downloading data. Stop re-allocating memory for data we do not bother with. --- Modified: modules/curl/curl.h Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/f12e03e1c171a723097eb14f1074d70… Patch: https://github.com/kamailio/kamailio/commit/f12e03e1c171a723097eb14f1074d70… --- diff --git a/modules/curl/curl.h b/modules/curl/curl.h index b83438c..8f5aba9 100644 --- a/modules/curl/curl.h +++ b/modules/curl/curl.h @@ -55,7 +55,8 @@ typedef struct { char *buf; size_t curr_size; size_t pos; -} http_res_stream_t; + size_t max_size; +} curl_res_stream_t; /*! Predefined connection objects */ @@ -76,7 +77,7 @@ typedef struct _curl_con unsigned int port; /*!< The port to connect to */ int timeout; /*!< Timeout for this connection */ long maxdatasize; /*!< Maximum data download on GET or POST */ - http_res_stream_t *stream; /*!< Curl stream */ + curl_res_stream_t *stream; /*!< Curl stream */ struct _curl_con *next; /*!< next connection */ char redirecturl[512]; /*!< Last redirect URL - to use for $curlredirect(curlcon) pv */ } curl_con_t; diff --git a/modules/curl/functions.c b/modules/curl/functions.c index 19908c6..6925c71 100644 --- a/modules/curl/functions.c +++ b/modules/curl/functions.c @@ -60,26 +60,26 @@ static int curL_query_url(struct sip_msg* _m, char* _url, char* _dst, const char */ size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream_ptr) { - /* A question here is if we can somehow signal maxdatasize and stop filling - buffers at maxdatasize - we don't need any more. Or just ignore and stop - allocating pkg memory at that point. A good todo. - */ - http_res_stream_t *stream = (http_res_stream_t *) stream_ptr; - - stream->buf = (char *) pkg_realloc(stream->buf, stream->curr_size + - (size * nmemb) + 1); - - if (stream->buf == NULL) { - LM_ERR("cannot allocate memory for stream\n"); - return CURLE_WRITE_ERROR; - } + curl_res_stream_t *stream = (curl_res_stream_t *) stream_ptr; + + + if (stream->max_size == 0 || stream->curr_size < stream->max_size) { + stream->buf = (char *) pkg_realloc(stream->buf, stream->curr_size + (size * nmemb) + 1); - memcpy(&stream->buf[stream->pos], (char *) ptr, (size * nmemb)); + if (stream->buf == NULL) { + LM_ERR("cannot allocate memory for stream\n"); + return CURLE_WRITE_ERROR; + } - stream->curr_size += ((size * nmemb) + 1); - stream->pos += (size * nmemb); + memcpy(&stream->buf[stream->pos], (char *) ptr, (size * nmemb)); - stream->buf[stream->pos + 1] = '\0'; + stream->curr_size += ((size * nmemb) + 1); + stream->pos += (size * nmemb); + + stream->buf[stream->pos + 1] = '\0'; + } else { + LM_DBG("****** ##### CURL Max datasize exceeded: max %u current %u\n", (unsigned int) stream->max_size, (unsigned int)stream->curr_size); + } return size * nmemb; } @@ -93,7 +93,7 @@ static int curL_query_url(struct sip_msg* _m, char* _url, char* _dst, const char CURLcode res; str value; char *url, *at = NULL; - http_res_stream_t stream; + curl_res_stream_t stream; long stat; pv_spec_t *dst; pv_value_t val; @@ -101,7 +101,8 @@ static int curL_query_url(struct sip_msg* _m, char* _url, char* _dst, const char double total_time; struct curl_slist *headerlist = NULL; - memset(&stream, 0, sizeof(http_res_stream_t)); + memset(&stream, 0, sizeof(curl_res_stream_t)); + stream.max_size = (size_t) maxdatasize; value.s = _url; value.len = strlen(_url);

1 0

git:master:edf6fb9d: curl Removing some unused variables
by Olle E. Johansson 02 Nov '15

02 Nov '15

Module: kamailio Branch: master Commit: edf6fb9dc68acacf109bb421679289726dd8901d URL: https://github.com/kamailio/kamailio/commit/edf6fb9dc68acacf109bb4216792897… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-11-02T11:16:52+01:00 curl Removing some unused variables --- Modified: modules/curl/curl.c Modified: modules/curl/curlcon.c Modified: modules/curl/curlrpc.c Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/edf6fb9dc68acacf109bb4216792897… Patch: https://github.com/kamailio/kamailio/commit/edf6fb9dc68acacf109bb4216792897… --- diff --git a/modules/curl/curl.c b/modules/curl/curl.c index a485604..1e253a7 100644 --- a/modules/curl/curl.c +++ b/modules/curl/curl.c @@ -83,10 +83,6 @@ unsigned int default_maxdatasize = 0; /*!< Default download size. 0=disabled */ static curl_version_info_data *curl_info; -/* lock for configuration access */ -static gen_lock_t *conf_lock = NULL; - - /* Module management function prototypes */ static int mod_init(void); static int child_init(int); @@ -571,7 +567,6 @@ static int pv_get_curlerror(struct sip_msg *msg, pv_param_t *param, pv_value_t * { str curlerr; char *err = NULL; - CURLcode codeerr; if(param==NULL) { return -1; @@ -598,7 +593,6 @@ static int pv_get_curlerror(struct sip_msg *msg, pv_param_t *param, pv_value_t * */ static int pv_parse_curlredirect(pv_spec_p sp, str *in) { - int cerr = 0; if(sp==NULL || in==NULL || in->len<=0) { return -1; } diff --git a/modules/curl/curlcon.c b/modules/curl/curlcon.c index 3d3de99..c573cab 100644 --- a/modules/curl/curlcon.c +++ b/modules/curl/curlcon.c @@ -239,8 +239,6 @@ int curl_parse_param(char *val) if (*p == ';') { /* We have parameters */ str tok; - int_str ival; - int itype; param_t *pit = NULL; /* Adjust the URL length */ diff --git a/modules/curl/curlrpc.c b/modules/curl/curlrpc.c index 551c9b3..a5b31b5 100644 --- a/modules/curl/curlrpc.c +++ b/modules/curl/curlrpc.c @@ -44,12 +44,7 @@ static const char* curl_rpc_listcon_doc[2] = { static void curl_rpc_listcon(rpc_t* rpc, void* ctx) { void* th; - void* ih; void* rh; - void* sh; - int j; - char c[3]; - str data = {"", 0}; curl_con_t *cc; cc = _curl_con_root; diff --git a/modules/curl/functions.c b/modules/curl/functions.c index 214eb32..19908c6 100644 --- a/modules/curl/functions.c +++ b/modules/curl/functions.c @@ -92,7 +92,7 @@ static int curL_query_url(struct sip_msg* _m, char* _url, char* _dst, const char CURL *curl; CURLcode res; str value; - char *url, *at = NULL, *post; + char *url, *at = NULL; http_res_stream_t stream; long stat; pv_spec_t *dst; @@ -172,6 +172,9 @@ static int curL_query_url(struct sip_msg* _m, char* _url, char* _dst, const char res = curl_easy_perform(curl); } pkg_free(url); + if (headerlist) { + curl_slist_free_all(headerlist); + } if (res != CURLE_OK) { /* http://curl.haxx.se/libcurl/c/libcurl-errors.html */ @@ -183,7 +186,6 @@ static int curL_query_url(struct sip_msg* _m, char* _url, char* _dst, const char LM_ERR("failed to perform curl (%d)\n", res); } - curl_slist_free_all(headerlist); curl_easy_cleanup(curl); if(stream.buf) { pkg_free(stream.buf); @@ -246,9 +248,6 @@ static int curL_query_url(struct sip_msg* _m, char* _url, char* _dst, const char } /* CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ... ); */ - if (headerlist) { - curl_slist_free_all(headerlist); - } curl_easy_cleanup(curl); pkg_free(stream.buf); return stat; @@ -267,7 +266,6 @@ int curl_con_query_url(struct sip_msg* _m, char *connection, char* _url, char* _ str urlbuf2; char *urlbuf3 = NULL; - unsigned int len = 0; str postdatabuf; char *postdata = NULL; unsigned int maxdatasize = default_maxdatasize;

1 0

git:master:38a3d0ca: Curl: Make base URI pvar
by Olle E. Johansson 01 Nov '15

01 Nov '15

Module: kamailio Branch: master Commit: 38a3d0ca6c09c851835eaf0875a4cee7fa947e61 URL: https://github.com/kamailio/kamailio/commit/38a3d0ca6c09c851835eaf0875a4cee… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-11-01T20:25:38+01:00 Curl: Make base URI pvar --- Modified: modules/curl/curl.c Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/38a3d0ca6c09c851835eaf0875a4cee… Patch: https://github.com/kamailio/kamailio/commit/38a3d0ca6c09c851835eaf0875a4cee… --- diff --git a/modules/curl/curl.c b/modules/curl/curl.c index ae9f464..a485604 100644 --- a/modules/curl/curl.c +++ b/modules/curl/curl.c @@ -389,7 +389,8 @@ static int fixup_curl_connect(void** param, int param_no) /* * Fix curl_connect params when posting (5 parameters): - * connection (string/pvar), url (string with pvars), content-type, data (string/pvar, pvar + * connection (string/pvar), url (string with pvars), content-type, + * data (string/pvar, pvar) */ static int fixup_curl_connect_post(void** param, int param_no) { @@ -397,12 +398,12 @@ static int fixup_curl_connect_post(void** param, int param_no) str s; pv_elem_t *pv = NULL; - if (param_no == 1 || param_no == 2 || param_no == 3) { + if (param_no == 1 || param_no == 3) { /* We want char * strings */ - /* At some point we need to allow pvars in the string. */ return 0; } - if (param_no == 4) { + /* URL and data may contain pvar */ + if (param_no == 4 || param_no == 2) { s.s = (char*)(*param); s.len = strlen(s.s); diff --git a/modules/curl/functions.c b/modules/curl/functions.c index 4c9961e..214eb32 100644 --- a/modules/curl/functions.c +++ b/modules/curl/functions.c @@ -264,6 +264,9 @@ int curl_con_query_url(struct sip_msg* _m, char *connection, char* _url, char* _ char passwordbuf[BUFSIZ/2]; char connurlbuf[BUFSIZ/2]; char urlbuf[512]; + str urlbuf2; + char *urlbuf3 = NULL; + unsigned int len = 0; str postdatabuf; char *postdata = NULL; @@ -292,9 +295,41 @@ int curl_con_query_url(struct sip_msg* _m, char *connection, char* _url, char* _ strncpy(passwordbuf, conn->password.s, conn->password.len); strncpy(connurlbuf, conn->url.s, conn->url.len); - strncpy(urlbuf,conn->schema.s, conn->schema.len); - snprintf(&urlbuf[conn->schema.len],(sizeof(urlbuf) - conn->schema.len), "://%s%s%s", connurlbuf, - (_url[0] && _url[0] == '/')?"":(_url[0] != '\0' ? "/": ""), _url); + LM_DBG("******** CURL Connection found %s\n", connection); + + if (_url && *_url) { + if(pv_printf_s(_m, (pv_elem_t*) _url, &urlbuf2) != 0) { + LM_ERR("curl :: unable to handle post data %s\n", _url); + return -1; + } + if(urlbuf2.s==NULL || urlbuf2.len == 0) { + LM_ERR("curl :: invalid url parameter\n"); + return -1; + } + LM_DBG("******** CURL Connection URL parsed for %s\n", connection); + /* Allocated using pkg_memory */ + urlbuf3 = as_asciiz(&urlbuf2); + if (urlbuf3 == NULL) { + ERR("Curl: No memory left\n"); + return -1; + } + LM_DBG("******** CURL URL string after PV parsing %s\n", urlbuf3); + } else { + LM_DBG("******** CURL URL string NULL no PV parsing %s\n", _url); + } + strncpy(urlbuf, conn->schema.s, conn->schema.len); + if (urlbuf3 != NULL) { + snprintf(&urlbuf[conn->schema.len],(sizeof(urlbuf) - conn->schema.len), "://%s%s%s", connurlbuf, + (urlbuf3[0] && urlbuf3[0] == '/')?"":(urlbuf3[0] != '\0' ? "/": ""), urlbuf3); + } else { + snprintf(&urlbuf[conn->schema.len],(sizeof(urlbuf) - conn->schema.len), "://%s%s%s", connurlbuf, + (_url[0] && _url[0] == '/')?"":(_url[0] != '\0' ? "/": ""), _url); + } + + /* Release the memory allocated by as_asciiz */ + if (urlbuf3 != NULL) { + pkg_free(urlbuf3); + } LM_DBG("***** #### ***** CURL URL: %s \n", urlbuf); if (_post && *_post) { if(pv_printf_s(_m, (pv_elem_t*)_post, &postdatabuf) != 0) { @@ -319,6 +354,7 @@ int curl_con_query_url(struct sip_msg* _m, char *connection, char* _url, char* _ res = curL_query_url(_m, urlbuf, _result, usernamebuf, passwordbuf, (contenttype ? contenttype : "text/plain"), postdata, conn->timeout, conn->http_follow_redirect, 0, (unsigned int) maxdatasize ); + LM_DBG("***** #### ***** CURL DONE : %s \n", urlbuf); if (postdata != NULL) { pkg_free(postdata); }

1 0

git:master:2b3ad40a: curl remove some debug output
by Olle E. Johansson 01 Nov '15

01 Nov '15

Module: kamailio Branch: master Commit: 2b3ad40ae086382b1cdefa8ce15da6aa8a8e7f77 URL: https://github.com/kamailio/kamailio/commit/2b3ad40ae086382b1cdefa8ce15da6a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-11-01T20:25:38+01:00 curl remove some debug output --- Modified: modules/curl/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/2b3ad40ae086382b1cdefa8ce15da6a… Patch: https://github.com/kamailio/kamailio/commit/2b3ad40ae086382b1cdefa8ce15da6a… --- diff --git a/modules/curl/curlcon.c b/modules/curl/curlcon.c index 8580905..3d3de99 100644 --- a/modules/curl/curlcon.c +++ b/modules/curl/curlcon.c @@ -71,8 +71,6 @@ curl_con_t* curl_get_connection(str *name) cc = _curl_con_root; while(cc) { - LM_DBG("---> curl_get_connection comparing with curlcon: [%.*s]\n", cc->name.len, cc->name.s); - LM_DBG("---> curl_get_connection comparing conid %u with cc->conid %u \n", conid, cc->conid); if(conid==cc->conid && cc->name.len==name->len && strncmp(cc->name.s, name->s, name->len)==0) { return cc; }

1 0