sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
301 discussions

git:4.2:0cd5280e: permissions: check if hash tables exist for address config functions

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 0cd5280e2f0bc3df24aa98584b549d65a79fee20 URL: https://github.com/kamailio/kamailio/commit/0cd5280e2f0bc3df24aa98584b549d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:42:05+02:00 permissions: check if hash tables exist for address config functions - reported by Olle E. Johansson, GH#248 (cherry picked from commit 6fcd35ba5bb71df680b89c2bafceccde0439b6f1) (cherry picked from commit 64028d658a788b74f6f9c71f2e2aa3b0b5a1c803) --- Modified: modules/permissions/address.c --- Diff: https://github.com/kamailio/kamailio/commit/0cd5280e2f0bc3df24aa98584b549d6… Patch: https://github.com/kamailio/kamailio/commit/0cd5280e2f0bc3df24aa98584b549d6…

9 years, 4 months

git:4.2:0dd462b3: rr: fix detecting next strict router

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 0dd462b3e4ca6637b1d4fdb5cda3df97f215e3e8 URL: https://github.com/kamailio/kamailio/commit/0dd462b3e4ca6637b1d4fdb5cda3df9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:41:41+02:00 rr: fix detecting next strict router - a regression after adding support for sip-outbound - more verbose debug messages - reported by Antonio Real, GH #267 (cherry picked from commit 0c42a848258d475f57ea25458bc75e55dcee948d) (cherry picked from commit cb4f55b26f51a929b2db08373c1b97a95b8ad6a6) --- Modified: modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/0dd462b3e4ca6637b1d4fdb5cda3df9… Patch: https://github.com/kamailio/kamailio/commit/0dd462b3e4ca6637b1d4fdb5cda3df9… --- diff --git a/modules/rr/loose.c b/modules/rr/loose.c index f537a8d..87065e6 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -759,7 +759,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) int status = RR_DRIVEN; str uri; struct socket_info *si; - int uri_is_myself, next_is_strict; + int uri_is_myself; int use_ob = 0; hdr = _m->route; @@ -770,11 +770,11 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) routed_msg_id = 0; if (parse_uri(uri.s, uri.len, &puri) < 0) { - LM_ERR("failed to parse the first route URI\n"); + LM_ERR("failed to parse the first route URI (%.*s)\n", + uri.len, ZSW(uri.s)); return RR_ERROR; } - next_is_strict = is_strict(&puri.params); routed_params = puri.params; uri_is_myself = is_myself(&puri); @@ -817,7 +817,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) /* double route may occure due different IP and port, so force as * send interface the one advertise in second Route */ if (parse_uri(rt->nameaddr.uri.s,rt->nameaddr.uri.len,&puri)<0) { - LM_ERR("failed to parse the double route URI\n"); + LM_ERR("failed to parse the double route URI (%.*s)\n", + rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); return RR_ERROR; } @@ -854,7 +855,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) uri = rt->nameaddr.uri; if (parse_uri(uri.s, uri.len, &puri) < 0) { - LM_ERR("failed to parse the first route URI\n"); + LM_ERR("failed to parse the next route URI (%.*s)\n", + uri.len, ZSW(uri.s)); return RR_ERROR; } } else { @@ -869,7 +871,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } LM_DBG("URI to be processed: '%.*s'\n", uri.len, ZSW(uri.s)); - if (next_is_strict) { + if (is_strict(&puri.params)) { LM_DBG("Next URI is a strict router\n"); if (handle_sr(_m, hdr, rt) < 0) { LM_ERR("failed to handle strict router\n");

9 years, 4 months

git:4.2:4bce6e25: kamcmd: use NAME to build help message

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 4bce6e25bcb8a07687c87f9c64b5d54fba8e0410 URL: https://github.com/kamailio/kamailio/commit/4bce6e25bcb8a07687c87f9c64b5d54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:41:26+02:00 kamcmd: use NAME to build help message (cherry picked from commit 7038d12dbb9c8db1b46c0874bfd8fce72d6e72ed) (cherry picked from commit ff1d3f06840928aace36780ecbc898cd2e90ce0a) --- Modified: utils/sercmd/sercmd.c --- Diff: https://github.com/kamailio/kamailio/commit/4bce6e25bcb8a07687c87f9c64b5d54… Patch: https://github.com/kamailio/kamailio/commit/4bce6e25bcb8a07687c87f9c64b5d54… --- diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 86d8fc4..974127c 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -111,7 +111,7 @@ arg:\n\ string or number; to force a number to be interpreted as string \n\ prefix it by \"s:\", e.g. s:1\n\ Examples:\n\ - " NAME " -s unixs:/tmp/ser_unix system.listMethods\n\ + " NAME " -s unixs:/tmp/" NAME "_ctl system.listMethods\n\ " NAME " -f \"pid: %v desc: %v\\n\" -s udp:localhost:2047 core.ps \n\ " NAME " ps # uses default ctl socket \n\ " NAME " # enters interactive mode on the default socket \n\

9 years, 4 months

git:4.2:9cd51ffe: core: fix mips compilation

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 9cd51ffe046e157c419e5e4d3f691037e906436b URL: https://github.com/kamailio/kamailio/commit/9cd51ffe046e157c419e5e4d3f69103… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:41:14+02:00 core: fix mips compilation Patch from http://anonscm.debian.org/cgit/pkg-voip/kamailio.git/tree/debian/patches/fi… by Dejan Latinovic <Dejan.Latinovic(a)imgtec.com> (cherry picked from commit ed894111f6f15170f87336bfa73ec4e8fce1c7d1) (cherry picked from commit 5a0b8a4550df2de15e40b5d7e664322815a48aea) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/9cd51ffe046e157c419e5e4d3f69103… Patch: https://github.com/kamailio/kamailio/commit/9cd51ffe046e157c419e5e4d3f69103… --- diff --git a/Makefile.defs b/Makefile.defs index a9c69a4..a146fb8 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1372,12 +1372,13 @@ ifeq ($(CC_NAME), gcc) CFLAGS= -mips2 $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER)))) - CFLAGS+=-minline-all-stringops -ftree-vectorize \ - -fno-strict-overflow + CFLAGS+=-ftree-vectorize -fno-strict-overflow + # not supported on mips: -minline-all-stringops else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CFLAGS+=-minline-all-stringops -ftree-vectorize + CFLAGS+=-ftree-vectorize + # not supported on mips: -minline-all-stringops else #if gcc 3.4+ ifeq ($(CC_SHORTVER), 3.4) @@ -1417,12 +1418,14 @@ ifeq ($(CC_NAME), gcc) CFLAGS= -mips64 $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER)))) - CFLAGS+=-minline-all-stringops -ftree-vectorize \ - -fno-strict-overflow + CFLAGS+=-ftree-vectorize -fno-strict-overflow + # not supported on mips: -minline-all-stringops + else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CFLAGS+=-minline-all-stringops -ftree-vectorize + CFLAGS+=-ftree-vectorize + # not supported on mips: -minline-all-stringops else #if gcc 3.4+ ifeq ($(CC_SHORTVER), 3.4)

9 years, 4 months

git:4.2:effb9eea: acc: note about setting acc flag for ACKs that should be recorded

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: effb9eea18c59c6bd2db593f132ad2dc53986690 URL: https://github.com/kamailio/kamailio/commit/effb9eea18c59c6bd2db593f132ad2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:40:59+02:00 acc: note about setting acc flag for ACKs that should be recorded (cherry picked from commit 6656d4459f0c7d4c1b7cb5d2b214201c5a587c5c) (cherry picked from commit c68a6dcad598130bc6894f1de5ef3b39eb789660) --- Modified: modules/acc/README Modified: modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/effb9eea18c59c6bd2db593f132ad2d… Patch: https://github.com/kamailio/kamailio/commit/effb9eea18c59c6bd2db593f132ad2d… --- diff --git a/modules/acc/README b/modules/acc/README index bbf84fe..455c271 100644 --- a/modules/acc/README +++ b/modules/acc/README @@ -768,7 +768,8 @@ modparam("acc", "failed_filter", "404,407") Shall acc attempt to account e2e ACKs too ? Note that this is really only an attempt, as e2e ACKs may take a different path (unless RR enabled) and mismatch original INVITE (e2e ACKs are a separate - transaction). + transaction). The flag for accounting has to be set for each ACK as + well. Default value is 0 (no). diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index eb7acdc..c447e8b 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -559,7 +559,8 @@ modparam("acc", "failed_filter", "404,407") Shall acc attempt to account e2e ACKs too ? Note that this is really only an attempt, as e2e ACKs may take a different path (unless RR enabled) and mismatch original INVITE (e2e ACKs are - a separate transaction). + a separate transaction). The flag for accounting has to be set + for each ACK as well. </para> <para> Default value is 0 (no).

9 years, 4 months

git:4.2:e3618b8f: uac: reset ongoing registration state if retry interval is exceeded

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: e3618b8f8acd03db05c4b5ed09aa6b2945f39869 URL: https://github.com/kamailio/kamailio/commit/e3618b8f8acd03db05c4b5ed09aa6b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:39:44+02:00 uac: reset ongoing registration state if retry interval is exceeded - cover the case of remote registration process stuck in ongoing state for long time - reported by Andy J Robinson, GH #255 (cherry picked from commit cfa6831f9a81988dc1844ba3e4e6048c12841606) (cherry picked from commit e5f8d6282eefbe4c8ad0b0309ac06ab468e9b1f2) --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/e3618b8f8acd03db05c4b5ed09aa6b2… Patch: https://github.com/kamailio/kamailio/commit/e3618b8f8acd03db05c4b5ed09aa6b2… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index de4e265..612910f 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -906,8 +906,13 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) return -1; if(reg->expires==0) return 1; - if(reg->flags&UAC_REG_ONGOING) - return 2; + if(reg->flags&UAC_REG_ONGOING) { + if (reg->timer_expires > tn - reg_retry_interval) + return 2; + LM_DBG("record marked as ongoing registration (%d) - resetting\n", + (int)reg->flags); + reg->flags &= ~(UAC_REG_ONLINE|UAC_REG_AUTHSENT); + } if(reg->flags&UAC_REG_DISABLED) return 4; if(reg->timer_expires > tn + reg_timer_interval + 3)

9 years, 4 months

git:4.2:22b2b07d: tm: more verbose debug message when local transaction is completed

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 22b2b07d9295410ac1a9dbc11baf129b984ca640 URL: https://github.com/kamailio/kamailio/commit/22b2b07d9295410ac1a9dbc11baf129… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:39:33+02:00 tm: more verbose debug message when local transaction is completed (cherry picked from commit 54fea03a078f8258d124a83443617c54bdbc2574) (cherry picked from commit aa91d8ba178624c08ffcbb6af55efa777f6ca640) --- Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/22b2b07d9295410ac1a9dbc11baf129… Patch: https://github.com/kamailio/kamailio/commit/22b2b07d9295410ac1a9dbc11baf129… --- diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index e23325b..faba190 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2131,7 +2131,8 @@ enum rps local_reply( struct cell *t, struct sip_msg *p_msg, int branch, } if (local_winner>=0 && winning_code>=200 ) { - DBG("DEBUG: local transaction completed\n"); + DBG("DEBUG: local transaction completed %d/%d (totag retr: %d/%d)\n", + winning_code, local_winner, totag_retr, t->tmcb_hl.reg_types); if (!totag_retr) { if (unlikely(has_tran_tmcbs(t,TMCB_LOCAL_COMPLETED) )) run_trans_callbacks( TMCB_LOCAL_COMPLETED, t, 0,

9 years, 4 months

git:4.2:7d88192a: siptrace: check if To header is parsed and available

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 7d88192abe6e70b00fe6f2f429bb1486853e8dc6 URL: https://github.com/kamailio/kamailio/commit/7d88192abe6e70b00fe6f2f429bb148… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:39:01+02:00 siptrace: check if To header is parsed and available - it is accessed and can lead to crash if not prepared - reported by GH #263 (cherry picked from commit 93b297e16134b0e74cf83e3604da01355a52e700) (cherry picked from commit 8ba3be202f70a90ea88cdaac47fd2a7f9a9ef4f4) --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/7d88192abe6e70b00fe6f2f429bb148… Patch: https://github.com/kamailio/kamailio/commit/7d88192abe6e70b00fe6f2f429bb148… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index 6914d48..b063b49 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -527,6 +527,11 @@ static int sip_trace_prepare(sip_msg_t *msg) goto error; } + if(parse_to_header(msg)==-1 || msg->to==NULL || get_to(msg)==NULL) { + LM_ERR("cannot parse To header\n"); + goto error; + } + if(parse_headers(msg, HDR_CALLID_F, 0)!=0 || msg->callid==NULL || msg->callid->body.s==NULL) { LM_ERR("cannot parse call-id\n");

9 years, 4 months

git:4.2:97df3a11: siptrace: safety check if db connection is set

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 97df3a119cd4331dfd71f6e64606d3771f09aa69 URL: https://github.com/kamailio/kamailio/commit/97df3a119cd4331dfd71f6e64606d37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:38:46+02:00 siptrace: safety check if db connection is set - reported in GH #262 (cherry picked from commit 740cfa0ebed20ba7b5ae2cab1b25aa2f6cd83899) (cherry picked from commit ba7b0eaba0c14db6ea27190787aea25d30cfb2ca) --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/97df3a119cd4331dfd71f6e64606d37… Patch: https://github.com/kamailio/kamailio/commit/97df3a119cd4331dfd71f6e64606d37… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index 0ccef7d..6914d48 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -749,6 +749,11 @@ static int sip_trace_store(struct _siptrace_data *sto, struct dest_info *dst) static int sip_trace_store_db(struct _siptrace_data *sto) { + if(db_con==NULL) { + LM_DBG("database connection not initialized\n"); + return -1; + } + if(trace_to_database_flag==NULL || *trace_to_database_flag==0) goto done;

9 years, 4 months

git:4.2:21b9fd01: permissions: safety check for trusted hash table

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 21b9fd01edef11ac3d3352115d52b7d0d985d95f URL: https://github.com/kamailio/kamailio/commit/21b9fd01edef11ac3d3352115d52b7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:35:53+02:00 permissions: safety check for trusted hash table - avoid crash if a db reload is issued in db-only mode - reported Emmanuel Schmidbauer, GH #228 (cherry picked from commit f2958e5861a96e40f0aca05d5d5bd7fa14c2089e) (cherry picked from commit 02ba3dd9fbb41fb3f03fa230672c72acedc39f0d) --- Modified: modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/21b9fd01edef11ac3d3352115d52b7d… Patch: https://github.com/kamailio/kamailio/commit/21b9fd01edef11ac3d3352115d52b7d… --- diff --git a/modules/permissions/trusted.c b/modules/permissions/trusted.c index db20e8f..f42c096 100644 --- a/modules/permissions/trusted.c +++ b/modules/permissions/trusted.c @@ -43,9 +43,9 @@ #define TABLE_VERSION 5 -struct trusted_list ***hash_table; /* Pointer to current hash table pointer */ -struct trusted_list **hash_table_1; /* Pointer to hash table 1 */ -struct trusted_list **hash_table_2; /* Pointer to hash table 2 */ +struct trusted_list ***hash_table = 0; /* Pointer to current hash table pointer */ +struct trusted_list **hash_table_1 = 0; /* Pointer to hash table 1 */ +struct trusted_list **hash_table_2 = 0; /* Pointer to hash table 2 */ static db1_con_t* db_handle = 0; @@ -69,16 +69,21 @@ int reload_trusted_table(void) char *pattern, *tag; - cols[0] = &source_col; - cols[1] = &proto_col; - cols[2] = &from_col; - cols[3] = &tag_col; + if (hash_table == 0) { + LM_ERR("in-memory hash table not initialized\n"); + return -1; + } if (db_handle == 0) { LM_ERR("no connection to database\n"); return -1; } + cols[0] = &source_col; + cols[1] = &proto_col; + cols[2] = &from_col; + cols[3] = &tag_col; + if (perm_dbf.use_table(db_handle, &trusted_table) < 0) { LM_ERR("failed to use trusted table\n"); return -1;

9 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015