sr-dev December 2013

sr-dev@lists.kamailio.org

30 participants
318 discussions

git:master: pv: use int index for looking up flag index

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 30359b3cfce2ce909153e06b1954778c4eababa7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30359b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:15:22 2013 +0100 pv: use int index for looking up flag index - some functions used for check may return negative on error --- modules/pv/pv_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 85e6f8a..0afd9b1 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -2849,12 +2849,12 @@ error: int pv_parse_flag_param(pv_spec_p sp, str *in) { - unsigned int n; + int n; if(sp==NULL || in==NULL || in->len<=0) return -1; - if (str2int(in, &n) != 0) + if (str2sint(in, &n) != 0) { if ((n = get_flag_no(in->s, in->len)) < 0) {

10 years, 11 months

git:4.0: usrloc: proper index for domain column when laoding extra attributes

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 33d71771185812cba24f6213c7d8e4b9831b9b5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33d7177… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:02:36 2013 +0100 usrloc: proper index for domain column when laoding extra attributes - patch by Seudin Kasumovic, FS#377 (cherry picked from commit 551524cfc83b922c23e2d26f8cc5950df2a0af54) --- modules/usrloc/udomain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index 13632d2..d3275b8 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -1245,8 +1245,8 @@ int uldb_preload_attrs(udomain_t *_d) } if (use_domain) { - domain.s = (char*)VAL_STRING(ROW_VALUES(row) + 6); - if (VAL_NULL(ROW_VALUES(row)+6) || domain.s==0 || domain.s[0]==0){ + domain.s = (char*)VAL_STRING(ROW_VALUES(row) + 5); + if (VAL_NULL(ROW_VALUES(row)+5) || domain.s==0 || domain.s[0]==0){ LM_CRIT("empty domain record for user %.*s...skipping\n", user.len, user.s); continue;

10 years, 11 months

[tracker] Task closed: modules/usrloc crash kamailio 4.1 on startup if use_domain enabled

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#377 - modules/usrloc crash kamailio 4.1 on startup if use_domain enabled User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Thanks. Patch on master and 4.1 branches. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=377 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.

10 years, 11 months

git:4.0: Makefile.defs: compiler optimization level made variable

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: ba788ba35e8df637c3f91bd942e20808f1238b3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba788ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 16:33:04 2013 +0100 Makefile.defs: compiler optimization level made variable - allow using -O3 for clang, which gives error on the former default -O9 (cherry picked from commit 0713c0de50f8c2f4da2ee0ef33b0505c37792392) --- Makefile.defs | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index ee9f231..fdd9563 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -271,6 +271,7 @@ CC_LONGVER:=$(shell if $(CC) -v 2>/dev/null; then \ else \ $(CC) -V 2>&1 ; \ fi ) +CC_OPT ?= -O9 MKTAGS=ctags #find-out the compiler's name @@ -332,6 +333,7 @@ ifneq (, $(findstring clang, $(CC_LONGVER))) 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) + CC_OPT=-O3 MKDEP=$(CC) -MM endif @@ -891,7 +893,7 @@ ifeq ($(ARCH), i386) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) + CFLAGS=-g $(CC_OPT) -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) $(call set_if_empty,CPU,athlon64) @@ -949,8 +951,8 @@ ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,athlon64) C_DEFS+=-DCC_GCC_LIKE_ASM CFLAGS+=-m32 - -O9 \ - \ + $(CC_OPT) \ + \ -mtune=$(CPU) LDFLAGS+=-m32 else # CC_NAME, clang @@ -976,7 +978,7 @@ ifeq ($(ARCH), x86_64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) + CFLAGS=-g $(CC_OPT) -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.5+ # don't add '-mtune=$(CPU)' - gcc failure ifeq ($(CC_SHORTVER), 4.5+) @@ -1045,7 +1047,7 @@ ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,opteron) C_DEFS+=-DCC_GCC_LIKE_ASM CFLAGS+=-m64 \ - -O9 + $(CC_OPT) LDFLAGS+=-m64 else # CC_NAME, clang ifeq ($(CC_NAME), icc) @@ -1070,7 +1072,7 @@ ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM -DSPARC64_MODE #common stuff - CFLAGS=-g -O9 -funroll-loops $(PROFILE) \ + CFLAGS=-g $(CC_OPT) -funroll-loops $(PROFILE) \ #-Wcast-align \ #-Wmissing-prototypes #if gcc 4.5+ or 4.2+ @@ -1161,7 +1163,7 @@ ifeq ($(ARCH), sparc) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-g -O9 -funroll-loops $(PROFILE) \ + CFLAGS=-g $(CC_OPT) -funroll-loops $(PROFILE) \ #-Wcast-align \ #-Wmissing-prototypes #if gcc 4.5+ or 4.2+ @@ -1226,7 +1228,7 @@ ifeq ($(ARCH), arm) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-marm -march=armv5t -O9 -funroll-loops -fsigned-char $(PROFILE) + CFLAGS=-marm -march=armv5t $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) CFLAGS+= -ftree-vectorize -fno-strict-overflow @@ -1274,7 +1276,7 @@ ifeq ($(ARCH), arm6) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-march=armv6 -O9 -funroll-loops -fsigned-char \ + CFLAGS=-march=armv6 $(CC_OPT) -funroll-loops -fsigned-char \ $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) @@ -1321,7 +1323,7 @@ ifeq ($(ARCH), mips) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-O9 -funroll-loops $(PROFILE) + CFLAGS=$(CC_OPT) -funroll-loops $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) CFLAGS+=-march=r3000 -minline-all-stringops \ @@ -1368,7 +1370,7 @@ ifeq ($(ARCH), mips2) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) + CFLAGS= -mips2 $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) CFLAGS+=-minline-all-stringops -ftree-vectorize \ @@ -1413,7 +1415,7 @@ ifeq ($(ARCH), mips64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -mips64 -O9 -funroll-loops $(PROFILE) + CFLAGS= -mips64 $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) CFLAGS+=-minline-all-stringops -ftree-vectorize \ @@ -1458,7 +1460,7 @@ ifeq ($(ARCH), alpha) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -O9 -funroll-loops $(PROFILE) + CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 4.5 or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) CFLAGS+= -fno-strict-overflow @@ -1504,7 +1506,7 @@ ifeq ($(ARCH), ppc) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) + CFLAGS= $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) $(call set_if_empty,CPU,powerpc) @@ -1553,7 +1555,7 @@ ifeq ($(ARCH), ppc64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) + CFLAGS= $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) $(call set_if_empty,CPU,powerpc64)

10 years, 11 months

git:4.1: usrloc: proper index for domain column when laoding extra attributes

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 45ea3c6de26def1fa704f3e444bd37800ca09d9f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45ea3c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:02:36 2013 +0100 usrloc: proper index for domain column when laoding extra attributes - patch by Seudin Kasumovic, FS#377 (cherry picked from commit 551524cfc83b922c23e2d26f8cc5950df2a0af54) --- modules/usrloc/udomain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index 244f8e7..a736051 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -1250,8 +1250,8 @@ int uldb_preload_attrs(udomain_t *_d) } if (use_domain) { - domain.s = (char*)VAL_STRING(ROW_VALUES(row) + 6); - if (VAL_NULL(ROW_VALUES(row)+6) || domain.s==0 || domain.s[0]==0){ + domain.s = (char*)VAL_STRING(ROW_VALUES(row) + 5); + if (VAL_NULL(ROW_VALUES(row)+5) || domain.s==0 || domain.s[0]==0){ LM_CRIT("empty domain record for user %.*s...skipping\n", user.len, user.s); continue;

10 years, 11 months

git:4.1: core: fixed several clang compiler warnings

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 90681624c54f0ec0b1259e205bcc0274316b4549 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9068162… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 17:16:25 2013 +0100 core: fixed several clang compiler warnings (cherry picked from commit f0fb6f1e9fbb2f7f0c2bed5ba0d50a56cf5cf444) --- dset.c | 4 ++-- flags.c | 2 +- msg_translator.c | 2 +- parser/parse_fline.c | 2 +- select_buf.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dset.c b/dset.c index 13b000b..4b886bd 100644 --- a/dset.c +++ b/dset.c @@ -90,7 +90,7 @@ branch_t *get_sip_branch(int idx) return NULL; if(idx<0) { - if(nr_branches + idx >= 0) + if((int)nr_branches + idx >= 0) return &branches[nr_branches+idx]; return NULL; } @@ -109,7 +109,7 @@ int drop_sip_branch(int idx) { if(nr_branches==0 || idx>=nr_branches) return 0; - if(idx<0 && nr_branches+idx<0) + if(idx<0 && (int)nr_branches+idx<0) return 0; /* last branch */ if(idx==nr_branches-1) diff --git a/flags.c b/flags.c index 1523d0b..becb569 100644 --- a/flags.c +++ b/flags.c @@ -74,7 +74,7 @@ int flag_in_range( flag_t flag ) { flag, MAX_FLAG ); return 0; } - if (flag<0) { + if ((int)flag<0) { LOG(L_ERR, "ERROR: message flag (%d) must be in range %d..%d\n", flag, 0, MAX_FLAG ); return 0; diff --git a/msg_translator.c b/msg_translator.c index b4581e7..13b0785 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -1575,7 +1575,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto) */ /* no need for Content-Length if it's and UDP packet and * it hasn't Content-Length already */ - if ((msg->content_length==0)){ + if (msg->content_length==0){ /* content-length doesn't exist, append it */ /* msg->unparsed should point just before the final crlf * - whole message was parsed by the above parse_headers diff --git a/parser/parse_fline.c b/parser/parse_fline.c index 8dacfe5..b8fee65 100644 --- a/parser/parse_fline.c +++ b/parser/parse_fline.c @@ -233,7 +233,7 @@ error: if (prn) { for (t=0; t<offset; t++) if (*(buffer+t)) *(prn+t)=*(buffer+t); - else *(prn+t)='�'; + else *(prn+t)=176; /* '�' */ LOG(L_DBG, "parsed so far: %.*s\n", offset, ZSW(prn) ); pkg_free( prn ); }; diff --git a/select_buf.c b/select_buf.c index b3463a8..7277d48 100644 --- a/select_buf.c +++ b/select_buf.c @@ -162,7 +162,7 @@ int int_to_static_buffer(str* res, int val) { char *c; c = int2str(abs(val), &res->len); - res->s = get_static_buffer(res->len+(val<0)?1:0); + res->s = get_static_buffer(res->len+((val<0)?1:0)); if (!res->s) return -1; if (val < 0) { res->s[0] = '-';

10 years, 11 months

git:4.1: Makefile.defs: compiler optimization level made variable

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 5552d9f733a6423d4d940f9b93a6808de0800a1d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5552d9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 16:33:04 2013 +0100 Makefile.defs: compiler optimization level made variable - allow using -O3 for clang, which gives error on the former default -O9 (cherry picked from commit 0713c0de50f8c2f4da2ee0ef33b0505c37792392) --- Makefile.defs | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 480a3f8..327eeb9 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -273,6 +273,7 @@ CC_LONGVER:=$(shell if $(CC) -v 2>/dev/null; then \ else \ $(CC) -V 2>&1 ; \ fi ) +CC_OPT ?= -O9 MKTAGS=ctags #find-out the compiler's name @@ -334,6 +335,7 @@ ifneq (, $(findstring clang, $(CC_LONGVER))) 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) + CC_OPT=-O3 MKDEP=$(CC) -MM endif @@ -887,7 +889,7 @@ ifeq ($(ARCH), i386) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) + CFLAGS=-g $(CC_OPT) -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) $(call set_if_empty,CPU,athlon64) @@ -945,8 +947,8 @@ ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,athlon64) C_DEFS+=-DCC_GCC_LIKE_ASM CFLAGS+=-m32 - -O9 \ - \ + $(CC_OPT) \ + \ -mtune=$(CPU) LDFLAGS+=-m32 else # CC_NAME, clang @@ -972,7 +974,7 @@ ifeq ($(ARCH), x86_64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) + CFLAGS=-g $(CC_OPT) -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.5+ # don't add '-mtune=$(CPU)' - gcc failure ifeq ($(CC_SHORTVER), 4.5+) @@ -1041,7 +1043,7 @@ ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,opteron) C_DEFS+=-DCC_GCC_LIKE_ASM CFLAGS+=-m64 \ - -O9 + $(CC_OPT) LDFLAGS+=-m64 else # CC_NAME, clang ifeq ($(CC_NAME), icc) @@ -1066,7 +1068,7 @@ ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM -DSPARC64_MODE #common stuff - CFLAGS=-g -O9 -funroll-loops $(PROFILE) \ + CFLAGS=-g $(CC_OPT) -funroll-loops $(PROFILE) \ #-Wcast-align \ #-Wmissing-prototypes #if gcc 4.5+ or 4.2+ @@ -1157,7 +1159,7 @@ ifeq ($(ARCH), sparc) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-g -O9 -funroll-loops $(PROFILE) \ + CFLAGS=-g $(CC_OPT) -funroll-loops $(PROFILE) \ #-Wcast-align \ #-Wmissing-prototypes #if gcc 4.5+ or 4.2+ @@ -1222,7 +1224,7 @@ ifeq ($(ARCH), arm) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-marm -march=armv5t -O9 -funroll-loops -fsigned-char $(PROFILE) + CFLAGS=-marm -march=armv5t $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) CFLAGS+= -ftree-vectorize -fno-strict-overflow @@ -1270,7 +1272,7 @@ ifeq ($(ARCH), arm6) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-march=armv6 -O9 -funroll-loops -fsigned-char \ + CFLAGS=-march=armv6 $(CC_OPT) -funroll-loops -fsigned-char \ $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) @@ -1317,7 +1319,7 @@ ifeq ($(ARCH), mips) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-O9 -funroll-loops $(PROFILE) + CFLAGS=$(CC_OPT) -funroll-loops $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) CFLAGS+=-march=r3000 -minline-all-stringops \ @@ -1364,7 +1366,7 @@ ifeq ($(ARCH), mips2) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) + CFLAGS= -mips2 $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) CFLAGS+=-minline-all-stringops -ftree-vectorize \ @@ -1409,7 +1411,7 @@ ifeq ($(ARCH), mips64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -mips64 -O9 -funroll-loops $(PROFILE) + CFLAGS= -mips64 $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) CFLAGS+=-minline-all-stringops -ftree-vectorize \ @@ -1454,7 +1456,7 @@ ifeq ($(ARCH), alpha) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -O9 -funroll-loops $(PROFILE) + CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 4.5 or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) CFLAGS+= -fno-strict-overflow @@ -1500,7 +1502,7 @@ ifeq ($(ARCH), ppc) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) + CFLAGS= $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) $(call set_if_empty,CPU,powerpc) @@ -1549,7 +1551,7 @@ ifeq ($(ARCH), ppc64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) + CFLAGS= $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) $(call set_if_empty,CPU,powerpc64)

10 years, 11 months

git:master: usrloc: proper index for domain column when laoding extra attributes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 551524cfc83b922c23e2d26f8cc5950df2a0af54 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=551524c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 18:02:36 2013 +0100 usrloc: proper index for domain column when laoding extra attributes - patch by Seudin Kasumovic, FS#377 --- modules/usrloc/udomain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index 244f8e7..a736051 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -1250,8 +1250,8 @@ int uldb_preload_attrs(udomain_t *_d) } if (use_domain) { - domain.s = (char*)VAL_STRING(ROW_VALUES(row) + 6); - if (VAL_NULL(ROW_VALUES(row)+6) || domain.s==0 || domain.s[0]==0){ + domain.s = (char*)VAL_STRING(ROW_VALUES(row) + 5); + if (VAL_NULL(ROW_VALUES(row)+5) || domain.s==0 || domain.s[0]==0){ LM_CRIT("empty domain record for user %.*s...skipping\n", user.len, user.s); continue;

10 years, 11 months

[tracker] Task opened: modules/usrloc crash kamailio 4.1 on startup if use_domain enabled (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Seudin Kasumovic (seudin) Attached to Project - sip-router Summary - modules/usrloc crash kamailio 4.1 on startup if use_domain enabled Task Type - Bug Report Category - Modules kamailio Status - Unconfirmed Assigned To - Operating System - Linux Severity - Critical Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hi, usrloc module crash kamailio 4.1 on startup if use_domain parameter enabled Program terminated with signal 11, Segmentation fault. #0 0xb6ca19e0 in uldb_preload_attrs (_d=0xb552131c) at udomain.c:1254 1254 if (VAL_NULL(ROW_VALUES(row)+6) || domain.s==0 || domain.s[0]==0){ here is added +6 instead of +5; Fix is attached. version: kamailio 4.1.0 (i386/linux) flags: STATS: Off, EXTRA_DEBUG, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, DBG_QM_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 4MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: compiled on 16:45:39 Dec 6 2013 with gcc 4.5.4 Regards, Seudin One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=377 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.

10 years, 11 months

git:master: core: fixed several clang compiler warnings

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f0fb6f1e9fbb2f7f0c2bed5ba0d50a56cf5cf444 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0fb6f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 6 17:16:25 2013 +0100 core: fixed several clang compiler warnings --- dset.c | 4 ++-- flags.c | 2 +- msg_translator.c | 2 +- parser/parse_fline.c | 2 +- select_buf.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dset.c b/dset.c index 13b000b..4b886bd 100644 --- a/dset.c +++ b/dset.c @@ -90,7 +90,7 @@ branch_t *get_sip_branch(int idx) return NULL; if(idx<0) { - if(nr_branches + idx >= 0) + if((int)nr_branches + idx >= 0) return &branches[nr_branches+idx]; return NULL; } @@ -109,7 +109,7 @@ int drop_sip_branch(int idx) { if(nr_branches==0 || idx>=nr_branches) return 0; - if(idx<0 && nr_branches+idx<0) + if(idx<0 && (int)nr_branches+idx<0) return 0; /* last branch */ if(idx==nr_branches-1) diff --git a/flags.c b/flags.c index 1523d0b..becb569 100644 --- a/flags.c +++ b/flags.c @@ -74,7 +74,7 @@ int flag_in_range( flag_t flag ) { flag, MAX_FLAG ); return 0; } - if (flag<0) { + if ((int)flag<0) { LOG(L_ERR, "ERROR: message flag (%d) must be in range %d..%d\n", flag, 0, MAX_FLAG ); return 0; diff --git a/msg_translator.c b/msg_translator.c index b4581e7..13b0785 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -1575,7 +1575,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto) */ /* no need for Content-Length if it's and UDP packet and * it hasn't Content-Length already */ - if ((msg->content_length==0)){ + if (msg->content_length==0){ /* content-length doesn't exist, append it */ /* msg->unparsed should point just before the final crlf * - whole message was parsed by the above parse_headers diff --git a/parser/parse_fline.c b/parser/parse_fline.c index 8dacfe5..b8fee65 100644 --- a/parser/parse_fline.c +++ b/parser/parse_fline.c @@ -233,7 +233,7 @@ error: if (prn) { for (t=0; t<offset; t++) if (*(buffer+t)) *(prn+t)=*(buffer+t); - else *(prn+t)='�'; + else *(prn+t)=176; /* '�' */ LOG(L_DBG, "parsed so far: %.*s\n", offset, ZSW(prn) ); pkg_free( prn ); }; diff --git a/select_buf.c b/select_buf.c index b3463a8..7277d48 100644 --- a/select_buf.c +++ b/select_buf.c @@ -162,7 +162,7 @@ int int_to_static_buffer(str* res, int val) { char *c; c = int2str(abs(val), &res->len); - res->s = get_static_buffer(res->len+(val<0)?1:0); + res->s = get_static_buffer(res->len+((val<0)?1:0)); if (!res->s) return -1; if (val < 0) { res->s[0] = '-';

10 years, 11 months

← Newer
1
...
18
19
20
21
22
23
24
...
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