sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
297 discussions

git:master: pv: updated param transformations so that you can (optionally) specify what the parameter delimiter is
by Peter Dunkley 25 Sep '13

25 Sep '13

Module: sip-router Branch: master Commit: 454a28dad2fef3f1adaf0acec9a7f1c320fe6571 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=454a28d… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Wed Sep 25 16:11:57 2013 +0100 pv: updated param transformations so that you can (optionally) specify what the parameter delimiter is - default behaviour unchanged - this allows HTTP URL parameters to be decoded --- modules/pv/pv_trans.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 97 insertions(+), 1 deletions(-) diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index abfff74..5730da8 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -1129,6 +1129,7 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t v; str sv; int n, i; + char separator = ';'; param_hooks_t phooks; param_t *pit=NULL; @@ -1138,6 +1139,29 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, if(_tr_params_str.len==0 || _tr_params_str.len!=val->rs.len || strncmp(_tr_params_str.s, val->rs.s, val->rs.len)!=0) { + if (subtype == TR_PL_COUNT) + { + if (tp != NULL) + { + if(tp->type != TR_PARAM_STRING + || tp->v.s.len != 1) + return -1; + + separator = tp->v.s.s[0]; + } + } + else + { + if(tp->next != NULL) + { + if(tp->next->type != TR_PARAM_STRING + || tp->next->v.s.len != 1) + return -1; + + separator = tp->next->v.s.s[0]; + } + } + if(val->rs.len>_tr_params_str.len) { if(_tr_params_str.s) pkg_free(_tr_params_str.s); @@ -1167,7 +1191,8 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, /* parse params */ sv = _tr_params_str; - if (parse_params(&sv, CLASS_ANY, &phooks, &_tr_params_list)<0) + if (parse_params2(&sv, CLASS_ANY, &phooks, &_tr_params_list, + separator)<0) return -1; } @@ -2307,6 +2332,7 @@ char* tr_parse_paramlist(str* in, trans_t *t) char *p; char *p0; char *ps; + char *start_pos; str s; str name; int n; @@ -2347,6 +2373,22 @@ char* tr_parse_paramlist(str* in, trans_t *t) t->params = tp; tp = 0; while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + + if(*p==TR_PARAM_MARKER) + { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + if (p - start_pos != 1) + { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + } + if(*p!=TR_RBRACKET) { LM_ERR("invalid value transformation: %.*s!\n", @@ -2367,6 +2409,22 @@ char* tr_parse_paramlist(str* in, trans_t *t) t->params = tp; tp = 0; while(is_in_str(p, in) && (*p==' ' || *p=='\t' || *p=='\n')) p++; + + if(*p==TR_PARAM_MARKER) + { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + if (p - start_pos != 1) + { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + } + if(*p!=TR_RBRACKET) { LM_ERR("invalid name transformation: %.*s!\n", @@ -2387,6 +2445,22 @@ char* tr_parse_paramlist(str* in, trans_t *t) t->params = tp; tp = 0; while(is_in_str(p, in) && (*p==' ' || *p=='\t' || *p=='\n')) p++; + + if(*p==TR_PARAM_MARKER) + { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + if (p - start_pos != 1) + { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + } + if(*p!=TR_RBRACKET) { LM_ERR("invalid name transformation: %.*s!\n", @@ -2396,6 +2470,28 @@ char* tr_parse_paramlist(str* in, trans_t *t) goto done; } else if(name.len==5 && strncasecmp(name.s, "count", 5)==0) { t->subtype = TR_PL_COUNT; + if(*p==TR_PARAM_MARKER) + { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params = tp; + tp = 0; + if (p - start_pos != 1) + { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid name transformation: %.*s!\n", + in->len, in->s); + goto error; + } + } + goto done; }

1 0

git:master: core: updated parse_param so that the delimiter for parameters can be user-defined
by Peter Dunkley 25 Sep '13

25 Sep '13

Module: sip-router Branch: master Commit: e0abe290c6ff287574e2abcadcc7a0f11197e268 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e0abe29… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Wed Sep 25 16:11:23 2013 +0100 core: updated parse_param so that the delimiter for parameters can be user-defined --- parser/parse_param.c | 62 ++++++++++++++++++++++++++++++++++++++----------- parser/parse_param.h | 13 ++++++++++ 2 files changed, 61 insertions(+), 14 deletions(-) diff --git a/parser/parse_param.c b/parser/parse_param.c index ac22387..45ca4e8 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -331,7 +331,7 @@ static inline int parse_quoted_param(str* _s, str* _r) * let _r point to the token and update _s * to point right behind the token */ -static inline int parse_token_param(str* _s, str* _r) +static inline int parse_token_param(str* _s, str* _r, char separator) { int i; @@ -361,12 +361,14 @@ static inline int parse_token_param(str* _s, str* _r) case '\r': case '\n': case ',': - case ';': /* So if you find * any of them * stop iterating */ goto out; + default: + if(_s->s[i] == separator) + goto out; } } out: @@ -391,7 +393,7 @@ static inline int parse_token_param(str* _s, str* _r) /*! \brief * Parse a parameter name */ -static inline void parse_param_name(str* _s, pclass_t _c, param_hooks_t* _h, param_t* _p) +static inline void parse_param_name(str* _s, pclass_t _c, param_hooks_t* _h, param_t* _p, char separator) { if (!_s->s) { @@ -407,10 +409,12 @@ static inline void parse_param_name(str* _s, pclass_t _c, param_hooks_t* _h, par case '\t': case '\r': case '\n': - case ';': case ',': case '=': goto out; + default: + if (_s->s[0] == separator) + goto out; } _s->s++; _s->len--; @@ -435,7 +439,7 @@ static inline void parse_param_name(str* _s, pclass_t _c, param_hooks_t* _h, par * Parse body of a parameter. It can be quoted string or * a single token. */ -static inline int parse_param_body(str* _s, param_t* _c) +static inline int parse_param_body(str* _s, param_t* _c, char separator) { if (_s->s[0] == '\"' || _s->s[0] == '\'') { if (parse_quoted_param(_s, &(_c->body)) < 0) { @@ -443,7 +447,7 @@ static inline int parse_param_body(str* _s, param_t* _c) return -2; } } else { - if (parse_token_param(_s, &(_c->body)) < 0) { + if (parse_token_param(_s, &(_c->body), separator) < 0) { LOG(L_ERR, "parse_param_body(): Error while parsing token\n"); return -3; } @@ -453,6 +457,8 @@ static inline int parse_param_body(str* _s, param_t* _c) } + + /*! \brief * Only parse one parameter * Returns: @@ -461,11 +467,11 @@ static inline int parse_param_body(str* _s, param_t* _c) * 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) +static inline int parse_param2(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t, char separator) { memset(t, 0, sizeof(param_t)); - parse_param_name(_s, _c, _h, t); + parse_param_name(_s, _c, _h, t, separator); trim_leading(_s); if (_s->len == 0) { /* The last parameter without body */ @@ -483,7 +489,7 @@ inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t) * we just set the length of parameter body to 0. */ t->body.s = _s->s; t->body.len = 0; - } else if (parse_param_body(_s, t) < 0) { + } else if (parse_param_body(_s, t, separator) < 0) { LOG(L_ERR, "parse_params(): Error while parsing param body\n"); goto error; } @@ -501,8 +507,9 @@ inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t) if (_s->s[0] == ',') goto ok; /* To be able to parse header parameters */ if (_s->s[0] == '>') goto ok; /* To be able to parse URI parameters */ - if (_s->s[0] != ';') { - LOG(L_ERR, "parse_params(): Invalid character, ; expected\n"); + if (_s->s[0] != separator) { + LOG(L_ERR, "parse_params(): Invalid character, %c expected\n", + separator); goto error; } @@ -511,7 +518,8 @@ inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t) trim_leading(_s); if (_s->len == 0) { - LOG(L_ERR, "parse_params(): Param name missing after ;\n"); + LOG(L_ERR, "parse_params(): Param name missing after %c\n", + separator); goto error; } @@ -523,7 +531,18 @@ error: return -1; } - +/*! \brief + * Only parse one parameter + * Returns: + * t: out parameter + * -1: on error + * 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) +{ + return parse_param2(_s, _c, _h, t, ';'); +} /*! \brief * Parse parameters @@ -535,6 +554,21 @@ error: */ int parse_params(str* _s, pclass_t _c, param_hooks_t* _h, param_t** _p) { + return parse_params2(_s, _c, _h, _p, ';'); +} + +/*! \brief + * Parse parameters with configurable separator + * \param _s is string containing parameters, it will be updated to point behind the parameters + * \param _c is class of parameters + * \param _h is pointer to structure that will be filled with pointer to well known parameters + * \param _p pointing to linked list where parsed parameters will be stored + * \param separator single character separator + * \return 0 on success and negative number on an error + */ +int parse_params2(str* _s, pclass_t _c, param_hooks_t* _h, param_t** _p, + char separator) +{ param_t* t; if (!_s || !_p) { @@ -558,7 +592,7 @@ int parse_params(str* _s, pclass_t _c, param_hooks_t* _h, param_t** _p) goto error; } - switch(parse_param(_s, _c, _h, t)) { + switch(parse_param2(_s, _c, _h, t, separator)) { case 0: break; case 1: goto ok; default: goto error; diff --git a/parser/parse_param.h b/parser/parse_param.h index d544f62..f91a1a2 100644 --- a/parser/parse_param.h +++ b/parser/parse_param.h @@ -167,6 +167,19 @@ extern inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t * */ int parse_params(str* _s, pclass_t _c, param_hooks_t* _h, param_t** _p); +/*! \brief + * Parse parameters + * \param _s is string containing parameters + * \param _c is class of parameters + * \param _h is pointer to structure that will be filled with pointer to well known parameters + * linked list of parsed parameters will be stored in the variable _p is pointing to + * \param separator single character separator + * \return The function returns 0 on success and negative number + * on an error + */ +int parse_params2(str* _s, pclass_t _c, param_hooks_t* _h, param_t** _p, + char separator); + /*! \brief * Free linked list of parameters

1 0

git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support
by Richard Good 25 Sep '13

25 Sep '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: aec66a615e87db0bddac4b98f497282049711b56 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aec66a6… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Sep 25 12:51:26 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support ---

1 0

git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media
by Richard Good 25 Sep '13

25 Sep '13

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 93dbd0e8c3d53f640841d14fb4d16b977882ed4a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93dbd0e… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Sep 25 12:49:47 2013 +0200 Merge branch 'master' into richard.good/diameter_rx_media ---

1 0

Re: [sr-dev] Mobile Apps
by sam＠dsmedia.com.sg 25 Sep '13

25 Sep '13

Thanks for your reply. The server is running with public IP address. But we are facing these problem. 1.. Audio can connect but can't hear audio in both sides. 2.. Video connection never happens. It was processing for very long. There is no problem when we test in home wireless network. The audio and video connects w/o any problem. The SIP server is still the same server which is located at data centre. Not able to connect in 3G/4G. Thanks for your help. ----- Original Message ----- From: Muhammad Shahzad To: sam(a)dsmedia.com.sg ; Kamailio (SER) - Development Mailing List Sent: Wednesday, September 25, 2013 10:38 AM Subject: Re: [sr-dev] Mobile Apps If you are using default kamailio.cfg then it should work out of the box, you only need to ensure that your server is running on machine with public IP address, so, it would be reachable over 3G / 4G networks etc. Thank you. On Wed, Sep 25, 2013 at 1:05 AM, <sam(a)dsmedia.com.sg> wrote: Dear Sir/Madam, I need some assistance.We are developing a mobile Apps. The apps has module for chat which consists of audio and video. I am using Linphone for client and Kamailio for SIP Server. When we tested it works in the same wifi only. Does not work in 3g/4G or different wifi networks. Text is ok. Audio call is connected but can't hear audio in both sides. Same for video. It is processing for very long. Please assist on this. Thanks SamG DS Media http://www.dsmedia.com.sg https://www.youtube.com/user/Dsmediatv _______________________________________________ sr-dev mailing list sr-dev(a)lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev -- Mit freundlichen Grüßen Muhammad Shahzad ----------------------------------- CISCO Rich Media Communication Specialist (CRMCS) CISCO Certified Network Associate (CCNA) Cell: +49 176 99 83 10 85 MSN: shari_786pk(a)hotmail.com Email: shaheryarkh(a)googlemail.com No virus found in this message. Checked by AVG - www.avg.com Version: 2013.0.3408 / Virus Database: 3222/6696 - Release Date: 09/24/13

2 1

Patch for mi_xmlrpc module
by Muhammad Shahzad 25 Sep '13

25 Sep '13

Last night, i upgraded my dev machine from debian squeeze to debian wheezy, so i have to recompile kamailio and relevant dependencies again. However kamailio compilation failed for module mi_xmlrpc, since wheezy has newer version of libxmlrpc-c3 library that is incompatible with kamailio version 4.0.3. Cutting the long story short, i end up writing a small patch for compatibility of mi_xmlrpc module for newer library. I am attaching the patch file here, (since i don't have write access to kamailio trunk) and hope someone from kamailio developer team will take a look at it and merge it to trunk. The patch successfully compiles mi_xmlrpc module and seems to be stable working perfect, and hopefully seamlessly work on other distributions as well. I have tested it against libxmlrpc-c3 version 1.16.x (installed by apt) and 1.35.x (latest trunk). Let me know for any problems with it. Thank you. -- Mit freundlichen Grüßen Muhammad Shahzad ----------------------------------- CISCO Rich Media Communication Specialist (CRMCS) CISCO Certified Network Associate (CCNA) Cell: +49 176 99 83 10 85 MSN: shari_786pk(a)hotmail.com Email: shaheryarkh(a)googlemail.com

2 1

Mobile Apps
by sam＠dsmedia.com.sg 24 Sep '13

24 Sep '13

Dear Sir/Madam, I need some assistance.We are developing a mobile Apps. The apps has module for chat which consists of audio and video. I am using Linphone for client and Kamailio for SIP Server. When we tested it works in the same wifi only. Does not work in 3g/4G or different wifi networks. Text is ok. Audio call is connected but can't hear audio in both sides. Same for video. It is processing for very long. Please assist on this. Thanks SamG DS Media http://www.dsmedia.com.sg https://www.youtube.com/user/Dsmediatv

1 0

[tracker] Comment added: Invalide tel INVITE crashes 4.0.3
by sip-router 24 Sep '13

24 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#348 - Invalide tel INVITE crashes 4.0.3 User who did this - Daniel Tryba (dtryba) ---------- The short syslog output is from an other crash on production. The attached files are all for the same failure on a test machine, but strange enough the DNS resolve error is missing. No loopkups in failure routes AFAIK. It will take some days before I can build a new test environment. The Q&D workaround is if($rU=~"[^0-9+]") { send_reply("478","Invalid destination [$rU]"); exit; } since the only route these calls should take is to a PSTN gateway. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=348#comment1101 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

[tracker] Comment added: presence_dialoginfo -> force_single doesn't sent most relevant xml
by sip-router 24 Sep '13

24 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#341 - presence_dialoginfo -> force_single doesn't sent most relevant xml User who did this - Daniel-Constantin Mierla (miconda) ---------- Any follow up on this? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=341#comment1100 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

kamailio inter-process communication
by dennis yu 24 Sep '13

24 Sep '13

hi guys, i am a newbie with kamailio dev, with my circumstance, I need some approaches for notify inter-process what happend. for example, my module need invoke thrift interface for some operation use tcp long connection. when tcp disconnected, I don't want connect thrift server direct in tcp receiver process, because connect operation will block process. I have more than one thrift serveres, my module can use other connection when one of them going down. but I need some approaches that told tcp receive process to reconnect thrift server in exactly time. maybe I can use slow-timer process to attempt connect thrift server. how to notify my module ? thanks for any advises.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013