sr-dev December 2014

sr-dev@lists.kamailio.org

33 participants
255 discussions

git:master: siputils: new function is_tel_number(val)
by Daniel-Constantin Mierla 11 Dec '14

11 Dec '14

Module: sip-router Branch: master Commit: 42f431bc4ceefa32e044750ef60cf600f11fda25 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42f431b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 10 16:12:11 2014 +0100 siputils: new function is_tel_number(val) - returns true if the parameter is a telephone number (optional leading + followed by digits) - the parameter can contain variables --- modules/siputils/checks.c | 29 +++++++++++++++++++++++++++++ modules/siputils/checks.h | 5 +++++ modules/siputils/siputils.c | 2 ++ 3 files changed, 36 insertions(+), 0 deletions(-) diff --git a/modules/siputils/checks.c b/modules/siputils/checks.c index 4cc3afd..fab644d 100644 --- a/modules/siputils/checks.c +++ b/modules/siputils/checks.c @@ -52,6 +52,7 @@ #include "../../pvar.h" #include "../../lvalue.h" #include "../../sr_module.h" +#include "../../mod_fix.h" #include "checks.h" /** @@ -725,3 +726,31 @@ found: return 1; } + +/* + * Check if the parameter is a valid telephone number + * - optional leading + followed by digits only + */ +int is_tel_number(sip_msg_t *msg, char *_sp, char* _s2) +{ + str tval = {0, 0}; + int i; + + if(fixup_get_svalue(msg, (gparam_t*)_sp, &tval)!=0) + { + LM_ERR("cannot get parameter value\n"); + return -1; + } + if(tval.len<=0) + return -2; + + i = 0; + if(tval.s[i]=='+') i++; + + for(; i<tval.len; i++) { + if(tval.s[i]<'0' || tval.s[i]>'9') + return -2; + } + + return 1; +} diff --git a/modules/siputils/checks.h b/modules/siputils/checks.h index bc1a99a..dcc45b8 100644 --- a/modules/siputils/checks.h +++ b/modules/siputils/checks.h @@ -117,4 +117,9 @@ int w_is_reply(struct sip_msg* msg, char *foo, char *bar); */ int get_uri_param(struct sip_msg* _msg, char* _param, char* _value); +/* + * Check if parameter value has a telephone number format + */ +int is_tel_number(sip_msg_t *msg, char *_sp, char* _s2); + #endif /* CHECKS_H */ diff --git a/modules/siputils/siputils.c b/modules/siputils/siputils.c index 4ae73b0..076c049 100644 --- a/modules/siputils/siputils.c +++ b/modules/siputils/siputils.c @@ -175,6 +175,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"is_first_hop", (cmd_function)w_is_first_hop, 0, 0, 0, ANY_ROUTE}, + {"is_tel_number", (cmd_function)is_tel_number, 1, fixup_spve_null, + 0, ANY_ROUTE}, {0,0,0,0,0,0} };

2 3

git:master: siputils: is_tel_number() constraints on lenght and first digit after +
by Daniel-Constantin Mierla 11 Dec '14

11 Dec '14

Module: sip-router Branch: master Commit: 66b6f7e4520ade2a9cce91d8b229f08c94b83a1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66b6f7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 11 10:47:09 2014 +0100 siputils: is_tel_number() constraints on lenght and first digit after + - minimum one char and if first is +, then it must have another one, which should not be 0 --- modules/siputils/checks.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/siputils/checks.c b/modules/siputils/checks.c index 6e04fcd..9c2420c 100644 --- a/modules/siputils/checks.c +++ b/modules/siputils/checks.c @@ -741,11 +741,17 @@ int is_tel_number(sip_msg_t *msg, char *_sp, char* _s2) LM_ERR("cannot get parameter value\n"); return -1; } - if(tval.len<=0) + if(tval.len<1) return -2; i = 0; - if(tval.s[i]=='+') i++; + if(tval.s[0]=='+') { + if(tval.len<2) + return -2; + if(tval.s[1]<'1' || tval.s[1]>'9') + return -2; + i = 2; + } for(; i<tval.len; i++) { if(tval.s[i]<'0' || tval.s[i]>'9')

1 0

git:master: modules/siputils: added is_numeric function
by Juha Heinanen 11 Dec '14

11 Dec '14

Module: sip-router Branch: master Commit: d33829e61642950ecfd41cf6ffa08c8ca2cd5ae0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d33829e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Dec 11 04:20:51 2014 +0200 modules/siputils: added is_numeric function --- modules/siputils/README | 228 +++++++++++++++++-------------- modules/siputils/checks.c | 26 ++++ modules/siputils/checks.h | 5 + modules/siputils/doc/siputils_admin.xml | 22 +++ modules/siputils/siputils.c | 2 + 5 files changed, 178 insertions(+), 105 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d33…

1 0

git:master: statsd: added content to overview sections
by Daniel-Constantin Mierla 10 Dec '14

10 Dec '14

Module: sip-router Branch: master Commit: 398321567c6fd12b98b5a152a4f072043d81d1d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3983215… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 11 00:34:32 2014 +0100 statsd: added content to overview sections - taken from announcement email --- modules/statsd/README | 31 ++++++++++++++++++------------- modules/statsd/doc/statsd_admin.xml | 11 ++++++++++- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/modules/statsd/README b/modules/statsd/README index 107761a..689c15a 100644 --- a/modules/statsd/README +++ b/modules/statsd/README @@ -10,7 +10,7 @@ Eloy Coto Pereiro <eloy.coto(a)gmail.com> - Copyright © 2014 Eloy Coto + Copyright � 2014 Eloy Coto __________________________________________________________________ Table of Contents @@ -64,7 +64,13 @@ Chapter 1. Admin Guide 1. Overview - This is the overview for the module statsd of kamailio + The module provides the ability to send commands to statsd (you can use + InfluxDB too) with different kind of information. It provides native + integration with statsd (https://github.com/etsy/statsd/) and graphite + (http://graphite.wikidot.com/). + + The module does not have any special dependency, it does a direct + socket connection to Graphite. 2. Parameters @@ -98,7 +104,7 @@ modparam("statsd", "port", "8125") 3.5. statsd_incr(key) 3.6. statsd_decr(key) -3.1. statsd_set(key, value) +3.1. statsd_set(key, value) Sets count the number of unique values passed to a key. @@ -116,14 +122,13 @@ failure_route[tryagain] { } ... -3.2. statsd_gauge(key, value) +3.2. statsd_gauge(key, value) Gauges are a constant data type. They are not subject to averaging, and - they donât change unless you change them. That is, once you set a - gauge value, it will be a flat line on the graph until you change it - again. + they don�t change unless you change them. That is, once you set a gauge + value, it will be a flat line on the graph until you change it again. - Gauges are useful for things that are already averaged, or donât need + Gauges are useful for things that are already averaged, or don�t need to reset periodically This function can be used in ALL ROUTES. @@ -136,7 +141,7 @@ route [gauge_method]{ statsd_gauge("customer_credit"+$var(customer),"$var(customer_credit)"); } -3.3. statsd_start(key) +3.3. statsd_start(key) statsd start set a avp with the key name, and when you use statsd_stop(key), module will send to statsd the difference in @@ -148,7 +153,7 @@ route [gauge_method]{ the statsd server collects all timers under the stats.timers prefix, and will calculate the lower bound, mean, 90th percentile, upper bound, and count of each timer for each period (by the time you see it in - graphite, thatâs usually per minute). + graphite, that�s usually per minute). Example 1.5. statsd_start usage ... @@ -157,7 +162,7 @@ sql_query("ca", "select sleep(0.2)", "ra"); statsd_stop("long_mysql_query"); ... -3.4. statsd_stop(key) +3.4. statsd_stop(key) statsd_stop(key) get the avp string with the key and calculate the difference from the start time. When finish app send the milliseconds @@ -172,7 +177,7 @@ sql_query("ca", "select sleep(0.2)", "ra"); statsd_stop("long_mysql_query"); ... -3.5. statsd_incr(key) +3.5. statsd_incr(key) Increment a counter @@ -185,7 +190,7 @@ if(geoip_match("$si", "src")){ } ... -3.6. statsd_decr(key) +3.6. statsd_decr(key) Decrement a counter diff --git a/modules/statsd/doc/statsd_admin.xml b/modules/statsd/doc/statsd_admin.xml index 4a26fa3..4e299d2 100644 --- a/modules/statsd/doc/statsd_admin.xml +++ b/modules/statsd/doc/statsd_admin.xml @@ -15,7 +15,16 @@ <section> <title>Overview</title> - <para> This is the overview for the module statsd of kamailio</para> + <para> + The module provides the ability to send commands to statsd + (you can use InfluxDB too) with different kind of information. + It provides native integration with statsd (https://github.com/etsy/statsd/) + and graphite (http://graphite.wikidot.com/). + </para> + <para> + The module does not have any special dependency, it does a direct + socket connection to Graphite. + </para> </section> <section>

1 0

git:master: utils: http_query() now handles large replies properly.
by Alex Balashov 10 Dec '14

10 Dec '14

Module: sip-router Branch: master Commit: 56c417b5ae29f0dd0387d59a6e9d8d203deb8855 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56c417b… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Wed Dec 10 17:42:06 2014 -0500 utils: http_query() now handles large replies properly. The callback function passed to CURL (CURLOPT_WRITEFUNCTION) malloc'd one buffer on the presumption that it would be called once. This is not necessarily true for large replies, so the callback was modified to realloc() the buffer upward as needed until all data chunks were retrieved. --- modules/utils/functions.c | 48 ++++++++++++++++++++++++++------------------ modules/utils/utils.h | 6 +++++ 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/modules/utils/functions.c b/modules/utils/functions.c index 9c23350..48fa0ff 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -46,24 +46,30 @@ /* * curl write function that saves received data as zero terminated * to stream. Returns the amount of data taken care of. + * + * This function may be called multiple times for larger responses, + * so it reallocs + concatenates the buffer as needed. */ -size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream) +size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream_ptr) { - /* Allocate memory and copy */ - char* data; + http_res_stream_t *stream = (http_res_stream_t *) stream_ptr; + + stream->buf = (char *) pkg_realloc(stream->buf, stream->curr_size + + (size * nmemb) + 1); - data = (char*)pkg_malloc((size* nmemb) + 1); - if (data == NULL) { + if (stream->buf == NULL) { LM_ERR("cannot allocate memory for stream\n"); return CURLE_WRITE_ERROR; } - memcpy(data, (char*)ptr, size* nmemb); - data[nmemb] = '\0'; - - *((char**) stream) = data; - - return size* nmemb; + memcpy(&stream->buf[stream->pos], (char *) ptr, (size * nmemb)); + + stream->curr_size += ((size * nmemb) + 1); + stream->pos += (size * nmemb); + + stream->buf[stream->pos + 1] = '\0'; + + return size * nmemb; } @@ -77,12 +83,14 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post) CURLcode res; str value, post_value; char *url, *at, *post; - char* stream; + http_res_stream_t stream; long stat; pv_spec_t *dst; pv_value_t val; double download_size; + memset(&stream, 0, sizeof(http_res_stream_t)); + if (fixup_get_svalue(_m, (gparam_p)_url, &value) != 0) { LM_ERR("cannot get page value\n"); return -1; @@ -129,7 +137,6 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post) curl_easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1); curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)http_query_timeout); - stream = NULL; curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream); @@ -150,8 +157,8 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post) } curl_easy_cleanup(curl); - if(stream) - pkg_free(stream); + if(stream.buf) + pkg_free(stream.buf); return -1; } @@ -159,14 +166,15 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post) if ((stat >= 200) && (stat < 500)) { curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &download_size); LM_DBG("http_query download size: %u\n", (unsigned int)download_size); + /* search for line feed */ - at = memchr(stream, (char)10, download_size); + at = memchr(stream.buf, (char)10, download_size); if (at == NULL) { /* not found: use whole stream */ - at = stream + (unsigned int)download_size; + at = stream.buf + (unsigned int)download_size; } - val.rs.s = stream; - val.rs.len = at - stream; + val.rs.s = stream.buf; + val.rs.len = at - stream.buf; LM_DBG("http_query result: %.*s\n", val.rs.len, val.rs.s); val.flags = PV_VAL_STR; dst = (pv_spec_t *)_dst; @@ -174,6 +182,6 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post) } curl_easy_cleanup(curl); - pkg_free(stream); + pkg_free(stream.buf); return stat; } diff --git a/modules/utils/utils.h b/modules/utils/utils.h index a601b51..6653144 100644 --- a/modules/utils/utils.h +++ b/modules/utils/utils.h @@ -40,4 +40,10 @@ extern int http_query_timeout; extern db1_con_t *pres_dbh; extern db_func_t pres_dbf; +typedef struct { + char *buf; + size_t curr_size; + size_t pos; +} http_res_stream_t; + #endif /* UTILS_H */

1 0

Re: [sr-dev] Fwd: Handling large responses with utils:http_query()
by Daniel Stenberg 10 Dec '14

10 Dec '14

Hey Responding to a forwarded message and I'm not subscribed. Excuse the formatting. I'm the lead developer of libcurl and was asked to comment on this. >> From: Alex Balashov <abalashov(a)evaristesys.com> >> curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function); >> >> As far as I can tell from how write_function() is constructed, it expects >> to be called once: >> 1) Does this function need to be rewritten to realloc() and concatenate? Yes. libcurl will deliver data to the callback as soon as it has read some off the network, it can thus deliver one byte at a time during slow conditions or a whole bunch. It will keep calling the callback as long as data is coming. This is also documented in the man page: http://curl.haxx.se/libcurl/c/CURLOPT_WRITEFUNCTION.html >> 2) Is there an option in CURL that can use internal buffering and only >> invoke the callback once all the response chunks are received? Nope. >> 3) Would increasing the curl.h constant CURL_MAX_WRITE_SIZE help? No. That would just make libcurl able to read a larger chunk from the socket into its own buffer, but it wouldn't prevent it from calling the callback one or many times. -- / daniel.haxx.se

2 1

Handling large responses with utils:http_query()
by Alex Balashov 10 Dec '14

10 Dec '14

Hi, I have a ~21 kB HTTP response that I need to handle with http_query() from the utils module. There are two separate obstacles to this. The first is insufficient size of the default PV text buffer, which is solvable by increasing it using the 'pv_buffer_size' core parameter. The second is the CURL wrapper in modules/utils/functions.c itself. It uses the write_function() callback to pump the data into a buffer: char *stream; ... stream = NULL; curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream); As far as I can tell from how write_function() is constructed, it expects to be called once: size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream) { /* Allocate memory and copy */ char* data; data = (char*)pkg_malloc((size* nmemb) + 1); if (data == NULL) { LM_ERR("cannot allocate memory for stream\n"); return CURLE_WRITE_ERROR; } memcpy(data, (char*)ptr, size* nmemb); data[nmemb] = '\0'; *((char**) stream) = data; return size* nmemb; } That's not the case for a 21 kB reply: size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream) { /* Allocate memory and copy */ char* data; LM_INFO("Write function called with additional buffer: %u\n", (unsigned int) size * nmemb); 0(9696) INFO: utils [functions.c:56]: write_function(): Write function called with additional buffer: 1193 0(9696) INFO: utils [functions.c:56]: write_function(): Write function called with additional buffer: 1448 0(9696) INFO: utils [functions.c:56]: write_function(): Write function called with additional buffer: 10136 0(9696) INFO: utils [functions.c:56]: write_function(): Write function called with additional buffer: 1448 0(9696) INFO: utils [functions.c:56]: write_function(): Write function called with additional buffer: 1448 0(9696) INFO: utils [functions.c:56]: write_function(): Write function called with additional buffer: 4344 0(9696) INFO: utils [functions.c:56]: write_function(): Write function called with additional buffer: 1448 0(9696) INFO: utils [functions.c:56]: write_function(): Write function called with additional buffer: 327 So, I'm not sure what the easiest way to go here is. 1) Does this function need to be rewritten to realloc() and concatenate? 2) Is there an option in CURL that can use internal buffering and only invoke the callback once all the response chunks are received? 3) Would increasing the curl.h constant CURL_MAX_WRITE_SIZE help? Input is appreciated! -- Alex -- Alex Balashov - Principal Evariste Systems LLC 235 E Ponce de Leon Ave Suite 106 Decatur, GA 30030 United States Tel: +1-678-954-0670 Web: http://www.evaristesys.com/, http://www.alexbalashov.com/

1 1

[tracker] Comment added: dialplan: Reload failure
by sip-router 10 Dec '14

10 Dec '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#497 - dialplan: Reload failure User who did this - Olle Johansson (oej) ---------- When disabling dB-text caching I can't repeat this. Nice. My problem, not the code. I still need to try with mysql where I saw the problem first. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=497#comment1736 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: siputils: fix for e164_check()
by Daniel-Constantin Mierla 10 Dec '14

10 Dec '14

Module: sip-router Branch: master Commit: fbcfa198a2c89868fa021f6a63774425e480b27b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fbcfa19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 10 16:14:16 2014 +0100 siputils: fix for e164_check() - the condition for non-digit matching was always false --- modules/siputils/checks.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/siputils/checks.c b/modules/siputils/checks.c index fab644d..3ee096f 100644 --- a/modules/siputils/checks.c +++ b/modules/siputils/checks.c @@ -420,17 +420,17 @@ int tel2sip(struct sip_msg* _msg, char* _uri, char* _hostpart, char* _res) */ static inline int e164_check(str* _user) { - int i; - char c; - - if ((_user->len > 2) && (_user->len < 17) && ((_user->s)[0] == '+')) { - for (i = 1; i <= _user->len; i++) { - c = (_user->s)[i]; - if (c < '0' && c > '9') return -1; + int i; + char c; + + if ((_user->len > 2) && (_user->len < 17) && ((_user->s)[0] == '+')) { + for (i = 1; i <= _user->len; i++) { + c = (_user->s)[i]; + if (c < '0' || c > '9') return -1; + } + return 1; } - return 1; - } - return -1; + return -1; }

1 0

git:master: siputils: documented is_tel_number() function
by Daniel-Constantin Mierla 10 Dec '14

10 Dec '14

Module: sip-router Branch: master Commit: e094286e7821b3470a9d191b6c1812833a017ab9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e094286… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 10 16:22:14 2014 +0100 siputils: documented is_tel_number() function --- modules/siputils/README | 203 +++++++++++++++++-------------- modules/siputils/doc/siputils_admin.xml | 27 ++++ 2 files changed, 139 insertions(+), 91 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e09…

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2014