sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

git:3.1: presence: check for transport parameter in contact URI for NOTIFY

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: fc322e0ef766f65a1f734bb26afdfc1e5862c967 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc322e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 27 00:09:53 2011 +0100 presence: check for transport parameter in contact URI for NOTIFY - avoid adding second time the transport parameter if it is present in the local contact field of subscription structure - discovered by Juha Heinanen and Peter Dunkley (cherry picked from commit 2b30581ac359047d3c350c432a391a7e4e4a47cc) --- modules_k/presence/notify.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index f57eea1..7e9ce5e 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -128,6 +128,7 @@ int build_str_hdr(subs_t* subs, int is_body, str* hdr) str expires = {0, 0}; str status = {0, 0}; str tmp = {0, 0}; + str trans = {";transport=", 11}; if(hdr == NULL) { @@ -184,7 +185,8 @@ int build_str_hdr(subs_t* subs, int is_body, str* hdr) tmp.s += 10; strncpy(tmp.s, subs->local_contact.s, subs->local_contact.len); tmp.s += subs->local_contact.len; - if(subs->sockinfo_str.s!=NULL) + if(subs->sockinfo_str.s!=NULL + && str_search(&subs->local_contact, &trans)==0) { /* fix me */ switch(subs->sockinfo_str.s[0]) {

13 years, 9 months

Fw: 32bit vs 64bit build problems

by Paul Pankhurst

I have noticed that 'kamctl monitor' displays corrupt statistics when kamailio is built for a 64 bit platform. Further investigation has revealed that the reason is the underlying datatype is a long, whilst some of the wrapper functions (e.g. get_stat_val) return unsigned int. On a 32bit machine where a long and int are both the same size it is not a problem, but on a 64 bit machine they are different and hence the problem. Some code uses the wrapper function, other does not, in the case of mi_get_stats it uses both, so depending on paramaters passed to the MI fifo it may work or produce garbage results. Paul

13 years, 9 months

git:master: app_lua: try to locate liblua for centos

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 20d396d9bd190929366e9e493124606aedb087c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20d396d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 29 12:16:13 2011 +0200 app_lua: try to locate liblua for centos - centos has liblua instead of liblua5.1 and does not provide lua-config or pkg-config to discover the name of lua library - in this case use shell to figure out whether is liblua5.1 or liblua --- modules/app_lua/Makefile | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/app_lua/Makefile b/modules/app_lua/Makefile index 89fc8d6..1ba3237 100644 --- a/modules/app_lua/Makefile +++ b/modules/app_lua/Makefile @@ -13,13 +13,25 @@ BUILDER = $(shell which lua-config) ifeq ($(BUILDER),) BUILDER = $(shell which pkg-config) ifeq ($(BUILDER),) - DEFS+=-I/usr/include/lua5.1 - LIBS= -llua5.1 + LUA51 = $(shell ls /usr/lib/liblua* | grep 5.1) + ifeq ($(LUA51),) + DEFS+=-I/usr/include/lua + LIBS= -llua + else + DEFS+=-I/usr/include/lua5.1 + LIBS= -llua5.1 + endif else LUALIBS = $(shell pkg-config --silence-errors --libs lua) ifeq ($(LUALIBS),) - DEFS+=-I/usr/include/lua5.1 - LIBS= -llua5.1 + LUA51 = $(shell ls /usr/lib/liblua* | grep 5.1) + ifeq ($(LUA51),) + DEFS+=-I/usr/include/lua + LIBS= -llua + else + DEFS+=-I/usr/include/lua5.1 + LIBS= -llua5.1 + endif else DEFS+ = $(shell pkg-config --cflags lua) LIBS = $(shell pkg-config --libs lua)

13 years, 9 months

Question to GIT professionals / GIT "best practice"

by Carsten Bock

Hi everyone, as some may have noticed, i've made several general changes in my carstenbock/ims branch in the GIT-repository. While some are ready, others are not. The others may take several weeks (maybe months) to be finished. I would be happy to merge the "general" changes into the master branch in order to have them more widely tested by the community and getting a faster feedback (while it's fresh), while leaving the other, not finished parts in a separated branch... Now i have two options: 1) Cherry-Pick every single commit into the master (a lot of work, i think?) 2) Create a new branch and move the non-ready parts into that branch; afterwards merge my "ims" branch into master. (other options?) I tend to go for 2) and i would create dedicated branches for each other component (e.g. a branch for the P-CSCF, one for Rf/Ro-Operations, one for the I-CSCF, one for the S-CSCF and so on) so merging into master would become easier. Other new extensions would go into an own branch. If i create a branch for specific extensions (e.g. the P-CSCF) and i need to implement other features for this (e.g. general RFC3680 support in the presence modules), is there a proper way, to keep my branch up-to-date with the current master and afterwards doing a clean merge? If i do a "git pull" and afterwards merge, the changelog gets duplicated... any ideas? Thanks in advance, Carsten -- Carsten Bock http://www.ng-voice.com mailto:carsten@ng-voice.com

13 years, 9 months

git:carstenbock/ims: - several security checks and bug-fixes

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 2dd022147ee1dee2c30bf0854325d87993205419 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2dd0221… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Mar 29 11:23:45 2011 +0200 - several security checks and bug-fixes --- modules_k/registrar/lookup.c | 13 +++++++++++-- modules_k/registrar/save.c | 13 ++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 535cbd8..4743b9d 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -87,6 +87,8 @@ static int restore_reg_avps(ucontact_t* c) avp_name_t name; str *s; + LM_DBG("Restoring AVP's: %p / %p\n", c, c->avps); + /* remove all these AVPs ? */ avp = c->avps; while (avp) { @@ -97,6 +99,7 @@ static int restore_reg_avps(ucontact_t* c) /* add stored AVPs */ avp = c->avps; while (avp) { + LM_DBG("avp %p\n", avp); get_avp_val(avp, &val); if (avp->flags & AVP_NAME_STR) { s = get_avp_name(avp); @@ -105,8 +108,14 @@ static int restore_reg_avps(ucontact_t* c) name.s.s = NULL; name.s.len = 0; } - } else name.n = avp->id; - + LM_DBG("AVP s:%.*s\n", name.s.len, name.s.s); + } else { + name.n = avp->id; + LM_DBG("AVP i:%d\n", name.n); + } + if ((val.s.s) && (val.s.len > 0)) + LM_DBG("Val s:%.*s\n", val.s.len, val.s.s); + LM_DBG("Val i:%d\n", val.n); /* modify flags here? */ add_avp(avp->flags, name, val); diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 6fcde7c..4fe0df7 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -110,6 +110,7 @@ static inline avp_t *avp_dup(avp_t *avp) */ static void remove_avp_contact(struct ucontact *c) { avp_t *n; + while (c->avps) { n = c->avps->next; shm_free(c->avps); @@ -131,7 +132,7 @@ static int create_avp_list(avp_t * avp_list) { n = reg_avp_list; while (n) { /* Search for the AVP */ - avp = search_first_avp(avp->flags, n->name, 0, &ss); + avp = search_first_avp(n->type, n->name, 0, &ss); while(avp) { dup = avp_dup(avp); if (dup) { @@ -165,10 +166,12 @@ static int new_reg_avps(ucontact_info_t* c) */ static int update_reg_avps(struct ucontact *c) { - /* Remove existing AVP's from this contact: */ - remove_avp_contact(c); - - return create_avp_list(c->avps); + if (c) { + /* Remove existing AVP's from this contact: */ + remove_avp_contact(c); + return create_avp_list(c->avps); + } + return -1; } /*! \brief

13 years, 9 months

git:master: db_mysql: use mysql_config to detect include and libs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 54306955b4eac0dfcfc66d82e0eceb8551b52bb2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5430695… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 29 11:18:08 2011 +0200 db_mysql: use mysql_config to detect include and libs --- modules/db_mysql/Makefile | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile index c6458e0..d71ca94 100644 --- a/modules/db_mysql/Makefile +++ b/modules/db_mysql/Makefile @@ -6,18 +6,38 @@ include ../../Makefile.defs auto_gen= NAME=db_mysql.so -# mysql.h locations (freebsd,openbsd solaris) -DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include -I$(LOCALBASE)/include/mysql \ +DEFS +=-DSER_MOD_INTERFACE + +# set CROSS_COMPILE to true if you want to skip +# the autodetection +# CROSS_COMPILE=true + +ifeq ($(CROSS_COMPILE),) +MYSQLCFG=$(shell which mysql_config) +endif + +ifneq ($(MYSQLCFG),) + + # use autodetection + DEFS += $(shell $(MYSQLCFG) --include | sed 's/$-I.*$\/mysql/\1/g' ) + LIBS = $(shell $(MYSQLCFG) --libs) + +else + + # mysql.h locations (freebsd,openbsd solaris) + DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include \ + -I$(LOCALBASE)/include/mysql \ -I$(LOCALBASE)/mysql/include \ -I/usr/include/mysql -# libmysqlclient locations on RH/Suse, Solaris /OpenBSD, FreeBSD -# (Debian does the right thing and puts it in /usr/lib) -LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ + # libmysqlclient locations on RH/Suse, Solaris /OpenBSD, FreeBSD + # (Debian does the right thing and puts it in /usr/lib) + LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ -L$(LOCALBASE)/mysql/lib/mysql/ \ -L$(LOCALBASE)/mysql/lib \ -L/usr/lib64/mysql \ -lmysqlclient -lz +endif SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1

13 years, 9 months

git:master: presence: check for transport parameter in contact URI for NOTIFY

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2b30581ac359047d3c350c432a391a7e4e4a47cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b30581… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 27 00:09:53 2011 +0100 presence: check for transport parameter in contact URI for NOTIFY - avoid adding second time the transport parameter if it is present in the local contact field of subscription structure - discovered by Juha Heinanen and Peter Dunkley --- modules_k/presence/notify.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 2c90640..da4ea8d 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -128,6 +128,7 @@ int build_str_hdr(subs_t* subs, int is_body, str* hdr) str expires = {0, 0}; str status = {0, 0}; str tmp = {0, 0}; + str trans = {";transport=", 11}; if(hdr == NULL) { @@ -184,7 +185,8 @@ int build_str_hdr(subs_t* subs, int is_body, str* hdr) tmp.s += 10; strncpy(tmp.s, subs->local_contact.s, subs->local_contact.len); tmp.s += subs->local_contact.len; - if(subs->sockinfo_str.s!=NULL) + if(subs->sockinfo_str.s!=NULL + && str_search(&subs->local_contact, &trans)==0) { /* fix me */ switch(subs->sockinfo_str.s[0]) {

13 years, 9 months

git:master: rpm(k): updated version in spec file for CentOS rpm

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2f3c9d3c03f6c6425a9bbf3c84c59a51a1b4b54d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f3c9d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 29 11:08:54 2011 +0200 rpm(k): updated version in spec file for CentOS rpm --- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index b2c6d01..4170ee7 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.1.0 +%define ver 3.2.0 %define rel 0 %define _sharedir %{_prefix}/share

13 years, 9 months

git:master: core: added function to search a str inside a str

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8c2a2826f5f6954b4a38405fd04f128078e98e0f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c2a282… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 26 23:44:01 2011 +0100 core: added function to search a str inside a str - str_search(text, needle) added to return the position of str needle when it is found inside str text --- ut.c | 23 +++++++++++++++++++++++ ut.h | 4 ++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/ut.c b/ut.c index b011fda..7dd7373 100644 --- a/ut.c +++ b/ut.c @@ -274,3 +274,26 @@ char* get_abs_pathname(str* base, str* file) } return res; } + + +/** + * @brief search for occurence of needle in text + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_search(str *text, str *needle) +{ + char *p; + + if(text==NULL || text->s==NULL || needle==NULL || needle->s==NULL + || text->len<needle->len) + return NULL; + + for (p = text->s; p <= text->s + text->len - needle->len; p++) { + if (*p == *needle->s && memcmp(p, needle->s, needle->len)==0) { + return p; + } + } + + return NULL; +} diff --git a/ut.h b/ut.h index 1e4b2b4..da40ebc 100644 --- a/ut.h +++ b/ut.h @@ -824,4 +824,8 @@ unsigned int get_sys_version(int* major, int* minor, int* minor2); */ char* get_abs_pathname(str* base, str* file); +/** + * search for needle in text + */ +char *str_search(str *text, str *needle); #endif

13 years, 9 months

Re: [sr-dev] Registrar module creates an extra branch

by Mino Haluz

How many lookup("location") things do you use in your configuration file ? This seems to be the problem with more then once use of this command. Try to avoid this, or check if you can substitute some of them with simple SQL select in location table. On Mon, Mar 28, 2011 at 10:46 AM, Efelin Novak <efelin.novak(a)gmail.com> wrote: > Hi Folks, > I have a problem with a registrar module (at least I suppose so). When A > calls to B, in some specific situation, B receives two INVITEs. This mostly > (not only) happens when one account is registered on two or more UAs. In > this situation the extra INVITE is sent only to the one that is second in > the list (kamctl ul show ACCOUNT). > kamctl ul show Alice: > Contact:: > <sip:orlvuzyd@192.168.28.72:52129 >;q=0;expires=1916;flags=0x0;cflags=0x40;socket=<udp:8.8.8.8:5060 >;methods=0xFFFFFFFF;received=<sip:8.8.8.8:52129>;user_agent=<Blink > 0.2.5 (Linux)> > Contact:: > <sip:Alice@192.168.28.51:5060 >;q=;expires=3061;flags=0x0;cflags=0x40;socket=<udp:8.8.8.8:5060 >;methods=0x129F;received=<sip:8.8.8.8:5060 >;user_agent=<Linksys/PAP2T-3.1.15(LS)> > > My situation. > 1. Alice calls to BOB. > 2. kamailio looks up in location table for BOBs registrations > 3. in DB there are two rows (two devices(linksys PAP2T and Blink(blink is > the second one))) > 4. kamailio send 3 INVITES ( linksys, blink and blink). Every INVITE has > different via.branch > (Via: SIP/2.0/UDP 8.8.8.8;branch=z9hG4bKe2d7.009b1df2.1) > (Via: SIP/2.0/UDP 8.8.8.8;branch=z9hG4bKe2d7.009b1df2.2) > (Via: SIP/2.0/UDP 8.8.8.8;branch=z9hG4bKe2d7.009b1df2.3) > All my registrar parameters are set to default. > Nothing is looping on interfaces. > I have no idea whether this is a bug or my missconfiguration. > Thanks for replies. > Kind regards, > Efelin Novak > > _______________________________________________ > sr-dev mailing list > sr-dev(a)lists.sip-router.org > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev > >

13 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011