sr-dev July 2013

sr-dev@lists.kamailio.org

21 participants
246 discussions

[tracker] Comment added: Incorrect error message in uac module (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#239 - Incorrect error message in uac module User who did this - Víctor Seva (linuxmaniac) ---------- This seems quite reasonable and easy to fix. Can I commit this to 3.3 branch? ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=239#comment991 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.

11 years, 4 months

git:master: pv: added transformations for url encode/decode

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 617a444fcbe84290a701228bd78e279bbde4818e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=617a444… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 11 15:27:16 2013 +0200 pv: added transformations for url encode/decode - patch by JoshE, FS#311 --- modules/pv/pv_trans.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ modules/pv/pv_trans.h | 3 +- 2 files changed, 112 insertions(+), 1 deletions(-) diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index e4e5455..abfff74 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -104,6 +104,82 @@ char *tr_set_crt_buffer(void) val->rs.s = _tr_buffer; \ } while(0); +/* -- helper functions */ + +/* Converts a hex character to its integer value */ +static char pv_from_hex(char ch) +{ + return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10; +} + +/* Converts an integer value to its hex character */ +static char pv_to_hex(char code) +{ + static char hex[] = "0123456789abcdef"; + return hex[code & 15]; +} + +/*! \brief + * URL Encodes a string for use in a HTTP query + */ +static int urlencode_param(str *sin, str *sout) +{ + char *at, *p; + + at = sout->s; + p = sin->s; + + if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || + sin->len<0 || sout->len < 3*sin->len+1) + return -1; + + while (p < sin->s+sin->len) { + if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') + *at++ = *p; + else if (*p == ' ') + *at++ = '+'; + else + *at++ = '%', *at++ = pv_to_hex(*p >> 4), *at++ = pv_to_hex(*p & 15); + p++; + } + + *at = 0; + sout->len = at - sout->s; + LM_DBG("urlencoded string is <%s>\n", sout->s); + + return 0; +} + +/* URL Decode a string */ +static int urldecode_param(str *sin, str *sout) { + char *at, *p; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (*p == '%') { + if (p[1] && p[2]) { + *at++ = pv_from_hex(p[1]) << 4 | pv_from_hex(p[2]); + p += 2; + } + } else if (*p == '+') { + *at++ = ' '; + } else { + *at++ = *p; + } + p++; + } + + *at = 0; + sout->len = at - sout->s; + + LM_DBG("urldecoded string is <%s>\n", sout->s); + return 0; +} + +/* -- transformations functions */ + /*! * \brief Evaluate string transformations * \param msg SIP message @@ -827,6 +903,34 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len = j; break; + case TR_S_URLENCODEPARAM: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len>TR_BUFFER_SIZE-1) + return -1; + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if (urlencode_param(&val->rs, &st) < 0) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; + + case TR_S_URLDECODEPARAM: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len>TR_BUFFER_SIZE-1) + return -1; + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if (urldecode_param(&val->rs, &st) < 0) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; + default: LM_ERR("unknown subtype %d\n", subtype); @@ -2061,6 +2165,12 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==15 && strncasecmp(name.s, "urlencode.param", 15)==0) { + t->subtype = TR_S_URLENCODEPARAM; + goto done; + } else if(name.len==15 && strncasecmp(name.s, "urldecode.param", 15)==0) { + t->subtype = TR_S_URLDECODEPARAM; + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/modules/pv/pv_trans.h b/modules/pv/pv_trans.h index e2aa494..8544d8c 100644 --- a/modules/pv/pv_trans.h +++ b/modules/pv/pv_trans.h @@ -41,7 +41,8 @@ enum _tr_s_subtype { TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, - TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO + TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, + TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

11 years, 4 months

[tracker] Task closed: Nathelper: modparam natping_processes max value

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#321 - Nathelper: modparam natping_processes max value User who did this - Víctor Seva (linuxmaniac) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=321 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.

11 years, 4 months

[tracker] User took ownership: Nathelper: modparam natping_processes max value

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Víctor Seva has taken ownership of the following task: FS#321 - Nathelper: modparam natping_processes max value More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=321 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.

11 years, 4 months

git:master: modules/nathelper: removed natping_proceses limit

by Victor Seva

Module: sip-router Branch: master Commit: 12a5a409e7e196e1d0401b125b2de72a9f2e5aff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12a5a40… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Thu Jul 11 15:03:08 2013 +0200 modules/nathelper: removed natping_proceses limit --- modules/nathelper/nathelper.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index cff54d8..7cccdc1 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -671,9 +671,8 @@ mod_init(void) " set in usrloc module\n"); return -1; } - if (natping_processes>=8) { - LM_ERR("too many natping processes (%d) max=8\n", - natping_processes); + if (natping_processes<0) { + LM_ERR("bad config - natping_processes must be >= 0\n"); return -1; }

11 years, 4 months

git:4.0: modules/nathelper: remove natping_proceses limit

by Victor Seva

Module: sip-router Branch: 4.0 Commit: d821224ff33e7f7c43c6598482ab0870f728e763 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d821224… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sat Jul 6 20:22:41 2013 +0200 modules/nathelper: remove natping_proceses limit (cherry picked from commit edb00b0566595b509a7cdf9a1c7455ce6ee6c4c8) --- modules/nathelper/nathelper.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 48f8dfd..262b758 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -669,9 +669,8 @@ mod_init(void) " set in usrloc module\n"); return -1; } - if (natping_processes>=8) { - LM_ERR("too many natping processes (%d) max=8\n", - natping_processes); + if (natping_processes<0) { + LM_ERR("bad config - natping_processes must be > 0\n"); return -1; }

11 years, 4 months

[tracker] Comment added: Nathelper: modparam natping_processes max value

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#321 - Nathelper: modparam natping_processes max value User who did this - Daniel-Constantin Mierla (miconda) ---------- It is ok to backport, that is rather strange limitation and does not add/remove features. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=321#comment990 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.

11 years, 4 months

[tracker] Comment added: Nathelper: modparam natping_processes max value

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#321 - Nathelper: modparam natping_processes max value User who did this - Daniel-Constantin Mierla (miconda) ---------- OK, just some useless functions call, but is startup, so not real impact. You can commit. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=321#comment989 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.

11 years, 4 months

[tracker] Comment added: Nathelper: modparam natping_processes max value

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#321 - Nathelper: modparam natping_processes max value User who did this - Víctor Seva (linuxmaniac) ---------- BTW, can I push this fix to 4.0 branch too? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=321#comment988 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.

11 years, 4 months

[tracker] Comment added: Nathelper: modparam natping_processes max value

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#321 - Nathelper: modparam natping_processes max value User who did this - Víctor Seva (linuxmaniac) ---------- AFAIK if natping_processes==0: register_dummy_timers(natping_processes); /** * \brief update internal counters for running new basic sec. timers * @param timers number of basic timer processes * @return 0 on success; -1 on error */ int register_basic_timers(int timers) { if(register_procs(timers)<0) return -1; cfg_register_child(timers); return 0; } So... It seems no process is created. Just what we expected. doesn't it? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=321#comment987 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.

11 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2013