sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

git:master: pkg/kamailio/deb: new kamailio-extra-modules package.
by Victor Seva 13 Mar '14

13 Mar '14

Module: sip-router Branch: master Commit: a1de51c55d7bf31c7e9a793ec898073ab158b3cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1de51c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Thu Mar 13 00:14:47 2014 +0100 pkg/kamailio/deb: new kamailio-extra-modules package. Adding gzcompress, uuid and ev modules to extra. --- pkg/kamailio/deb/debian/control | 16 +++++++++++++++- pkg/kamailio/deb/debian/rules | 25 ++++++++++++++++++++++--- pkg/kamailio/deb/jessie/control | 16 +++++++++++++++- pkg/kamailio/deb/jessie/rules | 25 ++++++++++++++++++++++--- pkg/kamailio/deb/precise/control | 16 +++++++++++++++- pkg/kamailio/deb/precise/rules | 25 ++++++++++++++++++++++--- pkg/kamailio/deb/squeeze/control | 15 ++++++++++++++- pkg/kamailio/deb/squeeze/rules | 25 ++++++++++++++++++++++--- pkg/kamailio/deb/wheezy/control | 16 +++++++++++++++- pkg/kamailio/deb/wheezy/rules | 25 ++++++++++++++++++++++--- 10 files changed, 184 insertions(+), 20 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a1d…

1 0

git:master: modules/ims_usrloc_pcscf: search for contacts should not be based on reg_state
by Jason Penton 13 Mar '14

13 Mar '14

Module: sip-router Branch: master Commit: da2e3d712c1025b02df6a047ba06b8d8d7d8c80a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da2e3d7… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Mar 13 10:08:07 2014 +0200 modules/ims_usrloc_pcscf: search for contacts should not be based on reg_state - up to consumer to check state of contact --- modules/ims_usrloc_pcscf/udomain.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index d3ba43b..31a051b 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -538,9 +538,7 @@ int get_pcontact_by_src(udomain_t* _d, str * _host, unsigned short _port, unsign s_contact.s); // First check, if Proto and Port matches: - if ((c->reg_state == PCONTACT_REGISTERED) - && (c->received_port == _port) - && (c->received_proto == _proto)) { + if ((c->received_port == _port) && (c->received_proto == _proto)) { LM_DBG("Received host len %d (search %d)\n", c->received_host.len, _host->len); // Then check the length: if (c->received_host.len == _host->len) { @@ -568,7 +566,7 @@ int get_pcontact_by_src(udomain_t* _d, str * _host, unsigned short _port, unsign reg_state_to_string(c->reg_state), reg_state_to_string(PCONTACT_REGISTERED) ); // First check, if Proto and Port matches: - if ((c->reg_state == PCONTACT_REGISTERED) && (c->received_port == _port) && (c->received_proto == _proto)) { + if ((c->received_port == _port) && (c->received_proto == _proto)) { LM_DBG("Received host len %d (search %d)\n", c->received_host.len, _host->len); // Then check the length: if (c->received_host.len == _host->len) {

1 0

git:master: Makefile.groups: created group for modules depending on libev
by Daniel-Constantin Mierla 12 Mar '14

12 Mar '14

Module: sip-router Branch: master Commit: afc1ced933eacba986c17978afb9e0ae201b2f58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=afc1ced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 12 21:57:15 2014 +0100 Makefile.groups: created group for modules depending on libev --- Makefile.groups | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index 16ebf4b..7096135 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -160,6 +160,9 @@ mod_list_gzcompress=gzcompress # - modules depending on uuid library mod_list_uuid=uuid +# - modules depending on ev library +mod_list_ev=evapi + # - all modules mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_db) $(mod_list_dbuid) \ @@ -182,7 +185,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_outbound) $(mod_list_osp) \ $(mod_list_java) $(mod_list_dnssec) \ $(mod_list_sctp) $(mod_list_autheph) \ - $(mod_list_gzcompress) $(mod_list_uuid)) + $(mod_list_gzcompress) $(mod_list_uuid) \ + $(mod_list_ev)) @@ -346,6 +350,9 @@ module_group_kgzcompress=$(mod_list_gzcompress) # pkg uuid module module_group_kuuid=$(mod_list_uuid) +# pkg libev modules +module_group_kev=$(mod_list_ev) + # list of static modules # static_modules:=

1 0

git:master: utils/route_graph: increased max depth value
by Daniel-Constantin Mierla 12 Mar '14

12 Mar '14

Module: sip-router Branch: master Commit: 942ac25bcb937d35bd184cda96fbb2f2319e8d1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=942ac25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 12 13:16:51 2014 +0100 utils/route_graph: increased max depth value --- utils/route_graph/route_graph.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/route_graph/route_graph.py b/utils/route_graph/route_graph.py index 243b5da..a234c2e 100755 --- a/utils/route_graph/route_graph.py +++ b/utils/route_graph/route_graph.py @@ -28,7 +28,7 @@ """ import sys,re -max_depth = 10 +max_depth = 120 debug = 0 re_main_route = re.compile("^([a-z]+_)*route[\s\t]*(?![])[\s\t]*\{?", re.I)

1 0

Fwd: [SR-Users] bug in authdb_mod ??
by jay binks 12 Mar '14

12 Mar '14

So I posted this to the user list in December, and got nowhere.. Can someone familiar with db_cassandra review my patch ( possibly clean this up and commit it ) # git diff dbcassa_base.cpp diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index e9d3a32..155221d 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -439,6 +439,7 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, int key_len=0, seckey_len = 0; int no_kc, no_sec_kc; dbcassa_table_p tbc; + char pk[255]; /** Lock table schema and construct primary and secondary key **/ if(_k) { @@ -495,8 +496,12 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, } else { /* the table doesn't have any secondary key defined */ if(_c) { for(int i=0; i< _nc; i++) { - sp.column_names.push_back(_c[i]->s); - LM_DBG("Query col: %s\n", _c[i]->s); + sprintf(pk, "%.*s", _c[i]->len, _c[i]->s ); + sp.column_names.push_back( pk); + //sp.column_names.push_back(_c[i]->s); + LM_DBG("Query col: %s\n", pk ); + //LM_DBG("Query col: %s\n", _c[i]->s); + LM_DBG("JAY Query col: %.*s\n", _c[i]->len, _c[i]->s); } LM_DBG("get %d columns\n", _nc); sp.__isset.column_names = true; // set yea I know I left crap in there, but it gives you an idea... also... yea pk is a crap name... copy paste... and I havnt given any thought to the size 255 , but thats probably fairly safe and anything smaller might not be so safe. ( unless there is a limit elsewhere I should observe ) Jay

2 5

[tracker] Task opened: Kamailio crashes in case USE_LONGJMP undefined
by sip-router 11 Mar '14

11 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alekzander Spiridonov (alekz) Attached to Project - sip-router Summary - Kamailio crashes in case USE_LONGJMP undefined Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - Linux Severity - High Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Kamailio crashes in case USE_LONGJMP undefined in action.h:40. Checked on kamailio 3.1.5. BackTrace: <code>(gdb) bt #0 0x08159ee3 in fm_malloc () #1 0x0815e3e5 in parse_msg () #2 0x080cbf9d in receive_msg () #3 0x0814ff3f in udp_rcv_loop () #4 0x080a02bb in main_loop () #5 0x080a4072 in main ()</code> Modules loaded: <code>loadmodule "mi_fifo.so" loadmodule "kex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "dispatcher.so" loadmodule "snmpstats.so"</code> More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=409 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: parser/msg_parser: corrected freeing of msg. w.r.t path vecor
by Jason Penton 10 Mar '14

10 Mar '14

Module: sip-router Branch: master Commit: 1ccdadc89cdf5ddab069e4c912a9b6834c6631f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ccdadc… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Mon Mar 10 19:48:10 2014 +0200 parser/msg_parser: corrected freeing of msg. w.r.t path vecor - now use FL_SHM_CLONE internal msg flag to decide whether or not to pkg free path_vec --- parser/msg_parser.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index f430b3f..fbd4ddb 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -830,15 +830,11 @@ int set_path_vector(struct sip_msg* msg, str* path) void reset_path_vector(struct sip_msg* const msg) { /* only free path vector from pkg IFF it is still in pkg... - ie. if msg is shm we don't free... */ - if (msg->path_vec.s && likely(msg->path_vec.s >= msg->buf && (msg->path_vec.s < (msg->buf + msg->len)))) { + if (!(msg->msg_flags&FL_SHM_CLONE)) { pkg_free(msg->path_vec.s); - } else { - if (msg->path_vec.s) - /* don't reset path_vec if it is shm */ - return; + msg->path_vec.s = 0; + msg->path_vec.len = 0; } - msg->path_vec.s = 0; - msg->path_vec.len = 0; }

1 0

git:master: modules/corex: corrected freeing of msg. w.r.t path vecor
by Jason Penton 10 Mar '14

10 Mar '14

Module: sip-router Branch: master Commit: 99d50e2da0753d7482ed2884e665e08e235daf5e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99d50e2… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Mon Mar 10 19:49:39 2014 +0200 modules/corex: corrected freeing of msg. w.r.t path vecor - now use FL_SHM_CLONE internal msg flag to decide whether or not to pkg free path_vec --- modules/corex/corex_lib.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/corex/corex_lib.c b/modules/corex/corex_lib.c index f83352b..23c9a8c 100644 --- a/modules/corex/corex_lib.c +++ b/modules/corex/corex_lib.c @@ -83,11 +83,14 @@ int corex_append_branch(sip_msg_t *msg, gparam_t *pu, gparam_t *pq) pkg_free(msg->dst_uri.s); msg->dst_uri.s = 0; msg->dst_uri.len = 0; - if(msg->path_vec.s!=0) - if (likely(msg->path_vec.s >= msg->buf && (msg->path_vec.s < (msg->buf + msg->len)))) + + /* if this is a cloned message, don't free the path vector as it was copied into shm memory and will be freed as contiguous block*/ + if (!(msg->msg_flags&FL_SHM_CLONE)) { + if(msg->path_vec.s!=0) pkg_free(msg->path_vec.s); - msg->path_vec.s = 0; - msg->path_vec.len = 0; + msg->path_vec.s = 0; + msg->path_vec.len = 0; + } } return ret;

1 0

git:master: modules/corex: only free path_vector from pkg if it is still in pkg... not shm cloned
by Jason Penton 10 Mar '14

10 Mar '14

Module: sip-router Branch: master Commit: f15de29015546d173a1d3135f90653e05d85171f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f15de29… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Mon Mar 10 14:38:51 2014 +0200 modules/corex: only free path_vector from pkg if it is still in pkg... not shm cloned - related to earlier commit 4ab0f53ff247f411dde7b88d5b7d82fc7e17baa9 --- modules/corex/corex_lib.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/corex/corex_lib.c b/modules/corex/corex_lib.c index 9d926c2..f83352b 100644 --- a/modules/corex/corex_lib.c +++ b/modules/corex/corex_lib.c @@ -84,7 +84,8 @@ int corex_append_branch(sip_msg_t *msg, gparam_t *pu, gparam_t *pq) msg->dst_uri.s = 0; msg->dst_uri.len = 0; if(msg->path_vec.s!=0) - pkg_free(msg->path_vec.s); + if (likely(msg->path_vec.s >= msg->buf && (msg->path_vec.s < (msg->buf + msg->len)))) + pkg_free(msg->path_vec.s); msg->path_vec.s = 0; msg->path_vec.len = 0; }

2 4

git:master: core: parser: path_vector is now copied into shared memory when cloning
by Jason Penton 10 Mar '14

10 Mar '14

Module: sip-router Branch: master Commit: 4ab0f53ff247f411dde7b88d5b7d82fc7e17baa9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ab0f53… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Mon Mar 10 14:35:47 2014 +0200 core: parser: path_vector is now copied into shared memory when cloning - fixes in place to cater for freeing memory correctly --- parser/msg_parser.c | 7 ++++++- sip_msg_clone.c | 13 ++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 1631401..f430b3f 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -829,8 +829,13 @@ int set_path_vector(struct sip_msg* msg, str* path) void reset_path_vector(struct sip_msg* const msg) { - if(msg->path_vec.s != 0) { + /* only free path vector from pkg IFF it is still in pkg... - ie. if msg is shm we don't free... */ + if (msg->path_vec.s && likely(msg->path_vec.s >= msg->buf && (msg->path_vec.s < (msg->buf + msg->len)))) { pkg_free(msg->path_vec.s); + } else { + if (msg->path_vec.s) + /* don't reset path_vec if it is shm */ + return; } msg->path_vec.s = 0; msg->path_vec.len = 0; diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 1bb55ee..40a5e90 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -395,6 +395,8 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, /*the dst uri (if any)*/ if (org_msg->dst_uri.s && org_msg->dst_uri.len) len+= ROUND4(org_msg->dst_uri.len); + if (org_msg->path_vec.s && org_msg->path_vec.len) + len+= ROUND4(org_msg->path_vec.len); /*all the headers*/ for( hdr=org_msg->headers ; hdr ; hdr=hdr->next ) { @@ -522,6 +524,7 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, /* zero *uri.s, in case len is 0 but org_msg->*uris!=0 (just to be safe)*/ new_msg->new_uri.s = 0; new_msg->dst_uri.s = 0; + new_msg->path_vec.s = 0; /* new_uri */ if (org_msg->new_uri.s && org_msg->new_uri.len) { @@ -536,9 +539,13 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, memcpy( p , org_msg->dst_uri.s , org_msg->dst_uri.len); p += ROUND4(org_msg->dst_uri.len); } - /* path_vec is not cloned (it's reset instead) */ - new_msg->path_vec.s=0; - new_msg->path_vec.len=0; + /* path vector */ + if (org_msg->path_vec.s && org_msg->path_vec.len) { + new_msg->path_vec.s = p; + memcpy(p, org_msg->path_vec.s, org_msg->path_vec.len); + p += ROUND4(org_msg->path_vec.len); + } + /* instance is not cloned (it's reset instead) */ new_msg->instance.s=0; new_msg->instance.len=0;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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 March 2014