sr-dev December 2013

sr-dev@lists.kamailio.org

30 participants
318 discussions

git:3.3: Provide inline linkage for non-gcc compilers(like clang)

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 8cd628522a4258f32923fe58595677b300292b97 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cd6285… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 17 10:17:41 2012 +0300 Provide inline linkage for non-gcc compilers(like clang) Inline method in headers should be declared extern. (cherry picked from commit 2e5145ecdd8368c947ea93b98449ebd997824ce2) --- lib/srdb1/db_res.h | 12 ++++++------ lib/srdb1/db_row.h | 4 ++-- modules/ctl/binrpc_run.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/srdb1/db_res.h b/lib/srdb1/db_res.h index 82734b3..f8f909f 100644 --- a/lib/srdb1/db_res.h +++ b/lib/srdb1/db_res.h @@ -85,7 +85,7 @@ typedef struct db1_res { * \param _r the result that should be released * \return zero on success, negative on errors */ -inline int db_free_rows(db1_res_t* _r); +extern inline int db_free_rows(db1_res_t* _r); /** @@ -95,20 +95,20 @@ inline int db_free_rows(db1_res_t* _r); * \param _r the result that should be released * \return zero on success, negative on errors */ -inline int db_free_columns(db1_res_t* _r); +extern inline int db_free_columns(db1_res_t* _r); /** * Create a new result structure and initialize it. * \return a pointer to the new result on success, NULL on errors */ -inline db1_res_t* db_new_result(void); +extern inline db1_res_t* db_new_result(void); /** * Release memory used by a result structure. * \return zero on success, negative on errors */ -inline int db_free_result(db1_res_t* _r); +extern inline int db_free_result(db1_res_t* _r); /** * Allocate storage for column names and type in existing result structure. @@ -118,7 +118,7 @@ inline int db_free_result(db1_res_t* _r); * \param cols number of columns * \return zero on success, negative on errors */ -inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols); +extern inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols); /** @@ -126,6 +126,6 @@ inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols); * \param _res result set * \return zero on success, negative on errors */ -inline int db_allocate_rows(db1_res_t* _res); +extern inline int db_allocate_rows(db1_res_t* _res); #endif /* DB1_RES_H */ diff --git a/lib/srdb1/db_row.h b/lib/srdb1/db_row.h index 855ed3d..6bee889 100644 --- a/lib/srdb1/db_row.h +++ b/lib/srdb1/db_row.h @@ -62,7 +62,7 @@ typedef struct db_row { * \param _r row that should be released * \return zero on success, negative on error */ -inline int db_free_row(db_row_t* _r); +extern inline int db_free_row(db_row_t* _r); /** @@ -71,6 +71,6 @@ inline int db_free_row(db_row_t* _r); * \param _row filled row * \return zero on success, negative on errors */ -inline int db_allocate_row(const db1_res_t* _res, db_row_t* _row); +extern inline int db_allocate_row(const db1_res_t* _res, db_row_t* _row); #endif /* DB1_ROW_H */ diff --git a/modules/ctl/binrpc_run.c b/modules/ctl/binrpc_run.c index ce16c24..e114c18 100644 --- a/modules/ctl/binrpc_run.c +++ b/modules/ctl/binrpc_run.c @@ -388,7 +388,7 @@ end: -inline void destroy_binrpc_ctx(struct binrpc_ctx* ctx) +static inline void destroy_binrpc_ctx(struct binrpc_ctx* ctx) { free_structs(&ctx->out.structs); if (ctx->out.pkt.body){

11 years

git:3.3: core: Added support for the clang compiler

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: e53fdcd77f918c634119c8188f35d5fd3873b48e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e53fdcd… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 14 13:17:24 2012 +0300 core: Added support for the clang compiler Support for clang, a C compiler from the LLVM suite has been added. Install clang and run 'make cfg CC=clang && make' for building. GCC Inline assembly is supported. TODO: clean warning caused by clang (-Wunused-variable, etc) (cherry picked from commit 452c543de61d413351a5ac0816adc137d150824b) --- Makefile.defs | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 7aef0ce..61aac9e 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -321,6 +321,14 @@ ifneq (, $(findstring Intel(R) C++ Compiler, $(CC_LONGVER))) MKDEP=$(CC) -MM endif +ifneq (, $(findstring clang, $(CC_LONGVER))) + #clang should be gcc compatible + CC_NAME=clang + CC_FULLVER:=$(shell echo "$(CC_LONGVER)" | head -n 1 | sed -e 's/.*version $[0-9]\.[0-9]$.*/\1/g' ) + CC_SHORTVER:=$(shell echo "$(CC_FULLVER)" | cut -d. -f1,2 ) + CC_VER=$(CC) $(CC_FULLVER) + MKDEP=$(CC) -MM +endif ifeq (,$(CC_NAME)) #not found @@ -866,7 +874,7 @@ ifeq ($(mode), release) #if i386 ifeq ($(ARCH), i386) # if gcc -ifeq ($(CC_NAME), gcc) +ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) @@ -923,6 +931,15 @@ endif # CC_SHORTVER, 4.x endif # CC_SHORTVER, 4.5+ or 4.2+ else # CC_NAME, gcc +ifeq ($(CC_NAME), clang) +$(call set_if_empty,CPU,athlon64) + C_DEFS+=-DCC_GCC_LIKE_ASM + CFLAGS+=-m32 + \ + \ + -mtune=$(CPU) + LDFLAGS+=-m32 +else # CC_NAME, clang ifeq ($(CC_NAME), icc) C_DEFS+=-DCC_GCC_LIKE_ASM CFLAGS=-g -O3 -ipo -ipo_obj -unroll $(PROFILE) \ @@ -935,6 +952,7 @@ else #other compilers $(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc) endif #CC_NAME, icc +endif #CC_NAME, clang endif #CC_NAME, gcc endif #ARCH, i386 @@ -1009,6 +1027,13 @@ endif # CC_SHORTVER, 4.2+ endif # CC_SHORTVER, 4.5+ else # CC_NAME, gcc +ifeq ($(CC_NAME), clang) +$(call set_if_empty,CPU,opteron) + C_DEFS+=-DCC_GCC_LIKE_ASM + CFLAGS+=-m64 \ + + LDFLAGS+=-m64 +else # CC_NAME, clang ifeq ($(CC_NAME), icc) C_DEFS+=-DCC_GCC_LIKE_ASM CFLAGS=-g -O3 -ipo -ipo_obj -unroll $(PROFILE) \ @@ -1021,6 +1046,7 @@ else #other compilers $(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc) endif #CC_NAME, icc +endif #CC_NAME, clang endif #CC_NAME, gcc endif #ARCH, x86_64 @@ -1597,6 +1623,14 @@ endif # the executable file, because it's always loaded at a fixed address # -andrei +ifeq ($(CC_NAME), clang) + LDFLAGS+=-Wl,-O2 -Wl,-E $(PROFILE) + MOD_LDFLAGS:=-shared $(LDFLAGS) + LIB_LDFLAGS:=-shared $(LDFLAGS) + LIB_SONAME=-Wl,-soname, + LD_RPATH=-Wl,-rpath, +endif + LDFLAGS+= $(LD_EXTRA_OPTS) MOD_LDFLAGS+= $(LD_EXTRA_OPTS) LIB_LDFLAGS+= $(LD_EXTRA_OPTS) @@ -1674,6 +1708,11 @@ ifeq ($(CC_NAME), suncc) MOD_CFLAGS=-xcode=pic32 $(CFLAGS) LIB_CFLAGS=-xcode=pic32 $(CFLAGS) endif +ifeq ($(CC_NAME), clang) +MOD_CFLAGS=-fPIC -DPIC $(CFLAGS) +LIB_CFLAGS=-fPIC -DPIC $(CFLAGS) +endif + UTILS_CFLAGS=$(CFLAGS) # LDFLAGS uses for compiling the utils UTILS_LDFLAGS=$(LDFLAGS)

11 years

git:3.3: Makefiles.defs: clang compiles to O9

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 16dcfd515424a23cd0706de64eea822c88df0c58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16dcfd5… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 17 17:21:02 2012 +0300 Makefiles.defs: clang compiles to O9 (cherry picked from commit 5273948a6eeb6f6fe878696dce54880cabb0ef7c) --- Makefile.defs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 61aac9e..52eb8fc 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -935,9 +935,9 @@ ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,athlon64) C_DEFS+=-DCC_GCC_LIKE_ASM CFLAGS+=-m32 + -O9 \ \ - \ - -mtune=$(CPU) + -mtune=$(CPU) LDFLAGS+=-m32 else # CC_NAME, clang ifeq ($(CC_NAME), icc) @@ -1031,7 +1031,7 @@ ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,opteron) C_DEFS+=-DCC_GCC_LIKE_ASM CFLAGS+=-m64 \ - + -O9 LDFLAGS+=-m64 else # CC_NAME, clang ifeq ($(CC_NAME), icc)

11 years

git:4.0: modules/pv: fixed params and param transformation

by Juha Heinanen

Module: sip-router Branch: 4.0 Commit: bd7eaa50b6f24a6404294d66e5ab91fcb04be3da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd7eaa5… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Dec 19 16:21:25 2013 +0200 modules/pv: fixed params and param transformation - params need to be taken from sip_params field of sip_uri struct (cherry picked from commit e54b3ec673cb32664a1e8de2e591190f22216724) --- modules/pv/pv_trans.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index 8f54cd0..482ce41 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -894,7 +894,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, val->ri = _tr_parsed_uri.port_no; break; case TR_URI_PARAMS: - val->rs = (_tr_parsed_uri.params.s)?_tr_parsed_uri.params:_tr_empty; + val->rs = (_tr_parsed_uri.sip_params.s)?_tr_parsed_uri.sip_params:_tr_empty; break; case TR_URI_PARAM: if(tp==NULL) @@ -902,7 +902,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, LM_ERR("param invalid parameters\n"); return -1; } - if(_tr_parsed_uri.params.len<=0) + if(_tr_parsed_uri.sip_params.len<=0) { val->rs = _tr_empty; val->flags = PV_VAL_STR; @@ -912,7 +912,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, if(_tr_uri_params == NULL) { - sv = _tr_parsed_uri.params; + sv = _tr_parsed_uri.sip_params; if (parse_params(&sv, CLASS_ANY, &phooks, &_tr_uri_params)<0) return -1; }

11 years

git:4.1: modules/pv: fixed params and param transformation

by Juha Heinanen

Module: sip-router Branch: 4.1 Commit: 9e8c3f90e9467153b1e63a257ccdfb09adc4ecfd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e8c3f9… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Dec 19 16:21:25 2013 +0200 modules/pv: fixed params and param transformation - params need to be taken from sip_params field of sip_uri struct (cherry picked from commit e54b3ec673cb32664a1e8de2e591190f22216724) --- modules/pv/pv_trans.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index 738efca..7c75deb 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -1025,7 +1025,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, val->ri = _tr_parsed_uri.port_no; break; case TR_URI_PARAMS: - val->rs = (_tr_parsed_uri.params.s)?_tr_parsed_uri.params:_tr_empty; + val->rs = (_tr_parsed_uri.sip_params.s)?_tr_parsed_uri.sip_params:_tr_empty; break; case TR_URI_PARAM: if(tp==NULL) @@ -1033,7 +1033,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, LM_ERR("param invalid parameters\n"); return -1; } - if(_tr_parsed_uri.params.len<=0) + if(_tr_parsed_uri.sip_params.len<=0) { val->rs = _tr_empty; val->flags = PV_VAL_STR; @@ -1043,7 +1043,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, if(_tr_uri_params == NULL) { - sv = _tr_parsed_uri.params; + sv = _tr_parsed_uri.sip_params; if (parse_params(&sv, CLASS_ANY, &phooks, &_tr_uri_params)<0) return -1; }

11 years

git:master: modules/pv: fixed params and param transformation

by Juha Heinanen

Module: sip-router Branch: master Commit: e54b3ec673cb32664a1e8de2e591190f22216724 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e54b3ec… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Dec 19 16:21:25 2013 +0200 modules/pv: fixed params and param transformation - params need to be taken from sip_params field of sip_uri struct --- modules/pv/pv_trans.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index 738efca..7c75deb 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -1025,7 +1025,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, val->ri = _tr_parsed_uri.port_no; break; case TR_URI_PARAMS: - val->rs = (_tr_parsed_uri.params.s)?_tr_parsed_uri.params:_tr_empty; + val->rs = (_tr_parsed_uri.sip_params.s)?_tr_parsed_uri.sip_params:_tr_empty; break; case TR_URI_PARAM: if(tp==NULL) @@ -1033,7 +1033,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, LM_ERR("param invalid parameters\n"); return -1; } - if(_tr_parsed_uri.params.len<=0) + if(_tr_parsed_uri.sip_params.len<=0) { val->rs = _tr_empty; val->flags = PV_VAL_STR; @@ -1043,7 +1043,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, if(_tr_uri_params == NULL) { - sv = _tr_parsed_uri.params; + sv = _tr_parsed_uri.sip_params; if (parse_params(&sv, CLASS_ANY, &phooks, &_tr_uri_params)<0) return -1; }

11 years

SIP in Python

by Daniel Pocock

I understand Kamailio has a Python module We've recently started adding Python into repro (the reSIProcate proxy) too[1] There are also other projects involving SIP and Python (e.g. the PjSIP Python API and the Python SIP library used by SylkServer) One thing that occurred to me is that it may be useful to have a common API or at the bare minimum a common set of data types (e.g. Python classes for SIP URIs, classes for the most common SIP headers and a class for the SIP message itself) so that people can mix and match Python code between all the projects. For example, the Python urlparse module claims to support the "sip:" scheme but in practice it is not supporting it very well, if you put in the URI sip:daniel@pocock.com.au then it tells you that username=None hostname=None path=daniel(a)pocock.com.au Has anybody else had similar ideas about doing something in this space? 1. http://danielpocock.com/embedding-python-multi-threaded-cpp

11 years

planning last release for 3.3 branch

by Daniel-Constantin Mierla

Hello, the last two stable branches are now 4.0 and 4.1. I am considering packaging the latest branch 3.3 as release 3.3.6 and mark the end of releasing from that branch. Patches can still go there if developers find time for them, but the focus on release will go on 4.0 and 4.1. Hopefully I will find some time tomorrow afternoon for it. If anyone has patches to backport, do it before noon GMT tomorrow, or if there is something that should go there and is no time for it now, reply here with description and eventually propose a new date (or when you think what you want to do can be finished). Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

11 years

[tracker] Comment added: dlg_end_dlg on a two-armed proxy only sends bye to one party

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#382 - dlg_end_dlg on a two-armed proxy only sends bye to one party User who did this - Per Carlen (peca) ---------- No error messages found. However found some strange log entries regarding local messages so... Did a tcpdump on lo interface - and when running the "dlg_end_dlg", a BYE was actually sent on lo (src address and dst address = ip on external interface, first value in route-header also equalled the external ip). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=382#comment1237 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.

11 years

git:master: ims_registrar_scscf: fix crash caused by an uninitialized AVP

by Carlos Ruiz Diaz

Module: sip-router Branch: master Commit: 52d727dc249a88b31348b008045cc6071ab215a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52d727d… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Wed Dec 18 15:28:39 2013 -0300 ims_registrar_scscf: fix crash caused by an uninitialized AVP --- modules/ims_registrar_scscf/cxdx_sar.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/ims_registrar_scscf/cxdx_sar.c b/modules/ims_registrar_scscf/cxdx_sar.c index 7ff976b..122edc4 100644 --- a/modules/ims_registrar_scscf/cxdx_sar.c +++ b/modules/ims_registrar_scscf/cxdx_sar.c @@ -141,6 +141,13 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *saa, long elaps goto error_no_send; } + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); + get_act_time(); if (is_timeout) { @@ -253,12 +260,6 @@ done: if (data->sar_assignment_type != AVP_IMS_SAR_UNREGISTERED_USER) reg_send_reply_transactional(t->uas.request, data->contact_header, t); LM_DBG("DBG:SAR Async CDP callback: ... Done resuming transaction\n"); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); create_return_code(result); @@ -278,6 +279,8 @@ done: error: if (data->sar_assignment_type != AVP_IMS_SAR_UNREGISTERED_USER) reg_send_reply_transactional(t->uas.request, data->contact_header, t); + + create_return_code(-2); error_no_send: //if we don't have the transaction then we can't send a transaction response update_stat(rejected_registrations, 1);

11 years

← Newer
1
...
5
6
7
8
9
10
11
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2013