sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:4.1:7e32dfcf: uac: Sanity checks
by Stefan Mititelu 03 Nov '15

03 Nov '15

Module: kamailio Branch: 4.1 Commit: 7e32dfcf50e62577b406991972f6f99ae003c347 URL: https://github.com/kamailio/kamailio/commit/7e32dfcf50e62577b406991972f6f99… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-03T16:34:25+02:00 uac: Sanity checks Sanity checks for decode_uri(). Add NULL and len > 0 checks. Segfault when vsf parameter was empty in the Route: header (e.g 'vsf='). --- Modified: modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/7e32dfcf50e62577b406991972f6f99… Patch: https://github.com/kamailio/kamailio/commit/7e32dfcf50e62577b406991972f6f99… --- diff --git a/modules/uac/replace.c b/modules/uac/replace.c index a996e54..f9d3ccf 100644 --- a/modules/uac/replace.c +++ b/modules/uac/replace.c @@ -142,6 +142,22 @@ static inline int decode_uri( str *src , str *dst) int i,j; signed char c; + /* sanity checks */ + if (!src) { + LM_ERR("NULL src\n"); + return -1; + } + + if (!dst) { + LM_ERR("NULL dst\n"); + return -1; + } + + if (!src->s || src->len == 0) { + LM_ERR("empty src\n"); + return -1; + } + /* Count '-' at end and disregard them */ for( n=0,i=src->len-1; src->s[i]=='-'; i--) n++;

1 0

git:master:876787d9: dialog: Sanity checks
by Stefan Mititelu 03 Nov '15

03 Nov '15

Module: kamailio Branch: master Commit: 876787d977c46ffcb1288f5eb66e91145cba1061 URL: https://github.com/kamailio/kamailio/commit/876787d977c46ffcb1288f5eb66e911… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-03T15:58:02+02:00 dialog: Sanity checks Add NULL checks for the parse_dlg_rr_param(). Segfault when 'did' parameter was empty in the Route header (e.g. 'did='). --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/876787d977c46ffcb1288f5eb66e911… Patch: https://github.com/kamailio/kamailio/commit/876787d977c46ffcb1288f5eb66e911… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index f9a16ce..617502e 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -970,7 +970,29 @@ static inline int parse_dlg_rr_param(char *p, char *end, int *h_entry, int *h_id { char *s; + /* sanity checks */ + if (!p) { + LM_ERR("NULL start of parameter string"); + return -1; + } + + if (!end) { + LM_ERR("NULL end of parameter string"); + return -1; + } + + if (!h_entry) { + LM_ERR("NULL h_entry"); + return -1; + } + + if (!h_id) { + LM_ERR("NULL h_id"); + return -1; + } + for ( s=p ; p<end && *p!=DLG_SEPARATOR ; p++ ); + if (*p!=DLG_SEPARATOR) { LM_ERR("malformed rr param '%.*s'\n", (int)(long)(end-s), s); return -1;

1 0

git:master:d956f397: uac: Sanity checks
by Stefan Mititelu 03 Nov '15

03 Nov '15

Module: kamailio Branch: master Commit: d956f397c8cea4774e5941bdad8f76ecc44acdd5 URL: https://github.com/kamailio/kamailio/commit/d956f397c8cea4774e5941bdad8f76e… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-03T15:50:40+02:00 uac: Sanity checks Sanity checks for decode_uri(). Add NULL and len > 0 checks. Segfault when vsf parameter was empty in the Route: header (e.g 'vsf='). --- Modified: modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/d956f397c8cea4774e5941bdad8f76e… Patch: https://github.com/kamailio/kamailio/commit/d956f397c8cea4774e5941bdad8f76e… --- diff --git a/modules/uac/replace.c b/modules/uac/replace.c index 1c30fe2..354b2f9 100644 --- a/modules/uac/replace.c +++ b/modules/uac/replace.c @@ -128,6 +128,22 @@ static inline int decode_uri( str *src , str *dst) int i,j; signed char c; + /* sanity checks */ + if (!src) { + LM_ERR("NULL src\n"); + return -1; + } + + if (!dst) { + LM_ERR("NULL dst\n"); + return -1; + } + + if (!src->s || src->len == 0) { + LM_ERR("empty src\n"); + return -1; + } + /* Count '-' at end and disregard them */ for( n=0,i=src->len-1; src->s[i]=='-'; i--) n++;

1 0

Errored: kamailio/kamailio#1491 (master - c54d6ab)
by Travis CI 03 Nov '15

03 Nov '15

Build Update for kamailio/kamailio ------------------------------------- Build: #1491 Status: Errored Duration: 15 minutes and 58 seconds Commit: c54d6ab (master) Author: Olle E. Johansson Message: curl Update documentation with a note about URL encoding View the changeset: https://github.com/kamailio/kamailio/compare/1faef129e190...c54d6ab6506b View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/88961306 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

git:master:c54d6ab6: curl Update documentation with a note about URL encoding
by Olle E. Johansson 03 Nov '15

03 Nov '15

Module: kamailio Branch: master Commit: c54d6ab6506bc2334c5a1f5a6cbd28633f4f4697 URL: https://github.com/kamailio/kamailio/commit/c54d6ab6506bc2334c5a1f5a6cbd286… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-11-03T09:39:01+01:00 curl Update documentation with a note about URL encoding --- Modified: modules/curl/README Modified: modules/curl/doc/curl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c54d6ab6506bc2334c5a1f5a6cbd286… Patch: https://github.com/kamailio/kamailio/commit/c54d6ab6506bc2334c5a1f5a6cbd286… --- diff --git a/modules/curl/README b/modules/curl/README index 27a6b18..807efad 100644 --- a/modules/curl/README +++ b/modules/curl/README @@ -132,9 +132,13 @@ Chapter 1. Admin Guide and much more either using modparam settings or parameters to the connection definition. - Function http_query allows Kamailio to issue an HTTP GET request and - get access to parts of the reply. This function has been ported from - the utils module and now use the same libcurl functions. + Like in SIP, the HTTP URL may need encoding to be transported safely + over the network. Check the string encoding functions in the + Transformation Cookbook (as used in the curl_http_query example below). + + Function curl_http_query allows Kamailio to issue an HTTP GET request + and get access to parts of the reply. This function has been ported + from the utils module and now use the same libcurl functions. 2. Dependencies diff --git a/modules/curl/doc/curl_admin.xml b/modules/curl/doc/curl_admin.xml index 44f42dc..54e3e59 100644 --- a/modules/curl/doc/curl_admin.xml +++ b/modules/curl/doc/curl_admin.xml @@ -32,7 +32,12 @@ connection definition. </para> <para> - Function http_query allows &kamailio; to issue an HTTP GET + Like in SIP, the HTTP URL may need encoding to be transported safely + over the network. Check the string encoding functions in the Transformation + Cookbook (as used in the curl_http_query example below). + </para> + <para> + Function curl_http_query allows &kamailio; to issue an HTTP GET request and get access to parts of the reply. This function has been ported from the utils module and now use the same libcurl functions.

1 0

git:master:1faef129: curl Add maxdatasize to the curlcon modparam
by Olle E. Johansson 02 Nov '15

02 Nov '15

Module: kamailio Branch: master Commit: 1faef129e1902052c94adfd91d06f785714e4899 URL: https://github.com/kamailio/kamailio/commit/1faef129e1902052c94adfd91d06f78… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-11-02T21:17:35+01:00 curl Add maxdatasize to the curlcon modparam --- Modified: modules/curl/README Modified: modules/curl/curl.h Modified: modules/curl/curlcon.c Modified: modules/curl/doc/curl_admin.xml Modified: modules/curl/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/1faef129e1902052c94adfd91d06f78… Patch: https://github.com/kamailio/kamailio/commit/1faef129e1902052c94adfd91d06f78…

1 0

git:master:807160c1: lib/ims: fixed possible crash when trying to get IMPI without realm
by jaybeepee 02 Nov '15

02 Nov '15

Module: kamailio Branch: master Commit: 807160c199820f3e5df2c1d3f3abe92be3a7c042 URL: https://github.com/kamailio/kamailio/commit/807160c199820f3e5df2c1d3f3abe92… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-11-02T18:55:09+02:00 lib/ims: fixed possible crash when trying to get IMPI without realm --- Modified: lib/ims/ims_getters.c --- Diff: https://github.com/kamailio/kamailio/commit/807160c199820f3e5df2c1d3f3abe92… Patch: https://github.com/kamailio/kamailio/commit/807160c199820f3e5df2c1d3f3abe92… --- diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index 37cb411..5765ba9 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -122,6 +122,15 @@ str cscf_get_private_identity(struct sip_msg *msg, str realm) { struct hdr_field* h = 0; int ret, i, res; + if ((parse_headers(msg, HDR_AUTHORIZATION_F, 0) != 0) && (parse_headers(msg, HDR_PROXYAUTH_F, 0) != 0)) { + return pi; + } + + h = msg->authorization; + if (!msg->authorization) { + goto fallback; + } + if (realm.len && realm.s) { ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); if (ret < 0) { @@ -140,6 +149,9 @@ str cscf_get_private_identity(struct sip_msg *msg, str realm) { } } } + + if (!h) + goto fallback; res = parse_credentials(h); if (res != 0) {

1 0

[kamailio] kex: per module memory debugging (#225)
by Stefan Mititelu 02 Nov '15

02 Nov '15

Kex module updated to also give some details about memory used by each module. Changed f_*, q_* and tlsf_* memory stubs to also include the module name. Added 2 new memory API functions(for each of the memory algos) which will iterate throughout the memory fragments and agregate the memory size used by each function in order to print it. Tested with MEMMNG=0,1,2 and MEMDBG=0,1. Use "kamcmd mem.stat mod_name pkg/shm/all" to test Updated doku. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/225 -- Commit Summary -- * kex: per module memory debugging -- File Changes -- M events.c (25) M events.h (4) M mem/f_malloc.c (135) M mem/f_malloc.h (47) M mem/mem.h (32) M mem/q_malloc.c (113) M mem/q_malloc.h (40) M mem/shm_mem.c (4) M mem/shm_mem.h (32) M mem/src_loc.h (2) M mem/tlsf.c (105) M mem/tlsf.h (32) M modules/ctl/binrpc_run.c (12) M modules/kex/doc/kex_admin.xml (76) M modules/kex/kex_mod.c (7) A modules/kex/mod_stats.c (288) A modules/kex/mod_stats.h (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/225.patch https://github.com/kamailio/kamailio/pull/225.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/225

2 11

git:master:53cd7df8: kex: removed unused callbacks
by Stefan Mititelu 02 Nov '15

02 Nov '15

Module: kamailio Branch: master Commit: 53cd7df83c4065fd7a34cd3ce15b6e215ce39278 URL: https://github.com/kamailio/kamailio/commit/53cd7df83c4065fd7a34cd3ce15b6e2… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-11-02T17:32:21+02:00 kex: removed unused callbacks Removed the two SREV_MODULE_PKG_STATS and SREV_MODULE_SHM_STATS callbacks that were never used. --- Modified: events.c Modified: events.h Modified: modules/kex/kex_mod.c Modified: modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/53cd7df83c4065fd7a34cd3ce15b6e2… Patch: https://github.com/kamailio/kamailio/commit/53cd7df83c4065fd7a34cd3ce15b6e2… --- diff --git a/events.c b/events.c index 3b0d651..5312e7a 100644 --- a/events.c +++ b/events.c @@ -165,15 +165,6 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.rcv_nosip = f; else return -1; break; - case SREV_MODULE_PKG_STATS: - if(_sr_events_list.mod_update_pkg_stats==0) - _sr_events_list.mod_update_pkg_stats = f; - else return -1; - case SREV_MODULE_SHM_STATS: - if(_sr_events_list.mod_update_shm_stats==0) - _sr_events_list.mod_update_shm_stats = f; - else return -1; - break; default: return -1; } @@ -293,18 +284,6 @@ int sr_event_exec(int type, void *data) ret = _sr_events_list.rcv_nosip(data); return ret; } else return 1; - case SREV_MODULE_PKG_STATS: - if(unlikely(_sr_events_list.mod_update_pkg_stats!=0)) - { - ret = _sr_events_list.mod_update_pkg_stats(data); - return ret; - } else return 1; - case SREV_MODULE_SHM_STATS: - if(unlikely(_sr_events_list.mod_update_shm_stats!=0)) - { - ret = _sr_events_list.mod_update_shm_stats(data); - return ret; - } else return 1; default: return -1; } @@ -340,10 +319,6 @@ int sr_event_enabled(int type) return (_sr_events_list.stun_in!=0)?1:0; case SREV_RCV_NOSIP: return (_sr_events_list.rcv_nosip!=0)?1:0; - case SREV_MODULE_PKG_STATS: - return (_sr_events_list.mod_update_pkg_stats!=0)?1:0; - case SREV_MODULE_SHM_STATS: - return (_sr_events_list.mod_update_shm_stats!=0)?1:0; } return 0; } diff --git a/events.h b/events.h index 4443a79..8218453 100644 --- a/events.h +++ b/events.h @@ -34,8 +34,6 @@ #define SREV_TCP_WS_FRAME_IN 10 #define SREV_TCP_WS_FRAME_OUT 11 #define SREV_STUN_IN 12 -#define SREV_MODULE_PKG_STATS 13 -#define SREV_MODULE_SHM_STATS 14 #define SREV_CB_LIST_SIZE 3 @@ -54,8 +52,6 @@ typedef struct sr_event_cb { sr_event_cb_f tcp_ws_frame_out; sr_event_cb_f stun_in; sr_event_cb_f rcv_nosip; - sr_event_cb_f mod_update_pkg_stats; - sr_event_cb_f mod_update_shm_stats; } sr_event_cb_t; void sr_event_cb_init(void); diff --git a/modules/kex/kex_mod.c b/modules/kex/kex_mod.c index b355810..821eef1 100644 --- a/modules/kex/kex_mod.c +++ b/modules/kex/kex_mod.c @@ -147,8 +147,7 @@ static int mod_init(void) register_pkg_proc_stats(); pkg_proc_stats_init_rpc(); - register_mod_stats(); - mod_stats_init(); + /* per module memmory debugging RPC command */ mod_stats_init_rpc(); return 0; @@ -174,7 +173,6 @@ static int child_init(int rank) static void destroy(void) { pkg_proc_stats_destroy(); - mod_stats_destroy(); return; } diff --git a/modules/kex/mod_stats.c b/modules/kex/mod_stats.c index e324957..81186f9 100644 --- a/modules/kex/mod_stats.c +++ b/modules/kex/mod_stats.c @@ -62,35 +62,6 @@ int mod_stats_destroy(void) return 0; } - -/** - * - */ -static int mod_update_pkg_mod_stats_list(void *data) -{ - return 0; -} - - -/** - * - */ -static int mod_update_shm_mod_stats_list(void *data) -{ - return 0; -} - - -/** - * - */ -int register_mod_stats(void) -{ - sr_event_register_cb(SREV_MODULE_PKG_STATS, mod_update_pkg_mod_stats_list); - sr_event_register_cb(SREV_MODULE_SHM_STATS, mod_update_shm_mod_stats_list); - return 0; -} - /** * */

1 0

git:master:e3a8e577: core: parser - remove inline for parse_param()
by Daniel-Constantin Mierla 02 Nov '15

02 Nov '15

Module: kamailio Branch: master Commit: e3a8e5772445d28a0fc6db2e432d750dbb8062da URL: https://github.com/kamailio/kamailio/commit/e3a8e5772445d28a0fc6db2e432d750… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-02T16:21:23+01:00 core: parser - remove inline for parse_param() - it gets recent compiler warnings when is an extern object - reported by Victor Seva, GH#286 --- Modified: parser/parse_param.c Modified: parser/parse_param.h --- Diff: https://github.com/kamailio/kamailio/commit/e3a8e5772445d28a0fc6db2e432d750… Patch: https://github.com/kamailio/kamailio/commit/e3a8e5772445d28a0fc6db2e432d750… --- diff --git a/parser/parse_param.c b/parser/parse_param.c index 79e65e9..b9e0fbc 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -534,7 +534,7 @@ static inline int parse_param2(str *_s, pclass_t _c, param_hooks_t *_h, param_t * 0: success, but expect a next paramter * 1: success and exepect no more parameters */ -inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t) +int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t) { return parse_param2(_s, _c, _h, t, ';'); } diff --git a/parser/parse_param.h b/parser/parse_param.h index 98a1bd1..5622df9 100644 --- a/parser/parse_param.h +++ b/parser/parse_param.h @@ -143,7 +143,7 @@ typedef union param_hooks { * 0: success, but expect a next paramter * 1: success and exepect no more parameters */ -extern inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t); +extern int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t); /*! \brief

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2015