sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
227 discussions

git:carstenbock/ims: - The SDP needs to be checked for RFC1918 address, in case we rewrite.
by Carsten Bock 11 Jan '11

11 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: f4d960b5df45fe8ed17b5dd51ab145b796f62121 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4d960b… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Jan 11 22:03:15 2011 +0100 - The SDP needs to be checked for RFC1918 address, in case we rewrite. - Definitely: The rtpproxy-code should be removed and replaced by the rtpproxy-mod form Kamailio --- modules/pcscf/sdp_util.c | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/modules/pcscf/sdp_util.c b/modules/pcscf/sdp_util.c index 5f4367b..3d5a1b8 100644 --- a/modules/pcscf/sdp_util.c +++ b/modules/pcscf/sdp_util.c @@ -248,24 +248,28 @@ static int extract_mediaip(str *body, str *mediaip, int *pf) -//static int sdp_1918(struct sip_msg* msg) -//{ -// str body, ip; -// int pf; -// -// if (extract_sdp_body(msg, &body) == -1) { -// LOG(L_ERR,"ERROR: sdp_1918: cannot extract body from msg!\n"); -// return 0; -// } -// if (extract_mediaip(&body, &ip, &pf) == -1) { -// LOG(L_ERR, "ERROR: sdp_1918: can't extract media IP from the SDP\n"); -// return 0; -// } -// if (pf != AF_INET || isnulladdr(&ip, pf)) -// return 0; -// -// return (is1918addr(&ip) == 1) ? 1 : 0; -//} +static int sdp_1918(struct sip_msg* msg) +{ + str body, ip; + int pf; + + if (!msg) { + LOG(L_ERR,"ERROR: sdp_1918: No msg!\n"); + return 0; + } + if (extract_sdp_body(msg, &body) == -1) { + LOG(L_ERR,"ERROR: sdp_1918: cannot extract body from msg!\n"); + return 0; + } + if (extract_mediaip(&body, &ip, &pf) == -1) { + LOG(L_ERR, "ERROR: sdp_1918: can't extract media IP from the SDP\n"); + return 0; + } + if (pf != AF_INET || isnulladdr(&ip, pf)) + return 0; + + return (is1918addr(&ip) == 1) ? 1 : 0; +} static int alter_mediaip(struct sip_msg *msg, str *body, str *oldip, int oldpf, str *newip, int newpf, int preserve) @@ -1499,7 +1503,7 @@ int P_SDP_manipulate(struct sip_msg *msg,char *str1,char *str2) had_sdp_in_invite = 1; /* on INVITE */ /* check the sdp if it has a 1918 */ - if(1) + if (sdp_1918(msg)) { /* get rtp_proxy/nathelper to open ports - get a iovec*/ if (pcscf_nat_enable && rtpproxy_enable) @@ -1517,7 +1521,7 @@ int P_SDP_manipulate(struct sip_msg *msg,char *str1,char *str2) if (msg->first_line.u.reply.statuscode == 183 || (msg->first_line.u.reply.statuscode >= 200 && msg->first_line.u.reply.statuscode < 300)) { - if(1){ + if (sdp_1918(msg)){ /* sdp_1918(msg) */ /* str1 & str2 must be something */ if (pcscf_nat_enable && rtpproxy_enable)

1 0

git:3.1: dialog(k): fix db connection conflict after the last backports
by Daniel-Constantin Mierla 11 Jan '11

11 Jan '11

Module: sip-router Branch: 3.1 Commit: cc6858ab7366ae07cd108d40819695f03456669e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc6858a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 11 17:00:38 2011 +0100 dialog(k): fix db connection conflict after the last backports - reported by Phillman25 Kyriacou (cherry picked from commit e392a83f7608ae0967d22d23006748fe8f09cabf) --- modules_k/dialog/dlg_db_handler.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules_k/dialog/dlg_db_handler.c b/modules_k/dialog/dlg_db_handler.c index 0a6ab04..86dd074 100644 --- a/modules_k/dialog/dlg_db_handler.c +++ b/modules_k/dialog/dlg_db_handler.c @@ -113,12 +113,11 @@ static int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows); int dlg_connect_db(const str *db_url) { - if (dialog_db_handle) { - LM_CRIT("BUG - db connection found already open\n"); + dialog_db_handle = dialog_dbf.init(db_url); + if(dialog_db_handle == 0) { + LM_ERR("unable to connect to database\n"); return -1; } - if ((dialog_db_handle = dialog_dbf.init(db_url)) == 0) - return -1; return 0; }

1 0

git:master: dialog(k): fix db connection conflict after the last backports
by Daniel-Constantin Mierla 11 Jan '11

11 Jan '11

Module: sip-router Branch: master Commit: e392a83f7608ae0967d22d23006748fe8f09cabf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e392a83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 11 17:00:38 2011 +0100 dialog(k): fix db connection conflict after the last backports - reported by Phillman25 Kyriacou --- modules_k/dialog/dlg_db_handler.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules_k/dialog/dlg_db_handler.c b/modules_k/dialog/dlg_db_handler.c index 0a6ab04..86dd074 100644 --- a/modules_k/dialog/dlg_db_handler.c +++ b/modules_k/dialog/dlg_db_handler.c @@ -113,12 +113,11 @@ static int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows); int dlg_connect_db(const str *db_url) { - if (dialog_db_handle) { - LM_CRIT("BUG - db connection found already open\n"); + dialog_db_handle = dialog_dbf.init(db_url); + if(dialog_db_handle == 0) { + LM_ERR("unable to connect to database\n"); return -1; } - if ((dialog_db_handle = dialog_dbf.init(db_url)) == 0) - return -1; return 0; }

1 0

git:carstenbock/ims: Stupid Typo!
by Carsten Bock 11 Jan '11

11 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 479aa8b8b1ae75c3471a486e34cae9f3bb608e32 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=479aa8b… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Jan 11 16:30:54 2011 +0100 Stupid Typo! --- lib/lost/Makefile | 2 +- modules/ecscf/Makefile | 13 ++++++++----- modules/lrf/Makefile | 12 ++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/lost/Makefile b/lib/lost/Makefile index 8fd7a1d..28b82d3 100644 --- a/lib/lost/Makefile +++ b/lib/lost/Makefile @@ -23,5 +23,5 @@ SER_LIBS=$(SERLIBPATH)/cds/ser_cds # TYPE=lib => shared or static library, executable otherwise TYPE = lib -include ../Makefile.defs +include ../../Makefile.libs diff --git a/modules/ecscf/Makefile b/modules/ecscf/Makefile index 4b3b17f..69a6060 100644 --- a/modules/ecscf/Makefile +++ b/modules/ecscf/Makefile @@ -11,12 +11,15 @@ NAME=ecscf.so DEFS+=-DSER DEFS+=-DSER_MOD_INTERFACE -SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/lost/lost_client +DEFS+=-DCDP_FOR_SER + +INCLUDES += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include -I../../lib -I../.. -DEFS += -DCDP_FOR_SER -DEFS += -I/usr/include/libxml2 -I$(SERLIBPATH) -I../.. -LIBS += -L$(LOCALBASE)/lib -lxml2 +LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/lost/lost_client \ #MOD_INSTALL_CFGS=ecscf.cfg diff --git a/modules/lrf/Makefile b/modules/lrf/Makefile index ca35945..26454d4 100644 --- a/modules/lrf/Makefile +++ b/modules/lrf/Makefile @@ -8,19 +8,19 @@ include ../../Makefile.defs auto_gen= NAME=lrf.so -LIBS= DEFS+=-DSER -INCLUDES = -I../../lib -I../.. DEFS+=-DSER_MOD_INTERFACE +DEFS+=-DCDP_FOR_SER + +INCLUDES += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include -I../../lib -I../.. + +LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/cds/ser_cds $(SERLIBPATH)/lost/lost_client -DEFS += -DCDP_FOR_SER -DEFS += -I/usr/include/libxml2 -LIBS += -L$(LOCALBASE)/lib -lxml2 - #MOD_INSTALL_CFGS=lrf.cfg include ../../Makefile.modules

1 0

git:carstenbock/ims: If using libcds, the directive SER must be defined.
by Carsten Bock 11 Jan '11

11 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 8810ac87d07f7f7f5c9d86bc793934d44d2d77ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8810ac8… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Jan 11 16:00:45 2011 +0100 If using libcds, the directive SER must be defined. --- modules/ecscf/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/ecscf/Makefile b/modules/ecscf/Makefile index f7ff539..4b3b17f 100644 --- a/modules/ecscf/Makefile +++ b/modules/ecscf/Makefile @@ -9,6 +9,7 @@ include ../../Makefile.defs auto_gen= NAME=ecscf.so +DEFS+=-DSER DEFS+=-DSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/lost/lost_client

1 0

git:carstenbock/ims: - added missing file in order to build the lost_client-lib
by Carsten Bock 11 Jan '11

11 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 02f36f03b46e5fb50c22553079661395e02205cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02f36f0… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Jan 11 15:50:37 2011 +0100 - added missing file in order to build the lost_client-lib --- lib/lost/Makefile.nonser | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/lib/lost/Makefile.nonser b/lib/lost/Makefile.nonser new file mode 100644 index 0000000..bcce09c --- /dev/null +++ b/lib/lost/Makefile.nonser @@ -0,0 +1,12 @@ +DEFS += -fPIC -DSER +INCLUDES += -I/usr/include/libxml2 -I/usr/local/include/libxml2 -I/usr/include/curl -I/usr/local/include/curl -I/usr/local/include +LIBS += -L/usr/local/lib -lxml2 -lcds -lcurl + +# name of result executable or library +NAME = lost_client + +# TYPE=lib => shared or static library, executable otherwise +TYPE = lib + +include ../Makefile.defs +

1 0

git:carstenbock/ims: - adpated Makefiles in order to have correct Library bindings
by Carsten Bock 11 Jan '11

11 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 60b7b4b9a48306c274c6205744f180d731041540 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60b7b4b… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Jan 11 15:09:26 2011 +0100 - adpated Makefiles in order to have correct Library bindings --- lib/lost/Makefile | 2 +- modules/ecscf/Makefile | 2 +- modules/lrf/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/lost/Makefile b/lib/lost/Makefile index d90a8cf..8fd7a1d 100644 --- a/lib/lost/Makefile +++ b/lib/lost/Makefile @@ -16,7 +16,7 @@ libcurl_includes=-I/usr/include/curl -I$(LOCALBASE)/include/curl \ libxml2_libs=-L$(LOCALBASE)/lib -lxml2 libcurl_libs=-L$(LOCALBASE)/lib -lcurl INCLUDES= -I$(CURDIR)/.. -I$(CURDIR)/../.. $(libxml2_includes) $(libcurl_includes) -LIBS=$(libxml2_libs) $(libcurl_libs) -L../cds -lcds +LIBS=$(libxml2_libs) $(libcurl_libs) SERLIBPATH=.. SER_LIBS=$(SERLIBPATH)/cds/ser_cds diff --git a/modules/ecscf/Makefile b/modules/ecscf/Makefile index 3cdbf04..f7ff539 100644 --- a/modules/ecscf/Makefile +++ b/modules/ecscf/Makefile @@ -11,7 +11,7 @@ NAME=ecscf.so DEFS+=-DSER_MOD_INTERFACE SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/lost/lost_client DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2 -I$(SERLIBPATH) -I../.. diff --git a/modules/lrf/Makefile b/modules/lrf/Makefile index edc2c7e..ca35945 100644 --- a/modules/lrf/Makefile +++ b/modules/lrf/Makefile @@ -15,7 +15,7 @@ INCLUDES = -I../../lib -I../.. DEFS+=-DSER_MOD_INTERFACE SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/cds/ser_cds +SER_LIBS+=$(SERLIBPATH)/cds/ser_cds $(SERLIBPATH)/lost/lost_client DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2

1 0

git:mariuszbihlei/p_usrloc: modules_k/p_usrloc updated documentation
by Marius Zbihlei 11 Jan '11

11 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 8ac7ced0f54caf9c66a6df7bb64884a44cf4d8b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ac7ced… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 11 16:03:30 2011 +0200 modules_k/p_usrloc updated documentation --- modules_k/p_usrloc/README | 234 +++++++++++++++--------------- modules_k/p_usrloc/doc/p_usrloc_user.xml | 41 +++--- 2 files changed, 138 insertions(+), 137 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8ac…

1 0

git:mariuszbihlei/p_usrloc: modules/ p_usrloc Fixed compilation errors caused by header renaming
by Marius Zbihlei 11 Jan '11

11 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: dc86db9d351efea9c77b164211afdc57e67e0115 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc86db9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 11 16:01:23 2011 +0200 modules/p_usrloc Fixed compilation errors caused by header renaming Removed use_second_key parameter that has the same meaning like use_domain Various other small bugfixes --- modules_k/p_usrloc/dlist.c | 2 +- modules_k/p_usrloc/p_usrloc_mod.c | 19 ++++++++++--------- modules_k/p_usrloc/p_usrloc_mod.h | 3 +-- modules_k/p_usrloc/ucontact.c | 2 +- modules_k/p_usrloc/udomain.c | 2 +- modules_k/p_usrloc/ul_db.c | 2 +- modules_k/p_usrloc/ul_db_failover.c | 2 +- modules_k/p_usrloc/ul_db_failover_func.c | 2 +- modules_k/p_usrloc/ul_db_form_query.c | 2 +- modules_k/p_usrloc/ul_db_handle.c | 4 ++-- modules_k/p_usrloc/ul_db_layer.c | 2 +- modules_k/p_usrloc/ul_db_tran.c | 2 +- modules_k/p_usrloc/ul_db_watch.c | 2 +- modules_k/p_usrloc/ul_mi.c | 2 +- modules_k/p_usrloc/urecord.c | 2 +- modules_k/p_usrloc/usrloc.c | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=dc8…

1 0

git:carstenbock/ims: - for the E-CSCF there is no XML-File
by Carsten Bock 11 Jan '11

11 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 5ce033192493b2d71c8c066625c677eda225eaa6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ce0331… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Jan 11 14:29:01 2011 +0100 - for the E-CSCF there is no XML-File - changes, in order to make the LRF-mofule compile (path adaptions) --- modules/ecscf/Makefile | 2 +- modules/lrf/Makefile | 20 ++++++++------------ modules/lrf/dlg_state.c | 6 +----- modules/tm/t_reply.c | 14 ++++++++++---- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/modules/ecscf/Makefile b/modules/ecscf/Makefile index 5110deb..3cdbf04 100644 --- a/modules/ecscf/Makefile +++ b/modules/ecscf/Makefile @@ -17,6 +17,6 @@ DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2 -I$(SERLIBPATH) -I../.. LIBS += -L$(LOCALBASE)/lib -lxml2 -#MOD_INSTALL_CFGS=ecscf.cfg ecscf.xml +#MOD_INSTALL_CFGS=ecscf.cfg include ../../Makefile.modules diff --git a/modules/lrf/Makefile b/modules/lrf/Makefile index 758fca9..edc2c7e 100644 --- a/modules/lrf/Makefile +++ b/modules/lrf/Makefile @@ -10,21 +10,17 @@ auto_gen= NAME=lrf.so LIBS= -ifeq ($(CFG_NAME),sip-router) - DEFS += -DSER_MOD_INTERFACE - SERLIBPATH=/../lib - #SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 - DEFS += -I/usr/include/libxml2 -I../lib -DSER -I../.. - DEFS += -I../../lib - LIBS += -L/usr/local/lib -L../lib/cds -L../lib/lost -llost_client -lcds -else - DEFS += -I/usr/include/libxml2 -I../../lib -DSER -I../.. - LIBS += -L/usr/local/lib -L../../lib/cds -L../../lib/lost -l_lost_client -endif -LIBS += -lxml2 +DEFS+=-DSER +INCLUDES = -I../../lib -I../.. +DEFS+=-DSER_MOD_INTERFACE + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/cds/ser_cds DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2 LIBS += -L$(LOCALBASE)/lib -lxml2 +#MOD_INSTALL_CFGS=lrf.cfg + include ../../Makefile.modules diff --git a/modules/lrf/dlg_state.c b/modules/lrf/dlg_state.c index e3f7879..0c27eab 100644 --- a/modules/lrf/dlg_state.c +++ b/modules/lrf/dlg_state.c @@ -59,11 +59,7 @@ #include "../../mem/shm_mem.h" -#ifdef SER_MOD_INTERFACE - #include "../../modules_s/sl/sl_funcs.h" -#else - #include "../sl/sl_funcs.h" -#endif +#include "../../modules/sl/sl_funcs.h" #include "sip.h" //#include "release_call.h" diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 5790748..ba48309 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -236,7 +236,14 @@ int t_get_picked_branch(void) *inside* t_relay using hints stored in private memory before t_relay is called */ +enum route_mode get_rmode(){ + return rmode; +} +void set_rmode(enum route_mode crt_rmode){ + + rmode = crt_rmode; +} void t_on_negative( unsigned int go_to ) { @@ -2620,9 +2627,8 @@ int t_enter_ctx(unsigned int new_hash_index, unsigned int new_label, t = get_t(); if(t == NULL || t == T_UNDEFINED) ERR("t_enter_ctx: null crt trans\n"); - else {DEBUG("t_enter_ctx: ref number is %i\n", t->ref_count); - *crt_trans = get_t(); - } + else *crt_trans = get_t(); + *crt_rmode = get_rmode(); if(t_lookup_ident(new_trans, new_hash_index, new_label) < 0 ) { @@ -2652,7 +2658,7 @@ int t_exit_ctx(struct cell * new_trans, enum route_mode new_rmode){ crt_trans = get_t(); UNREF(crt_trans); - set_t(new_trans); + set_t(new_trans, T_BR_UNDEFINED); set_rmode(new_rmode); return 0;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011