sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:master:9adec4ca: Adding the curl module with status "Development"

by Olle E. Johansson

Module: kamailio Branch: master Commit: 9adec4ca8bf2f204aa8db4ae60429bb994bc6be9 URL: https://github.com/kamailio/kamailio/commit/9adec4ca8bf2f204aa8db4ae60429bb… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-09-19T10:29:52+01:00 Adding the curl module with status "Development" Anyone that wants to help is welcome to help. I've listed a few todo's in the TODO.txt file. We will have to decide which of these that we need for release and which that can be done in the future. --- Added: modules/curl/Makefile Added: modules/curl/README Added: modules/curl/TODO.txt Added: modules/curl/curl.c Added: modules/curl/curl.h Added: modules/curl/curlcon.c Added: modules/curl/curlcon.h Added: modules/curl/curlrpc.c Added: modules/curl/curlrpc.h Added: modules/curl/doc/Makefile Added: modules/curl/doc/curl.xml Added: modules/curl/doc/curl_admin.xml Added: modules/curl/functions.c Added: modules/curl/functions.h --- Diff: https://github.com/kamailio/kamailio/commit/9adec4ca8bf2f204aa8db4ae60429bb… Patch: https://github.com/kamailio/kamailio/commit/9adec4ca8bf2f204aa8db4ae60429bb…

9 years, 3 months

git:master:103b915c: async: Fix some error messages

by Olle E. Johansson

Module: kamailio Branch: master Commit: 103b915cffd63b4abab1a3e57b51644eef20e81d URL: https://github.com/kamailio/kamailio/commit/103b915cffd63b4abab1a3e57b51644… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-09-19T10:26:11+01:00 async: Fix some error messages --- Modified: modules/async/async_mod.c Modified: modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/103b915cffd63b4abab1a3e57b51644… Patch: https://github.com/kamailio/kamailio/commit/103b915cffd63b4abab1a3e57b51644… --- diff --git a/modules/async/async_mod.c b/modules/async/async_mod.c index 2240e70..bc8f0ce 100644 --- a/modules/async/async_mod.c +++ b/modules/async/async_mod.c @@ -94,7 +94,7 @@ static int mod_init(void) { if (load_tm_api( &tmb ) == -1) { - LM_ERR("cannot load the TM-functions\n"); + LM_ERR("cannot load the TM-functions. Missing TM module?\n"); return -1; } @@ -155,7 +155,7 @@ static int w_async_sleep(struct sip_msg* msg, char* sec, char* str2) if(async_workers<=0) { - LM_ERR("no async mod timer wokers\n"); + LM_ERR("no async mod timer workers (modparam missing?)\n"); return -1; } @@ -192,7 +192,7 @@ static int fixup_async_sleep(void** param, int param_no) ap = (async_param_t*)pkg_malloc(sizeof(async_param_t)); if(ap==NULL) { - LM_ERR("no more pkg\n"); + LM_ERR("no more pkg memory available\n"); return -1; } memset(ap, 0, sizeof(async_param_t)); @@ -219,7 +219,7 @@ static int w_async_route(struct sip_msg* msg, char* rt, char* sec) if(async_workers<=0) { - LM_ERR("no async mod timer wokers\n"); + LM_ERR("no async mod timer workers\n"); return -1; } diff --git a/modules/async/async_sleep.c b/modules/async/async_sleep.c index 8ed62e6..240b693 100644 --- a/modules/async/async_sleep.c +++ b/modules/async/async_sleep.c @@ -141,7 +141,7 @@ int async_sleep(struct sip_msg* msg, int seconds, cfg_action_t *act) ai = (async_item_t*)shm_malloc(sizeof(async_item_t)); if(ai==NULL) { - LM_ERR("no more shm\n"); + LM_ERR("no more shm memory\n"); return -1; } memset(ai, 0, sizeof(async_item_t)); @@ -149,7 +149,7 @@ int async_sleep(struct sip_msg* msg, int seconds, cfg_action_t *act) ai->act = act; if(tmb.t_suspend(msg, &ai->tindex, &ai->tlabel)<0) { - LM_ERR("failed to suppend the processing\n"); + LM_ERR("failed to suspend the processing\n"); shm_free(ai); return -1; } @@ -239,13 +239,13 @@ int async_send_task(sip_msg_t* msg, cfg_action_t *act) at = (async_task_t*)shm_malloc(dsize); if(at==NULL) { - LM_ERR("no more shm\n"); + LM_ERR("no more shm memory\n"); return -1; } memset(at, 0, dsize); if(tmb.t_suspend(msg, &tindex, &tlabel)<0) { - LM_ERR("failed to suppend the processing\n"); + LM_ERR("failed to suspend the processing\n"); shm_free(at); return -1; }

9 years, 3 months

git:master:a8adf3bd: evapi: more debug messages when processing received data

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a8adf3bdb74dd3819bb23e2876eee704663f3cef URL: https://github.com/kamailio/kamailio/commit/a8adf3bdb74dd3819bb23e2876eee70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-19T00:16:22+02:00 evapi: more debug messages when processing received data --- Modified: modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/a8adf3bdb74dd3819bb23e2876eee70… Patch: https://github.com/kamailio/kamailio/commit/a8adf3bdb74dd3819bb23e2876eee70… --- diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 2da4ed4..fd6ad6c 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -284,9 +284,10 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) _evapi_clients[i].rbuffer[_evapi_clients[i].rpos+rlen] = '\0'; - LM_NOTICE("{%d} [%s:%d] - received [%.*s]\n", + LM_NOTICE("{%d} [%s:%d] - received [%.*s] (%d) (%d)\n", i, _evapi_clients[i].src_addr, _evapi_clients[i].src_port, - (int)rlen, _evapi_clients[i].rbuffer+_evapi_clients[i].rpos); + (int)rlen, _evapi_clients[i].rbuffer+_evapi_clients[i].rpos, + (int)rlen, (int)_evapi_clients[i].rpos); evenv.conidx = i; evenv.eset = 1; if(_evapi_netstring_format) { @@ -304,6 +305,7 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) } if(k==_evapi_clients[i].rpos+rlen) { _evapi_clients[i].rpos = 0; + LM_DBG("empty content\n"); return; } /* pointer to start of whole frame */ @@ -316,6 +318,10 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) break; /* invalid character - discard the rest */ _evapi_clients[i].rpos = 0; + LM_DBG("invalid char when searching for size [%c] [%.*s] (%d) (%d)\n", + _evapi_clients[i].rbuffer[k], + (int)(_evapi_clients[i].rpos+rlen), _evapi_clients[i].rbuffer, + (int)(_evapi_clients[i].rpos+rlen), k); return; } k++; @@ -329,6 +335,7 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) efp = _evapi_clients[i].rbuffer + _evapi_clients[i].rpos + rlen; if(efp<=sfp) { _evapi_clients[i].rpos = 0; + LM_DBG("weird - invalid size for residual data\n"); return; } _evapi_clients[i].rpos = (unsigned int)(efp-sfp); @@ -339,12 +346,17 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) _evapi_clients[i].rbuffer[k] = sfp[k]; } } + LM_DBG("residual data [%.*s] (%d)\n", + _evapi_clients[i].rpos, _evapi_clients[i].rbuffer, + _evapi_clients[i].rpos); return; } k++; frame.s = _evapi_clients[i].rbuffer + k; if(frame.s[frame.len]!=',') { /* invalid data - discard and reset buffer */ + LM_DBG("frame size mismatch the ending char (%c): [%.*s] (%d)\n", + frame.s[frame.len], frame.len, frame.s, frame.len); _evapi_clients[i].rpos = 0 ; return; }

9 years, 3 months

git:master:1b6bb659: tsilo: documented new parameter for t_store()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1b6bb6596c779086894a2fca04597073503a6abb URL: https://github.com/kamailio/kamailio/commit/1b6bb6596c779086894a2fca0459707… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-18T23:05:33+02:00 tsilo: documented new parameter for t_store() --- Modified: modules/tsilo/README Modified: modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1b6bb6596c779086894a2fca0459707… Patch: https://github.com/kamailio/kamailio/commit/1b6bb6596c779086894a2fca0459707… --- diff --git a/modules/tsilo/README b/modules/tsilo/README index 40d09dd..e9b20ce 100644 --- a/modules/tsilo/README +++ b/modules/tsilo/README @@ -10,7 +10,7 @@ Federico Cabiddu <federico.cabiddu(a)gmail.com> - Copyright Â© 2015 Federico Cabiddu + Copyright © 2015 Federico Cabiddu __________________________________________________________________ Table of Contents @@ -29,7 +29,7 @@ Federico Cabiddu 4. Functions - 4.1. ts_store() + 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) 4.3. ts_append_to(tindex, tlabel, domain) @@ -69,7 +69,7 @@ Chapter 1. Admin Guide 4. Functions - 4.1. ts_store() + 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) 4.3. ts_append_to(tindex, tlabel, domain) @@ -93,7 +93,7 @@ Chapter 1. Admin Guide (R-URI) and add branches to them later if new contacts for the AOR are added. - For each message, the modules stores âRequest-URIâ (âR-URIâ), URI and + For each message, the modules stores "Request-URI" ("R-URI"), URI and the internal transaction index and label. When a transaction is destroyed by the TM module, it is removed from @@ -132,7 +132,7 @@ Chapter 1. Admin Guide must be a power of two, otherwise it will be rounded down to the nearest power of two. - Default value is â2048â. + Default value is "2048". Example 1.1. Set hash_size parameter ... @@ -141,22 +141,25 @@ modparam("tsilo", "hash_size", 1024) 4. Functions - 4.1. ts_store() + 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) 4.3. ts_append_to(tindex, tlabel, domain) -4.1. ts_store() +4.1. ts_store([uri]) - The method stores r-uri, tindex and tlabel of the current transaction. + The method stores uri, tindex and tlabel of the current transaction. If + the uri parameter is missing, then the value is taken from r-uri. The + uri parameter can contain variables. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. Example 1.2. ts_store usage ... if (is_method("INVITE")) { - if (t_newtran()) { - ts_store(); - } + if (t_newtran()) { + ts_store(); + # t_store("sip:alice@$td"); + } } ... diff --git a/modules/tsilo/doc/tsilo_admin.xml b/modules/tsilo/doc/tsilo_admin.xml index dfc5c2b..c173043 100644 --- a/modules/tsilo/doc/tsilo_admin.xml +++ b/modules/tsilo/doc/tsilo_admin.xml @@ -106,9 +106,11 @@ modparam("tsilo", "hash_size", 1024) <section> <title>Functions</title> <section> - <title><function moreinfo="none">ts_store()</function></title> + <title><function moreinfo="none">ts_store([uri])</function></title> <para> - The method stores r-uri, tindex and tlabel of the current transaction. + The method stores uri, tindex and tlabel of the current transaction. If + the uri parameter is missing, then the value is taken from r-uri. The + uri parameter can contain variables. </para> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. @@ -118,9 +120,10 @@ modparam("tsilo", "hash_size", 1024) <programlisting format="linespecific"> ... if (is_method("INVITE")) { - if (t_newtran()) { - ts_store(); - } + if (t_newtran()) { + ts_store(); + # t_store("sip:alice@$td"); + } } ... </programlisting>

9 years, 3 months

git:4.3:7881ec8d: utils: Don't leak memory of pkg_realloc returns NULL

by Carsten Bock

Module: kamailio Branch: 4.3 Commit: 7881ec8d3cd5aa347424108f1fb9860c383e01d5 URL: https://github.com/kamailio/kamailio/commit/7881ec8d3cd5aa347424108f1fb9860… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-09-18T17:26:10+02:00 utils: Don't leak memory of pkg_realloc returns NULL --- Modified: modules/utils/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/7881ec8d3cd5aa347424108f1fb9860… Patch: https://github.com/kamailio/kamailio/commit/7881ec8d3cd5aa347424108f1fb9860… --- diff --git a/modules/utils/functions.c b/modules/utils/functions.c index f261cc0..97d1700 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -54,13 +54,14 @@ size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream_ptr) { http_res_stream_t *stream = (http_res_stream_t *) stream_ptr; - stream->buf = (char *) pkg_realloc(stream->buf, stream->curr_size + + char *tmp = (char *) pkg_realloc(stream->buf, stream->curr_size + (size * nmemb)); - if (stream->buf == NULL) { + if (tmp == NULL) { LM_ERR("cannot allocate memory for stream\n"); return CURLE_WRITE_ERROR; } + stream->buf = tmp; memcpy(&stream->buf[stream->pos], (char *) ptr, (size * nmemb));

9 years, 3 months

git:master:641b7b23: utils: Don't leak memory of pkg_realloc returns NULL

by Carsten Bock

Module: kamailio Branch: master Commit: 641b7b2371b26a9d51b9b5cb0c3918c11ebf6461 URL: https://github.com/kamailio/kamailio/commit/641b7b2371b26a9d51b9b5cb0c3918c… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-09-18T17:25:17+02:00 utils: Don't leak memory of pkg_realloc returns NULL --- Modified: modules/utils/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/641b7b2371b26a9d51b9b5cb0c3918c… Patch: https://github.com/kamailio/kamailio/commit/641b7b2371b26a9d51b9b5cb0c3918c… --- diff --git a/modules/utils/functions.c b/modules/utils/functions.c index 115cd14..5de92ad 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -58,13 +58,14 @@ size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream_ptr) { http_res_stream_t *stream = (http_res_stream_t *) stream_ptr; - stream->buf = (char *) pkg_realloc(stream->buf, stream->curr_size + + char *tmp = (char *) pkg_realloc(stream->buf, stream->curr_size + (size * nmemb)); - if (stream->buf == NULL) { + if (tmp == NULL) { LM_ERR("cannot allocate memory for stream\n"); return CURLE_WRITE_ERROR; } + stream->buf = tmp; memcpy(&stream->buf[stream->pos], (char *) ptr, (size * nmemb));

9 years, 3 months

git:master:1e5bad01: tsilo: use current r-uri for ts_store()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1e5bad019c450a003e812ee051d84134aad6c5f0 URL: https://github.com/kamailio/kamailio/commit/1e5bad019c450a003e812ee051d8413… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-18T13:36:03+02:00 tsilo: use current r-uri for ts_store() - msg->first_line.u.request.uri is always the incoming r-uri (never updated inside the msg structure) - if $ru was updated, msg->new_uri is set with the new value - if incoming r-uri is wanted back after $ru was updated, revert_uri() can be used - if only incoming r-uri is allowed, then the function doesn't work when dialing an alias or a short number --- Modified: modules/tsilo/ts_store.c --- Diff: https://github.com/kamailio/kamailio/commit/1e5bad019c450a003e812ee051d8413… Patch: https://github.com/kamailio/kamailio/commit/1e5bad019c450a003e812ee051d8413… --- diff --git a/modules/tsilo/ts_store.c b/modules/tsilo/ts_store.c index 67dc2d6..a05a4ef 100644 --- a/modules/tsilo/ts_store.c +++ b/modules/tsilo/ts_store.c @@ -43,21 +43,28 @@ int ts_store(struct sip_msg* msg) { struct cell *t; str aor; struct sip_uri ruri; + str suri; ts_urecord_t* r; int res; - + if (msg->new_uri.s!=NULL) { + /* incoming r-uri was chaged by cfg or other component */ + suri = msg->new_uri; + } else { + /* no changes to incoming r-uri */ + suri = msg->first_line.u.request.uri; + } if (use_domain) { - aor = msg->first_line.u.request.uri; + aor = suri; } else { - if (parse_uri(msg->first_line.u.request.uri.s, msg->first_line.u.request.uri.len, &ruri)!=0) + if (parse_uri(suri.s, suri.len, &ruri)!=0) { LM_ERR("bad uri [%.*s]\n", - msg->first_line.u.request.uri.len, - msg->first_line.u.request.uri.s); + suri.len, + suri.s); return -1; } aor = ruri.user;

9 years, 3 months

git:4.3:02069369: tsilo: use current r-uri for ts_store()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 020693698e0ec43da1d652524e497f12d1263fe4 URL: https://github.com/kamailio/kamailio/commit/020693698e0ec43da1d652524e497f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-18T15:54:24+02:00 tsilo: use current r-uri for ts_store() - msg->first_line.u.request.uri is always the incoming r-uri (never updated inside the msg structure) - if $ru was updated, msg->new_uri is set with the new value - if incoming r-uri is wanted back after $ru was updated, revert_uri() can be used - if only incoming r-uri is allowed, then the function doesn't work when dialing an alias or a short number (cherry picked from commit 1e5bad019c450a003e812ee051d84134aad6c5f0) --- Modified: modules/tsilo/ts_store.c --- Diff: https://github.com/kamailio/kamailio/commit/020693698e0ec43da1d652524e497f1… Patch: https://github.com/kamailio/kamailio/commit/020693698e0ec43da1d652524e497f1… --- diff --git a/modules/tsilo/ts_store.c b/modules/tsilo/ts_store.c index 67dc2d6..a05a4ef 100644 --- a/modules/tsilo/ts_store.c +++ b/modules/tsilo/ts_store.c @@ -43,21 +43,28 @@ int ts_store(struct sip_msg* msg) { struct cell *t; str aor; struct sip_uri ruri; + str suri; ts_urecord_t* r; int res; - + if (msg->new_uri.s!=NULL) { + /* incoming r-uri was chaged by cfg or other component */ + suri = msg->new_uri; + } else { + /* no changes to incoming r-uri */ + suri = msg->first_line.u.request.uri; + } if (use_domain) { - aor = msg->first_line.u.request.uri; + aor = suri; } else { - if (parse_uri(msg->first_line.u.request.uri.s, msg->first_line.u.request.uri.len, &ruri)!=0) + if (parse_uri(suri.s, suri.len, &ruri)!=0) { LM_ERR("bad uri [%.*s]\n", - msg->first_line.u.request.uri.len, - msg->first_line.u.request.uri.s); + suri.len, + suri.s); return -1; } aor = ruri.user;

9 years, 3 months

git:master:f81d8cc2: mem: convert TLSF memory manager to new memory API

by Camille Oudot

Module: kamailio Branch: master Commit: f81d8cc2ab67f04208fc570fad8137ae48113d63 URL: https://github.com/kamailio/kamailio/commit/f81d8cc2ab67f04208fc570fad8137a… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-09-18T15:16:13+02:00 mem: convert TLSF memory manager to new memory API - run kamailio with `-X tlsf` to manage pkg memory with TLSF - run kamailio with `-x tlsf` to manage shm memory with TLSF --- Added: mem/tlsf_malloc.c Added: mem/tlsf_malloc.h Added: mem/tlsf_malloc_bits.h Modified: Makefile.defs Modified: mem/memcore.h Modified: mem/pkg.c Modified: mem/shm.c Removed: mem/tlsf.c Removed: mem/tlsf.h Removed: mem/tlsfbits.h --- Diff: https://github.com/kamailio/kamailio/commit/f81d8cc2ab67f04208fc570fad8137a… Patch: https://github.com/kamailio/kamailio/commit/f81d8cc2ab67f04208fc570fad8137a…

9 years, 3 months

[kamailio] Utils module: http_request modification (#321)

by Laurent Debacker

Hi, Here is a modification of the http_request function of the utils module. The idea is to ignore empty lines at the beginning of the http response. This way, the response returned to Kamailio is the first non empty line of the http response. This is to solve an issue encountered with apache2 sometimes returning empty lines. I am no c++ developper and no acquainted to Github (double check the patch). Thanks, Laurent. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/321 -- Commit Summary -- * Update functions.c * Update: functions.c -- File Changes -- M modules/utils/functions.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/321.patch https://github.com/kamailio/kamailio/pull/321.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/321

9 years, 3 months

← Newer
1
...
14
15
16
17
18
19
20
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015