sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
382 discussions

git:master: pipelimit: enhanced docs for pl_check() function
by Daniel-Constantin Mierla 17 Oct '14

17 Oct '14

Module: sip-router Branch: master Commit: 24e76b1932fa8c4e1136ad82cb582a97c50244c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24e76b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 17 09:42:13 2014 +0200 pipelimit: enhanced docs for pl_check() function - documented the algorithm and limit parameters --- modules/pipelimit/README | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules/pipelimit/README b/modules/pipelimit/README index 094622b..9f4caf1 100644 --- a/modules/pipelimit/README +++ b/modules/pipelimit/README @@ -308,7 +308,11 @@ kamcmd cfg.set_now_string pipelimit reply_reason "Limiting" * 2 if pipe has NOP algorithm Meaning of the parameters is as follows: - * name - the pseudovariable holding the pipe name. + * name - the string or pseudovariable with the pipe name. + * algorithm - the string or pseudovariable with the algorithm. The + values can be: taildrop, red, network or feedback - see readme of + ratelimit module for details on each algorithm. + * limit - the integer or pseudovariable with the limit value. This function can be used from REQUEST_ROUTE. @@ -347,6 +351,13 @@ with unexpected retcode=$var(check_result)\n"); exit; } ... + # perform pipe match for authenticated user + $var(limit) = 20; + if (!pl_check("$au", "traildrop", "$var(limit)")) { + pl_drop(); + exit; + } +... 4.2. pl_drop([ [min ], max ])

1 0

git:master: pipelimit: fix dynamic pipe limit check
by Daniel-Constantin Mierla 17 Oct '14

17 Oct '14

Module: sip-router Branch: master Commit: b76afe7c0699b936bec3d7bb1c3a740bf08fdb1c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b76afe7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 17 09:40:33 2014 +0200 pipelimit: fix dynamic pipe limit check - proper add and check at the same time --- modules/pipelimit/doc/pipelimit_admin.xml | 18 +++++++++++++++++- modules/pipelimit/pipelimit.c | 6 +++--- modules/pipelimit/pl_ht.c | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/modules/pipelimit/doc/pipelimit_admin.xml b/modules/pipelimit/doc/pipelimit_admin.xml index d2ae537..0983f60 100644 --- a/modules/pipelimit/doc/pipelimit_admin.xml +++ b/modules/pipelimit/doc/pipelimit_admin.xml @@ -302,7 +302,15 @@ modparam("pipelimit", "reply_reason", "Limiting") <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem><para> - <emphasis>name</emphasis> - the pseudovariable holding the pipe name. + <emphasis>name</emphasis> - the string or pseudovariable with the pipe name. + </para></listitem> + <listitem><para> + <emphasis>algorithm</emphasis> - the string or pseudovariable with the + algorithm. The values can be: taildrop, red, network or feedback - see + readme of ratelimit module for details on each algorithm. + </para></listitem> + <listitem><para> + <emphasis>limit</emphasis> - the integer or pseudovariable with the limit value. </para></listitem> </itemizedlist> <para> @@ -345,6 +353,14 @@ with unexpected retcode=$var(check_result)\n"); exit; } ... + # perform pipe match for authenticated user + $var(limit) = 20; + if (!pl_check("$au", "traildrop", "$var(limit)")) { + pl_drop(); + exit; + } +... + </programlisting> </example> </section> diff --git a/modules/pipelimit/pipelimit.c b/modules/pipelimit/pipelimit.c index b76ba0d..3e6b918 100644 --- a/modules/pipelimit/pipelimit.c +++ b/modules/pipelimit/pipelimit.c @@ -645,7 +645,7 @@ static int w_pl_check3(struct sip_msg* msg, char *p1pipe, char *p2alg, return -1; } - pipe = pl_pipe_get(&pipeid, 1); + pipe = pl_pipe_get(&pipeid, 0); if(pipe==NULL) { LM_DBG("pipe not found [%.*s] - trying to add it\n", @@ -656,7 +656,7 @@ static int w_pl_check3(struct sip_msg* msg, char *p1pipe, char *p2alg, pipeid.len, pipeid.s); return -2; } - pipe = pl_pipe_get(&pipeid, 1); + pipe = pl_pipe_get(&pipeid, 0); if(pipe==NULL) { LM_ERR("failed to retrieve pipe [%.*s]\n", @@ -665,7 +665,7 @@ static int w_pl_check3(struct sip_msg* msg, char *p1pipe, char *p2alg, } } - return 1; + return pl_check(msg, &pipeid); } static int fixup_pl_check3(void** param, int param_no) diff --git a/modules/pipelimit/pl_ht.c b/modules/pipelimit/pl_ht.c index 3b4a3bd..6e48bb4 100644 --- a/modules/pipelimit/pl_ht.c +++ b/modules/pipelimit/pl_ht.c @@ -240,7 +240,7 @@ pl_pipe_t* pl_pipe_get(str *pipeid, int mode) if(pipeid->len==it->name.len && strncmp(pipeid->s, it->name.s, pipeid->len)==0) { - /* lock_release(&_pl_pipes_ht->slots[idx].lock);*/ + if(mode==0) lock_release(&_pl_pipes_ht->slots[idx].lock); return it; } it = it->next;

1 0

git:refs/tags/4.2.0: ChangeLog: content updated for v4.2.0
by Victor Seva 16 Oct '14

16 Oct '14

Module: sip-router Branch: refs/tags/4.2.0 Commit: 36e695453762b5ed15e5048fad2c559bb239dad5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36e6954… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 16 14:43:49 2014 +0200 ChangeLog: content updated for v4.2.0 --- ChangeLog | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f2fb87..859437e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,30 @@ ===================== Changes Since Version 4.1.0 =========================== +commit f73862c80d27abdcebb2a8e931d0dd16c3aa8e02 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Oct 16 14:34:51 2014 +0200 + + Makefile.defs: version set to 4.2.0 + +commit 33813b2057a73c64362e26473ac64a6501c5d7c7 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Oct 16 14:32:33 2014 +0200 + + pkg/deb: version set to 4.2.0 in specs + +commit a6ca57d60df230aa3d334a1276bbfba2cfdd29a1 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Oct 16 14:27:54 2014 +0200 + + pkg/rpm: set version to 4.2.0 in specs + +commit d353917c9e880da60282e39cb8c5c06193f6e4c5 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Oct 16 10:19:22 2014 +0200 + + ChangeLog: updates to content in preparation for 4.2.0 release + commit 3948305d86f6211428f60c58e138b18aacb3dde5 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 16 09:55:58 2014 +0200

1 0

pv module breakage in 4.2 branch
by Alex Balashov 16 Oct '14

16 Oct '14

There appear to be some git merge droppings in modules/pv/pv_trans.h that prevent successful compilation: CC (gcc) [M pv.so] pv.o In file included from pv.c:40: pv_trans.h:38: error: expected identifier before ‘<<’ token In file included from pv.c:40: pv_trans.h:44:9: error: invalid suffix "f441f..." on integer constant make[1]: *** [pv.o] Error 1 make: *** [install-modules] Error 1 -- Alex Balashov - Principal Evariste Systems LLC Tel: +1-678-954-0670 Web: http://www.evaristesys.com/, http://www.alexbalashov.com/ Please be kind to the English language: http://www.entrepreneur.com/article/232906

2 3

git:master: Examples/Serving-CSCF: Add XSD for release 8
by Carsten Bock 16 Oct '14

16 Oct '14

Module: sip-router Branch: master Commit: 54e7ad1e07af0ce0b25c921ad9766e93b66e6d68 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54e7ad1… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Oct 16 20:56:44 2014 +0200 Examples/Serving-CSCF: Add XSD for release 8 --- examples/scscf/CxDataType_Rel8.xsd | 379 ++++++++++++++++++++++++++++++++++++ 1 files changed, 379 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=54e…

1 0

git:master: modules/pv: Add 7Bit Encoding/Decoding (e.g. for 3GPP-SMS)
by Carsten Bock 16 Oct '14

16 Oct '14

Module: sip-router Branch: master Commit: 9b11c8362a0b07cb3fc8779582a92cdc56c07752 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b11c83… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Oct 16 20:58:28 2014 +0200 modules/pv: Add 7Bit Encoding/Decoding (e.g. for 3GPP-SMS) --- modules/pv/pv_trans.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ modules/pv/pv_trans.h | 2 +- 2 files changed, 85 insertions(+), 1 deletions(-) diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index 96516f5..5c476b3 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -179,6 +179,62 @@ static int urldecode_param(str *sin, str *sout) { return 0; } +/* Encode 7BIT PDU */ +static int pdu_7bit_encode(str sin) { + int i, j; + unsigned char hex; + unsigned char nleft; + unsigned char fill; + char HexTbl[] = {"0123456789ABCDEF"}; + + nleft = 1; + j = 0; + for(i = 0; i < sin.len; i++) { + hex = *(sin.s) >> (nleft - 1); + fill = *(sin.s+1) << (8-nleft); + hex = hex | fill; + _tr_buffer[j++] = HexTbl[hex >> 4]; + _tr_buffer[j++] = HexTbl[hex & 0x0F]; + nleft++; + if(nleft == 8) { + sin.s++; + i++; + nleft = 1; + } + sin.s++; + } + _tr_buffer[j] = '\0'; + return j; +} + +/* Decode 7BIT PDU */ +static int pdu_7bit_decode(str sin) { + int i, j; + unsigned char nleft = 1; + unsigned char fill = 0; + unsigned char oldfill = 0; + j = 0; + for(i = 0; i < sin.len; i += 2) { + _tr_buffer[j] = (unsigned char)pv_from_hex(sin.s[i]) << 4; + _tr_buffer[j] |= (unsigned char)pv_from_hex(sin.s[i+1]); + fill = (unsigned char)_tr_buffer[j]; + fill >>= (8 - nleft); + _tr_buffer[j] <<= (nleft -1 ); + _tr_buffer[j] &= 0x7F; + _tr_buffer[j] |= oldfill; + oldfill = fill; + j++; + nleft++; + if(nleft == 8) { + _tr_buffer[j++] = oldfill; + nleft = 1; + oldfill = 0; + } + } + _tr_buffer[j] = '\0'; + return j; +} + /* -- transformations functions */ /*! @@ -312,6 +368,28 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s = _tr_buffer; val->rs.len = i; break; + case TR_S_ENCODE7BIT: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len > (TR_BUFFER_SIZE*7/8) -1) + return -1; + i = pdu_7bit_encode(val->rs); + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.len = i; + break; + case TR_S_DECODE7BIT: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len>TR_BUFFER_SIZE/2-1) + return -1; + i = pdu_7bit_decode(val->rs); + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.len = i; + break; case TR_S_ENCODEBASE64: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -1960,6 +2038,12 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==11 && strncasecmp(name.s, "decode.hexa", 11)==0) { t->subtype = TR_S_DECODEHEXA; goto done; + } else if(name.len==11 && strncasecmp(name.s, "encode.7bit", 11)==0) { + t->subtype = TR_S_ENCODE7BIT; + goto done; + } else if(name.len==11 && strncasecmp(name.s, "decode.7bit", 11)==0) { + t->subtype = TR_S_DECODE7BIT; + goto done; } else if(name.len==13 && strncasecmp(name.s, "encode.base64", 13)==0) { t->subtype = TR_S_ENCODEBASE64; goto done; diff --git a/modules/pv/pv_trans.h b/modules/pv/pv_trans.h index 346fd32..be3c7ac 100644 --- a/modules/pv/pv_trans.h +++ b/modules/pv/pv_trans.h @@ -37,7 +37,7 @@ enum _tr_type { TR_NONE=0, TR_STRING, TR_URI, TR_PARAMLIST, TR_NAMEADDR, enum _tr_s_subtype { TR_S_NONE=0, TR_S_LEN, TR_S_INT, TR_S_MD5, TR_S_SHA256, TR_S_SHA384, TR_S_SHA512, TR_S_SUBSTR, TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA, - TR_S_ENCODEBASE64, TR_S_DECODEBASE64, + TR_S_ENCODE7BIT, TR_S_DECODE7BIT, TR_S_ENCODEBASE64, TR_S_DECODEBASE64, 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,

1 0

git:master: b/f: Examples/Proxy-CSCF: Need to set_contact_alias() also for UPDATE
by Carsten Bock 16 Oct '14

16 Oct '14

Module: sip-router Branch: master Commit: 495bf0f0bf5260fb7f99a9acf9201fd6b2fa4ec1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=495bf0f… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Oct 16 20:55:57 2014 +0200 b/f: Examples/Proxy-CSCF: Need to set_contact_alias() also for UPDATE --- examples/pcscf/kamailio.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/examples/pcscf/kamailio.cfg b/examples/pcscf/kamailio.cfg index 877d7bd..21a0146 100644 --- a/examples/pcscf/kamailio.cfg +++ b/examples/pcscf/kamailio.cfg @@ -655,7 +655,7 @@ route[NAT] { #!ifdef WITH_NAT force_rport(); if (nat_uac_test("19") && !ds_is_from_list()) { - if(is_method("INVITE|SUBSCRIBE")) { + if(is_method("INVITE|SUBSCRIBE|UPDATE")) { set_contact_alias(); } setflag(FLT_NAT);

1 0

Kamailio v4.2.0 Released - new major version is out
by Daniel-Constantin Mierla 16 Oct '14

16 Oct '14

Kamailio v4.2.0 is out – a new major release, bringing out a consistent set of new features and improvements. You can read detailed release notes at: * http://www.kamailio.org/w/kamailio-v4-2-0-release-notes/ Many thanks to all developers and community members that made possible this release. Enjoy Kamailio v4.2.0! Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:master: modules/ims_usrloc_scscf: better debug and error logging
by Jason Penton 16 Oct '14

16 Oct '14

Module: sip-router Branch: master Commit: 3e1addb00edb996b79b10126f7732e826d2ff5c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e1addb… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 16 15:08:02 2014 +0200 modules/ims_usrloc_scscf: better debug and error logging --- modules/ims_usrloc_scscf/subscribe.c | 5 ++++- modules/ims_usrloc_scscf/udomain.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/ims_usrloc_scscf/subscribe.c b/modules/ims_usrloc_scscf/subscribe.c index 3e1ae5c..c4ec371 100644 --- a/modules/ims_usrloc_scscf/subscribe.c +++ b/modules/ims_usrloc_scscf/subscribe.c @@ -240,13 +240,16 @@ str get_presentity_from_subscriber_dialog(str *callid, str *to_tag, str *from_ta int add_subscriber(impurecord_t* urec, subscriber_data_t* subscriber_data, reg_subscriber** _reg_subscriber, int db_load) { + reg_subscriber *s; LM_DBG("Adding reg subscription to IMPU record"); if (!urec) { LM_ERR("no presentity impu record provided\n"); return 0; } - reg_subscriber *s = new_subscriber(subscriber_data); + + s = new_subscriber(subscriber_data); + if (!s) return -1; diff --git a/modules/ims_usrloc_scscf/udomain.c b/modules/ims_usrloc_scscf/udomain.c index 5823148..83f4402 100644 --- a/modules/ims_usrloc_scscf/udomain.c +++ b/modules/ims_usrloc_scscf/udomain.c @@ -537,7 +537,7 @@ int delete_impurecord(udomain_t* _d, str* _aor, struct impurecord* _r) { struct ucontact* c, *t; - LM_DBG("Deleting IMPURECORD\n"); + LM_DBG("Deleting IMPURECORD [%.*s]\n", _r->public_identity.len, _r->public_identity.s); if (_r==0) { if (get_impurecord(_d, _aor, &_r) > 0) { @@ -550,7 +550,7 @@ int delete_impurecord(udomain_t* _d, str* _aor, struct impurecord* _r) t = c; c = c->next; if (delete_ucontact(_r, t) < 0) { - LM_ERR("deleting contact failed\n"); + LM_ERR("deleting contact failed [%.*s]\n", c->aor->len, c->aor->s); return -1; } } @@ -562,7 +562,7 @@ int delete_impurecord(udomain_t* _d, str* _aor, struct impurecord* _r) /*DB?*/ if (db_mode == WRITE_THROUGH && db_delete_impurecord(_d, _r) != 0) { - LM_ERR("error inserting contact into db"); + LM_ERR("error deleting IMPU record from db"); return 0; }

1 0

git:4.2: Makefile.defs: version set to 4.2.0
by Daniel-Constantin Mierla 16 Oct '14

16 Oct '14

Module: sip-router Branch: 4.2 Commit: f73862c80d27abdcebb2a8e931d0dd16c3aa8e02 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f73862c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 16 14:34:51 2014 +0200 Makefile.defs: version set to 4.2.0 --- Makefile.defs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index e1073bc..bc3170e 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -164,8 +164,8 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 PATCHLEVEL = 2 -SUBLEVEL = 0 -EXTRAVERSION = -rc1 +SUBLEVEL = 0 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014