sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
301 discussions

git:4.3:27c0918a: etc/kamailio-oob.cfg: remove modules_k from mpath

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 27c0918a9198e6c7d684541ddfabe598d35dbba8 URL: https://github.com/kamailio/kamailio/commit/27c0918a9198e6c7d684541ddfabe59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:30:31+02:00 etc/kamailio-oob.cfg: remove modules_k from mpath (cherry picked from commit d796409e653031fdfecee554500b06a43b981296) --- Modified: etc/kamailio-oob.cfg --- Diff: https://github.com/kamailio/kamailio/commit/27c0918a9198e6c7d684541ddfabe59… Patch: https://github.com/kamailio/kamailio/commit/27c0918a9198e6c7d684541ddfabe59… --- diff --git a/etc/kamailio-oob.cfg b/etc/kamailio-oob.cfg index 2de8a2b..1f07958 100644 --- a/etc/kamailio-oob.cfg +++ b/etc/kamailio-oob.cfg @@ -223,9 +223,9 @@ voicemail.srv_port = "5060" desc "VoiceMail Port" # set paths to location of modules (to sources or installation folders) #!ifdef WITH_SRCPATH -mpath="modules_k:modules" +mpath="modules" #!else -mpath="/usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/" +mpath="/usr/local/lib/kamailio/modules/" #!endif #!ifdef WITH_MYSQL

9 years, 5 months

git:4.3:3551d707: pv: catch early setting $rU with empty string

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 3551d707fa497554f3da767e9fba8e046f83b417 URL: https://github.com/kamailio/kamailio/commit/3551d707fa497554f3da767e9fba8e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:29:57+02:00 pv: catch early setting $rU with empty string - avoids backing up and restoring last char, which can create inappropriate access when using static empty string value (cherry picked from commit adf1bca4a820e9cb5fcc94a1953b0fcdbd8a20da) --- Modified: modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/3551d707fa497554f3da767e9fba8e0… Patch: https://github.com/kamailio/kamailio/commit/3551d707fa497554f3da767e9fba8e0… --- diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 9cbad39..745286a 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -2080,7 +2080,8 @@ int pv_set_ruri_user(struct sip_msg* msg, pv_param_t *param, return -1; } - if((val==NULL) || (val->flags&PV_VAL_NULL)) + if((val==NULL) || (val->flags&PV_VAL_NULL) + || ((val->flags&PV_VAL_STR) && val->rs.len<=0)) { memset(&act, 0, sizeof(act)); act.type = SET_USER_T;

9 years, 5 months

git:4.3:b896bb31: Makefile.groups: rename usrloc_dmq to dmq_usrloc

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: b896bb31155240011c32ff6444c0f30c269ae6d0 URL: https://github.com/kamailio/kamailio/commit/b896bb31155240011c32ff6444c0f30… Author: Paul Arnold <paul(a)barfoo.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:29:29+02:00 Makefile.groups: rename usrloc_dmq to dmq_usrloc (cherry picked from commit 8dcc663d050ec314e35ed2c4bcaae592f8e39350) --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/b896bb31155240011c32ff6444c0f30… Patch: https://github.com/kamailio/kamailio/commit/b896bb31155240011c32ff6444c0f30… --- diff --git a/Makefile.groups b/Makefile.groups index 3f0dad8..53ca27d 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -20,7 +20,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ # - extra used modules, with no extra dependency mod_list_extra=avp auth_diameter call_control dmq domainpolicy msrp pdb \ qos sca seas sms sst timer tmrec uac_redirect xhttp \ - xhttp_rpc xprint jsonrpc-s nosip usrloc_dmq statsd rtjson + xhttp_rpc xprint jsonrpc-s nosip dmq_usrloc statsd rtjson # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

9 years, 5 months

git:4.3:6279f50a: Makefile.defs: detect gcc version 5.0+

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 6279f50a2cdbcba34226f959f40258bb768954bc URL: https://github.com/kamailio/kamailio/commit/6279f50a2cdbcba34226f959f40258b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:28:04+02:00 Makefile.defs: detect gcc version 5.0+ - reported by Anthony Messina, GH #230 (cherry picked from commit 35e5da141569b8ace7c0a8fd743d02de6c0df525) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6279f50a2cdbcba34226f959f40258b… Patch: https://github.com/kamailio/kamailio/commit/6279f50a2cdbcba34226f959f40258b…

9 years, 5 months

git:4.3:6acc9884: pv: documented pv_xavp_print() function

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 6acc988416ebfd03e4471cb11ae25e5c53690945 URL: https://github.com/kamailio/kamailio/commit/6acc988416ebfd03e4471cb11ae25e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:27:49+02:00 pv: documented pv_xavp_print() function (cherry picked from commit aa5156037e0884e7aa3981421a15327fffd62f99) --- Modified: modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6acc988416ebfd03e4471cb11ae25e5… Patch: https://github.com/kamailio/kamailio/commit/6acc988416ebfd03e4471cb11ae25e5… --- diff --git a/modules/pv/doc/pv_admin.xml b/modules/pv/doc/pv_admin.xml index a630b29..f215e41 100644 --- a/modules/pv/doc/pv_admin.xml +++ b/modules/pv/doc/pv_admin.xml @@ -376,6 +376,25 @@ sbranch_reset(); </programlisting> </example> </section> + <section id="pv.f.pv_xavp_print"> + <title> + <function moreinfo="none">pv_xavp_print()</function> + </title> + <para> + Print all XAVPs to the syslog using INFO log level. + </para> + <para> + Function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pv_xavp_print()</function> usage</title> + <programlisting format="linespecific"> +... +pv_xavp_print(); +... + </programlisting> + </example> + </section> </section> <section>

9 years, 5 months

git:4.3:a3f01fa8: core: update release notes in NEWS

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: a3f01fa8abc6abf885bb77263e3ef5b275a7edc6 URL: https://github.com/kamailio/kamailio/commit/a3f01fa8abc6abf885bb77263e3ef5b… Author: Fred Posner <fred(a)palner.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:26:46+02:00 core: update release notes in NEWS - Earlier versions for 3.1 and earlier remain. Newer versions are linked to the Kamailio website. (cherry picked from commit 917bd965e230c9c60906e1c2d3c9ed3df7b00e7f) --- Modified: NEWS --- Diff: https://github.com/kamailio/kamailio/commit/a3f01fa8abc6abf885bb77263e3ef5b… Patch: https://github.com/kamailio/kamailio/commit/a3f01fa8abc6abf885bb77263e3ef5b… --- diff --git a/NEWS b/NEWS index f9792f2..eb66eca 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,20 @@ Release notes for Kamailio/SIP Router (sr) *********************************************** -For news about release 4.0, please check +Starting with release 3.2, release notes have +been posted to the Kamailio website. Release +notes for previous versions are posted below. + +For releases after 3.1, please visit: + +http://www.kamailio.org/wiki/features/new-in-4.3.x +http://www.kamailio.org/wiki/features/new-in-4.2.x +http://www.kamailio.org/wiki/features/new-in-4.1.x http://www.kamailio.org/wiki/features/new-in-4.0.x +http://www.kamailio.org/wiki/features/new-in-3.3.x +http://www.kamailio.org/wiki/features/new-in-3.2.x + +Earlier verisons are listed below. =================================================== sip-router 3.1 changes

9 years, 5 months

git:4.3:05ac2a2b: core: fix matching network addresses with bitmask non divisible to 8

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 05ac2a2b88f476b0fd32b1bf314b2357eedfceb0 URL: https://github.com/kamailio/kamailio/commit/05ac2a2b88f476b0fd32b1bf314b235… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:25:58+02:00 core: fix matching network addresses with bitmask non divisible to 8 - reported by Kyle Kurz <kkurz(a)digium.com> for permissions module (cherry picked from commit f429e753dfa750a604bfb0acb5068b47d0fbe142) --- Modified: ip_addr.c --- Diff: https://github.com/kamailio/kamailio/commit/05ac2a2b88f476b0fd32b1bf314b235… Patch: https://github.com/kamailio/kamailio/commit/05ac2a2b88f476b0fd32b1bf314b235… --- diff --git a/ip_addr.c b/ip_addr.c index 8504740..3412af9 100644 --- a/ip_addr.c +++ b/ip_addr.c @@ -377,7 +377,8 @@ char* get_proto_name(unsigned int proto) int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr, int mask) { - unsigned char c; + unsigned char ci; + unsigned char cn; int i; int mbytes; int mbits; @@ -420,8 +421,9 @@ int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr, mbits = mask % 8; if(mbits==0) return 0; - c = naddr->u.addr[i] & (~((1 << (8 - mbits)) - 1)); - if((iaddr->u.addr[i] & c) == c) + ci = iaddr->u.addr[i] & (~((1 << (8 - mbits)) - 1)); + cn = naddr->u.addr[i] & (~((1 << (8 - mbits)) - 1)); + if(ci == cn) return 0; return -1; }

9 years, 5 months

git:4.3:5d1fe9db: prevent jansson from shuffling key order in json

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 5d1fe9db6ef3da2d349a1b77bd441eda19ff7aa0 URL: https://github.com/kamailio/kamailio/commit/5d1fe9db6ef3da2d349a1b77bd441ed… Author: kelchy <kelchy(a)bitbucket.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:25:39+02:00 prevent jansson from shuffling key order in json (cherry picked from commit 140d0c6fc89d3c72bbd45627ca627e19e45b4e53) --- Modified: modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/5d1fe9db6ef3da2d349a1b77bd441ed… Patch: https://github.com/kamailio/kamailio/commit/5d1fe9db6ef3da2d349a1b77bd441ed… --- diff --git a/modules/jansson/jansson_utils.c b/modules/jansson/jansson_utils.c index 85f87ad..4919b0e 100644 --- a/modules/jansson/jansson_utils.c +++ b/modules/jansson/jansson_utils.c @@ -33,7 +33,7 @@ int jansson_to_val(pv_value_t* val, char** freeme, json_t* v) { val->flags = 0; if(json_is_object(v) || json_is_array(v)) { - const char* value = json_dumps(v, JSON_COMPACT); + const char* value = json_dumps(v, JSON_COMPACT|JSON_PRESERVE_ORDER); *freeme = (char*)value; val->rs.s = (char*)value; val->rs.len = strlen(value);

9 years, 5 months

git:4.3:563cc6e0: INSTALL: updated bug tracker URL

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 563cc6e069079a66839ab1a9a0c7e12139cca6d9 URL: https://github.com/kamailio/kamailio/commit/563cc6e069079a66839ab1a9a0c7e12… Author: Fred Posner <fred(a)palner.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:25:21+02:00 INSTALL: updated bug tracker URL - fixed flavour typo (cherry picked from commit 115e1eb10566ffafe0f37aed92df8413f660ea6c) --- Modified: INSTALL --- Diff: https://github.com/kamailio/kamailio/commit/563cc6e069079a66839ab1a9a0c7e12… Patch: https://github.com/kamailio/kamailio/commit/563cc6e069079a66839ab1a9a0c7e12… --- diff --git a/INSTALL b/INSTALL index 130ae70..8a3ea13 100644 --- a/INSTALL +++ b/INSTALL @@ -50,7 +50,7 @@ Starting with version 3.0.0, the two SIP server flavours are built from same source code tree. In version 4.0.0 the two source code trees were merged even more, so a combined module directory is now used. -Kamailio flavor is the one built by default. SER is, historically speaking, the +Kamailio flavour is the one built by default. SER is, historically speaking, the first open source SIP server started in 2001. Kamailio forked from SER in 2005 under the initial name OpenSER. @@ -772,7 +772,7 @@ A: In both cases, the reason is probably an error in request routing script Q: Where to report issues? -A: Use bug tracker at: http://sip-router.org/tracker +A: Use bug tracker at: https://github.com/kamailio/kamailio/issues Q: Any F.A.Q. that could be helpful to check before reporting an issue?

9 years, 5 months

git:4.3:48996cc1: modules/htable: improves error message when loading from database

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 48996cc1e879a2abf96306fc69ace2a86b8ef836 URL: https://github.com/kamailio/kamailio/commit/48996cc1e879a2abf96306fc69ace2a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-17T12:24:41+02:00 modules/htable: improves error message when loading from database (cherry picked from commit f39736b276878f0de1e0471311119f12f1878801) --- Modified: modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/48996cc1e879a2abf96306fc69ace2a… Patch: https://github.com/kamailio/kamailio/commit/48996cc1e879a2abf96306fc69ace2a… --- diff --git a/modules/htable/ht_db.c b/modules/htable/ht_db.c index 06f3057..4288554 100644 --- a/modules/htable/ht_db.c +++ b/modules/htable/ht_db.c @@ -197,11 +197,17 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) do { for(i=0; i<RES_ROW_N(db_res); i++) { - if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING - || VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { - LM_ERR("key type must be string and its value not null\n"); + if(VAL_NULL(&RES_ROWS(db_res)[i].values[0])) { + LM_ERR("key value must not be null\n"); goto error; } + + if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING) { + LM_ERR("key type must be string (type=%d)\n", + RES_ROWS(db_res)[i].values[0].type); + goto error; + } + kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); if(kname.s==NULL) { LM_ERR("null key in row %d\n", i);

9 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015