- sr-dev - kamailio.org

git:master:61c4dd2e: core: mem/f_malloc - updated log macros
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 61c4dd2e30b17865fd52905d1bbac8a3cf6734a3 URL: https://github.com/kamailio/kamailio/commit/61c4dd2e30b17865fd52905d1bbac8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T12:06:47+02:00 core: mem/f_malloc - updated log macros --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/61c4dd2e30b17865fd52905d1bbac8a… Patch: https://github.com/kamailio/kamailio/commit/61c4dd2e30b17865fd52905d1bbac8a… --- diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index 308640da93..7350a3b3c7 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -320,11 +320,11 @@ struct fm_block* fm_malloc_init(char* address, unsigned long size, int type) /* make address and size multiple of 8*/ start=(char*)ROUNDUP((unsigned long) address); - DBG("fm_malloc_init: F_OPTIMIZE=%lu, /ROUNDTO=%lu\n", + LM_DBG("F_OPTIMIZE=%lu, /ROUNDTO=%lu\n", F_MALLOC_OPTIMIZE, F_MALLOC_OPTIMIZE/ROUNDTO); - DBG("fm_malloc_init: F_HASH_SIZE=%lu, fm_block size=%lu\n", + LM_DBG("F_HASH_SIZE=%lu, fm_block size=%lu\n", F_HASH_SIZE, (unsigned long)sizeof(struct fm_block)); - DBG("fm_malloc_init(%p, %lu), start=%p\n", address, (unsigned long)size, + LM_DBG("fm_malloc_init(%p, %lu), start=%p\n", address, (unsigned long)size, start); if (size<start-address) return 0; @@ -710,7 +710,7 @@ void* fm_realloc(void* qmp, void* p, size_t size) #endif f=(struct fm_frag*) ((char*)p-sizeof(struct fm_frag)); #ifdef DBG_F_MALLOC - MDBG("fm_realloc: realloc'ing frag %p alloc'ed from %s: %s(%ld)\n", + MDBG("realloc'ing frag %p alloc'ed from %s: %s(%ld)\n", f, f->file, f->func, f->line); #endif size=ROUNDUP(size); @@ -718,7 +718,7 @@ void* fm_realloc(void* qmp, void* p, size_t size) if (f->size > size){ /* shrink */ #ifdef DBG_F_MALLOC - MDBG("fm_realloc: shrinking from %lu to %lu\n", f->size, + MDBG("shrinking from %lu to %lu\n", f->size, (unsigned long)size); fm_split_frag(qm, f, size, file, "frag. from fm_realloc", line, mname); #else @@ -727,7 +727,7 @@ void* fm_realloc(void* qmp, void* p, size_t size) }else if (f->size<size){ /* grow */ #ifdef DBG_F_MALLOC - MDBG("fm_realloc: growing from %lu to %lu\n", f->size, + MDBG("growing from %lu to %lu\n", f->size, (unsigned long)size); #endif diff=size-f->size; @@ -781,12 +781,12 @@ void* fm_realloc(void* qmp, void* p, size_t size) }else{ /* do nothing */ #ifdef DBG_F_MALLOC - MDBG("fm_realloc: doing nothing, same size: %lu - %lu\n", + MDBG("doing nothing, same size: %lu - %lu\n", f->size, (unsigned long)size); #endif } #ifdef DBG_F_MALLOC - MDBG("fm_realloc: returning %p\n", p); + MDBG("returning pointer value %p\n", p); #endif if(qm->type==MEM_TYPE_PKG) { sr_event_exec(SREV_PKG_UPDATE_STATS, 0);

1 0

git:master:f7fb1d3e: core: mem/tlsf_malloc - implemented mallocxz() and reallocxf()
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: f7fb1d3e1687de0d051d2b224e7042cc5452a053 URL: https://github.com/kamailio/kamailio/commit/f7fb1d3e1687de0d051d2b224e7042c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T11:44:00+02:00 core: mem/tlsf_malloc - implemented mallocxz() and reallocxf() --- Modified: src/core/mem/tlsf_malloc.c Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/f7fb1d3e1687de0d051d2b224e7042c… Patch: https://github.com/kamailio/kamailio/commit/f7fb1d3e1687de0d051d2b224e7042c…

1 0

git:master:3551b1a4: core: mem/q_malloc - implemented mallocxz() and reallocxf()
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 3551b1a4e1fc14ff410a8f4bee8b443ed0c841e0 URL: https://github.com/kamailio/kamailio/commit/3551b1a4e1fc14ff410a8f4bee8b443… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T11:30:41+02:00 core: mem/q_malloc - implemented mallocxz() and reallocxf() --- Modified: src/core/mem/q_malloc.c Modified: src/core/mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/3551b1a4e1fc14ff410a8f4bee8b443… Patch: https://github.com/kamailio/kamailio/commit/3551b1a4e1fc14ff410a8f4bee8b443…

1 0

git:master:1f195edf: core: mem/f_malloc - implemented mallocxz() and reallocxf()
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 1f195edf75e907fc6347d5646b724cede5733170 URL: https://github.com/kamailio/kamailio/commit/1f195edf75e907fc6347d5646b724ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T11:15:12+02:00 core: mem/f_malloc - implemented mallocxz() and reallocxf() --- Modified: src/core/mem/f_malloc.c Modified: src/core/mem/f_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/1f195edf75e907fc6347d5646b724ce… Patch: https://github.com/kamailio/kamailio/commit/1f195edf75e907fc6347d5646b724ce…

1 0

git:master:9ea86b94: core: mem - new functions for pkg/shm - mallocxz() and reallocxf()
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 9ea86b94b2e26b21f4e3041e6298fd475797ceb3 URL: https://github.com/kamailio/kamailio/commit/9ea86b94b2e26b21f4e3041e6298fd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T10:42:59+02:00 core: mem - new functions for pkg/shm - mallocxz() and reallocxf() - pkg_mallocxz(size) / shm_mallocxz(size) - same as the corresponding malloc function, but the allocated buffer is filled with 0. It is equivalent of { p=malloc(size); if(p) memset(p, 0, size); } - pkg_reallocxf(p, size)/shm_reallocxf(p, size) - same as the corresponding realloc functions, but the old pointer is always freed, even if the realloc operation fails. The BSDs have reallocf() --- Modified: src/core/mem/memapi.h Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/9ea86b94b2e26b21f4e3041e6298fd4… Patch: https://github.com/kamailio/kamailio/commit/9ea86b94b2e26b21f4e3041e6298fd4…

1 0

git:master:179a6e69: tm: terminate local uac buffers with 0
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 179a6e699a1021efa55d1ea097ceeb7a12575cc5 URL: https://github.com/kamailio/kamailio/commit/179a6e699a1021efa55d1ea097ceeb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T10:08:10+02:00 tm: terminate local uac buffers with 0 - received message buffer is terminated with 0 and many functions expect that, so use of them in event_route[tm:local-request] may have ended up in wrong behavior --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/179a6e699a1021efa55d1ea097ceeb7… Patch: https://github.com/kamailio/kamailio/commit/179a6e699a1021efa55d1ea097ceeb7… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index c4ab254076..feb7513bfd 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1633,6 +1633,8 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, assert(w-buf == *len); #endif + memapp(w, "\0", 1); + pkg_free(via.s); return buf;

1 0

git:master:453f45af: xmlrpc: handle realloc failure
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 453f45af78190dad79bdc4f787ba5a18ca7f6392 URL: https://github.com/kamailio/kamailio/commit/453f45af78190dad79bdc4f787ba5a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T09:52:09+02:00 xmlrpc: handle realloc failure --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/453f45af78190dad79bdc4f787ba5a1… Patch: https://github.com/kamailio/kamailio/commit/453f45af78190dad79bdc4f787ba5a1… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 61b73d0993..bac1567ed6 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -1841,6 +1841,7 @@ static int rpc_struct_printf(struct rpc_struct* s, char* member_name, { int n, buf_size; char* buf; + char* buf0; va_list ap; str st, name; struct xmlrpc_reply* reply; @@ -1890,11 +1891,12 @@ static int rpc_struct_printf(struct rpc_struct* s, char* member_name, } else { /* glibc 2.0 */ buf_size *= 2; /* twice the old size */ } - if ((buf = mxr_realloc(buf, buf_size)) == 0) { + if ((buf0 = mxr_realloc(buf, buf_size)) == 0) { set_fault(reply, 500, "Internal Server Error (No memory left)"); ERR("No memory left\n"); goto err; } + buf = buf0; } return 0; err:

1 0

git:master:1d06db87: Merge pull request #1204 from dunst0/fix/app_sqlang
by GitHub 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 1d06db87f88841f4aa540b4f1554bed31da2ec25 URL: https://github.com/kamailio/kamailio/commit/1d06db87f88841f4aa540b4f1554bed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-07T21:57:13+02:00 Merge pull request #1204 from dunst0/fix/app_sqlang app_sqlang: fix static make and gcc in Makefiles --- Modified: src/modules/app_sqlang/Makefile Modified: src/modules/app_sqlang/squirrel/sqstdlib/Makefile Modified: src/modules/app_sqlang/squirrel/squirrel/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/1d06db87f88841f4aa540b4f1554bed… Patch: https://github.com/kamailio/kamailio/commit/1d06db87f88841f4aa540b4f1554bed… --- diff --git a/src/modules/app_sqlang/Makefile b/src/modules/app_sqlang/Makefile index 9766b2d845..153f414884 100644 --- a/src/modules/app_sqlang/Makefile +++ b/src/modules/app_sqlang/Makefile @@ -20,11 +20,11 @@ endif include ../../Makefile.modules libsquirrel.a: - make -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" $(MKSQLANG) libsqstdlib.a: - make -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsqstdlib.a" $(MKSQLANG) app_sqlang.so: libsquirrel.a libsqstdlib.a diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile index 14c33948ea..cc1fbe94fb 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile +++ b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile @@ -27,16 +27,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o diff --git a/src/modules/app_sqlang/squirrel/squirrel/Makefile b/src/modules/app_sqlang/squirrel/squirrel/Makefile index ce9359d2e9..cda7d248a5 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/Makefile +++ b/src/modules/app_sqlang/squirrel/squirrel/Makefile @@ -36,16 +36,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o

1 0

git:master:d8ab359f: app_sqlang: fix static make and gcc in Makefiles
by Rick Barenthin 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: d8ab359faa67586abd118af8c067aa2671470a43 URL: https://github.com/kamailio/kamailio/commit/d8ab359faa67586abd118af8c067aa2… Author: Rick Barenthin <dunst0(a)gmail.com> Committer: Rick Barenthin <dunst0(a)gmail.com> Date: 2017-08-03T11:34:35+02:00 app_sqlang: fix static make and gcc in Makefiles - app_sqlang now uses $(MAKE) and $(CC) variables in Makefiles, so it builds on systems with gnu make named different then make and compiles with different compiler than gcc --- Modified: src/modules/app_sqlang/Makefile Modified: src/modules/app_sqlang/squirrel/sqstdlib/Makefile Modified: src/modules/app_sqlang/squirrel/squirrel/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d8ab359faa67586abd118af8c067aa2… Patch: https://github.com/kamailio/kamailio/commit/d8ab359faa67586abd118af8c067aa2… --- diff --git a/src/modules/app_sqlang/Makefile b/src/modules/app_sqlang/Makefile index 9766b2d845..153f414884 100644 --- a/src/modules/app_sqlang/Makefile +++ b/src/modules/app_sqlang/Makefile @@ -20,11 +20,11 @@ endif include ../../Makefile.modules libsquirrel.a: - make -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/squirrel CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" $(MKSQLANG) libsqstdlib.a: - make -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ + $(MAKE) -C ./squirrel/sqstdlib CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsqstdlib.a" $(MKSQLANG) app_sqlang.so: libsquirrel.a libsqstdlib.a diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile index 14c33948ea..cc1fbe94fb 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile +++ b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile @@ -27,16 +27,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o diff --git a/src/modules/app_sqlang/squirrel/squirrel/Makefile b/src/modules/app_sqlang/squirrel/squirrel/Makefile index ce9359d2e9..cda7d248a5 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/Makefile +++ b/src/modules/app_sqlang/squirrel/squirrel/Makefile @@ -36,16 +36,16 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sqprof: - gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o sq64: - gcc -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + $(CC) -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o

1 0

[kamailio/kamailio] textops: Fix 'offset exceeds message size' crash. (#1206)
by codyherzog 07 Aug '17

07 Aug '17

Ensure that buffer is null terminated when subst_run() function is used. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1206 -- Commit Summary -- * textops: Fix 'offset exceeds message size' crash. -- File Changes -- M src/modules/textops/textops.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1206.patch https://github.com/kamailio/kamailio/pull/1206.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1206

2 2

git:master:8c428bfa: Merge pull request #1206 from codyherzog/master
by GitHub 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 8c428bfae9e51989734d3c1535bcac24581cfe15 URL: https://github.com/kamailio/kamailio/commit/8c428bfae9e51989734d3c1535bcac2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-07T21:56:15+02:00 Merge pull request #1206 from codyherzog/master textops: Fix 'offset exceeds message size' crash. --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/8c428bfae9e51989734d3c1535bcac2… Patch: https://github.com/kamailio/kamailio/commit/8c428bfae9e51989734d3c1535bcac2… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 5048fbae5d..655f638154 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -682,12 +682,19 @@ static int subst_helper_f(sip_msg_t* msg, struct subst_expr* se) int off; int ret; int nmatches; + char c; begin=get_header(msg); /* start after first line to avoid replacing * the uri */ off=begin-msg->buf; ret=-1; - if ((lst=subst_run(se, begin, msg, &nmatches))==0) + + c = msg->buf[msg->len]; + msg->buf[msg->len] = '\0'; + lst=subst_run(se, begin, msg, &nmatches); + msg->buf[msg->len] = c; + + if (lst==0) goto error; /* not found */ for (rpl=lst; rpl; rpl=rpl->next){ LM_DBG("%s: replacing at offset %d [%.*s] with [%.*s]\n", @@ -826,6 +833,7 @@ static int subst_body_helper_f(struct sip_msg* msg, struct subst_expr* se) int ret; int nmatches; str body; + char c; body.s = get_body(msg); if (body.s==0) { @@ -842,7 +850,13 @@ static int subst_body_helper_f(struct sip_msg* msg, struct subst_expr* se) off=begin-msg->buf; ret=-1; - if ((lst=subst_run(se, begin, msg, &nmatches))==0) + + c = body.s[body.len]; + body.s[body.len] = '\0'; + lst=subst_run(se, begin, msg, &nmatches); + body.s[body.len] = c; + + if (lst==0) goto error; /* not found */ for (rpl=lst; rpl; rpl=rpl->next){ LM_DBG("%s replacing at offset %d [%.*s] with [%.*s]\n",

1 0

git:master:25f21809: textops: Fix 'offset exceeds message size' crash.
by codyherzog 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 25f2180999dafb807068313c4a329a163dd99f92 URL: https://github.com/kamailio/kamailio/commit/25f2180999dafb807068313c4a329a1… Author: codyherzog <cherzog(a)intouchhealth.com> Committer: codyherzog <cherzog(a)intouchhealth.com> Date: 2017-08-07T12:46:27-07:00 textops: Fix 'offset exceeds message size' crash. Ensure that buffer is null terminated when subst_run() function is used. --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/25f2180999dafb807068313c4a329a1… Patch: https://github.com/kamailio/kamailio/commit/25f2180999dafb807068313c4a329a1… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 5048fbae5d..655f638154 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -682,12 +682,19 @@ static int subst_helper_f(sip_msg_t* msg, struct subst_expr* se) int off; int ret; int nmatches; + char c; begin=get_header(msg); /* start after first line to avoid replacing * the uri */ off=begin-msg->buf; ret=-1; - if ((lst=subst_run(se, begin, msg, &nmatches))==0) + + c = msg->buf[msg->len]; + msg->buf[msg->len] = '\0'; + lst=subst_run(se, begin, msg, &nmatches); + msg->buf[msg->len] = c; + + if (lst==0) goto error; /* not found */ for (rpl=lst; rpl; rpl=rpl->next){ LM_DBG("%s: replacing at offset %d [%.*s] with [%.*s]\n", @@ -826,6 +833,7 @@ static int subst_body_helper_f(struct sip_msg* msg, struct subst_expr* se) int ret; int nmatches; str body; + char c; body.s = get_body(msg); if (body.s==0) { @@ -842,7 +850,13 @@ static int subst_body_helper_f(struct sip_msg* msg, struct subst_expr* se) off=begin-msg->buf; ret=-1; - if ((lst=subst_run(se, begin, msg, &nmatches))==0) + + c = body.s[body.len]; + body.s[body.len] = '\0'; + lst=subst_run(se, begin, msg, &nmatches); + body.s[body.len] = c; + + if (lst==0) goto error; /* not found */ for (rpl=lst; rpl; rpl=rpl->next){ LM_DBG("%s replacing at offset %d [%.*s] with [%.*s]\n",

1 0

git:master:9ce38204: http_client: proper free for curl params in case of failover connection
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 9ce38204d8a59e5d83cc50a2c809d1306346f9b7 URL: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T14:54:00+02:00 http_client: proper free for curl params in case of failover connection --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… Patch: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 1bdae25df7..ca26998606 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -464,12 +464,15 @@ int curl_get_redirect(struct sip_msg* _m, const str *connection, str* result) /*! Run a query based on a connection definition */ -int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* url, str* result, const char *contenttype, const str* post, int failover) +int curl_con_query_url_f(struct sip_msg* _m, const str *connection, + const str* url, str* result, const char *contenttype, + const str* post, int failover) { curl_con_t *conn = NULL; curl_con_pkg_t *pconn = NULL; char *urlbuf = NULL; char *postdata = NULL; + char *failovercon = NULL; curl_query_t query_params; unsigned int maxdatasize = default_maxdatasize; @@ -495,7 +498,6 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u LM_DBG("******** CURL Connection found %.*s\n", connection->len, connection->s); maxdatasize = conn->maxdatasize; - if (url && (url->len > 0) && (url->s != NULL)) { int url_len = conn->schema.len + 3 + conn->url.len + 1 + url->len + 1; urlbuf = pkg_malloc(url_len); @@ -552,7 +554,10 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u query_params.oneline = 0; query_params.maxdatasize = maxdatasize; query_params.http_proxy_port = conn->http_proxy_port; - query_params.failovercon = conn->failover.s ? as_asciiz(&conn->failover) : NULL; + if(conn->failover.s) { + failovercon = as_asciiz(&conn->failover); + } + query_params.failovercon = failovercon; query_params.pconn = pconn; if (conn->http_proxy) { query_params.http_proxy = conn->http_proxy; @@ -567,14 +572,19 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u int counter = failover + 1; if (counter >= 2) { LM_DBG("**** No more failovers - returning failure\n"); - return (res - 1000); + res = (res - 1000); + goto error; } /* Time for failover */ - return curl_con_query_url_f(_m, &conn->failover, url, result, contenttype, post, counter); + res = curl_con_query_url_f(_m, &conn->failover, url, result, + contenttype, post, counter); } - LM_DBG("***** #### ***** CURL DONE : %s \n", urlbuf); + LM_DBG("***** #### ***** CURL DONE: %s (%d)\n", urlbuf, res); error: + if (failovercon != NULL) { + pkg_free(failovercon); + } if (urlbuf != NULL) { pkg_free(urlbuf); }

1 0

git:master:1948fa53: kamailio.cfg: filter out sip scanner even when anti-flood is not enabled
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 1948fa5312b8ab836ace4ab76a383ed29b049ae6 URL: https://github.com/kamailio/kamailio/commit/1948fa5312b8ab836ace4ab76a383ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T14:21:08+02:00 kamailio.cfg: filter out sip scanner even when anti-flood is not enabled - better protection with default installation --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/1948fa5312b8ab836ace4ab76a383ed… Patch: https://github.com/kamailio/kamailio/commit/1948fa5312b8ab836ace4ab76a383ed… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index bce9d41a7e..067f0f680e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -562,12 +562,12 @@ route[REQINIT] { exit; } } - if($ua =~ "friendly-scanner|sipcli") { +#!endif + if($ua =~ "friendly-scanner|sipcli|VaxSIPUserAgent") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit; } -#!endif if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops");

1 0

git:master:37830f53: topos: use branch attributes to handle PRACK
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 37830f53b1f21fba5beef5d8e22913c431dcd708 URL: https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5d8e22913c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T13:52:45+02:00 topos: use branch attributes to handle PRACK --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5d8e22913c… Patch: https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5d8e22913c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 37b075ae94..23cfb07412 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -735,6 +735,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) str nuri; uint32_t direction = TPS_DIR_DOWNSTREAM; int ret; + int use_branch = 0; LM_DBG("handling incoming request\n"); @@ -761,8 +762,15 @@ int tps_request_received(sip_msg_t *msg, int dialog) tps_storage_lock_get(&lkey); - if(tps_storage_load_dialog(msg, &mtsd, &stsd)<0) { - goto error; + if((get_cseq(msg)->method_id)&(METHOD_PRACK)) { + if(tps_storage_load_branch(msg, &mtsd, &stsd)<0) { + goto error; + } + use_branch = 1; + } else { + if(tps_storage_load_dialog(msg, &mtsd, &stsd)<0) { + goto error; + } } /* detect direction - via from-tag */ @@ -791,14 +799,28 @@ int tps_request_received(sip_msg_t *msg, int dialog) return -1; } if(direction == TPS_DIR_UPSTREAM) { - if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0)<0) { - LM_ERR("failed to reappend a-route\n"); - return -1; + if(use_branch) { + if(tps_reappend_route(msg, &stsd, &stsd.x_rr, 0)<0) { + LM_ERR("failed to reappend x-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0)<0) { + LM_ERR("failed to reappend a-route\n"); + return -1; + } } } else { - if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { - LM_ERR("failed to reappend b-route\n"); - return -1; + if(use_branch) { + if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1)<0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } } } if(dialog!=0) {

1 0

git:master:8be0f000: tm: cleaner handling of dynamic regex param for t_check_status()
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 8be0f000f74cf08e0be6bc7d0a72cae948483416 URL: https://github.com/kamailio/kamailio/commit/8be0f000f74cf08e0be6bc7d0a72cae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T13:39:38+02:00 tm: cleaner handling of dynamic regex param for t_check_status() --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/8be0f000f74cf08e0be6bc7d0a72cae… Patch: https://github.com/kamailio/kamailio/commit/8be0f000f74cf08e0be6bc7d0a72cae… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 5adef0f02f..68071c3fe4 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -862,6 +862,7 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) char backup; int lowest_status, n, ret; fparam_t* fp; + regex_t* re0 = NULL; regex_t* re = NULL; str tmp; @@ -892,17 +893,18 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) memcpy(s, tmp.s, tmp.len); s[tmp.len] = '\0'; - if ((re = pkg_malloc(sizeof(regex_t))) == 0) { + if ((re0 = pkg_malloc(sizeof(regex_t))) == 0) { LM_ERR("No memory left\n"); goto error; } - if (regcomp(re, s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { + if (regcomp(re0, s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { LM_ERR("Bad regular expression '%s'\n", s); - pkg_free(re); - re = NULL; + pkg_free(re0); + re0 = NULL; goto error; } + re = re0; break; } @@ -953,9 +955,9 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) if (backup) status[msg->first_line.u.reply.status.len] = backup; if (s) pkg_free(s); - if (fp->type != FPARAM_REGEX) { - regfree(re); - pkg_free(re); + if (re0) { + regfree(re0); + pkg_free(re0); } if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ @@ -975,9 +977,9 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) set_t(T_UNDEFINED, T_BR_UNDEFINED); } if (s) pkg_free(s); - if ((fp->type != FPARAM_REGEX) && re) { - regfree(re); - pkg_free(re); + if (re0) { + regfree(re0); + pkg_free(re0); } return -1; }

1 0

git:master:72e0ebcd: ctl: proper handling of realloc failure to avoid leak
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 72e0ebcdcbc5ffcd7ea475334437e56b22e143d4 URL: https://github.com/kamailio/kamailio/commit/72e0ebcdcbc5ffcd7ea475334437e56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T13:33:46+02:00 ctl: proper handling of realloc failure to avoid leak --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/72e0ebcdcbc5ffcd7ea475334437e56… Patch: https://github.com/kamailio/kamailio/commit/72e0ebcdcbc5ffcd7ea475334437e56… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index a84073a802..18122bfcef 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -1277,6 +1277,7 @@ static int rpc_rpl_printf(rpc_ctx_t* ctx, char* fmt, ...) { int n, buf_size; char* buf; + char* buf0; va_list ap; str s; struct text_chunk* l; @@ -1287,7 +1288,7 @@ static int rpc_rpl_printf(rpc_ctx_t* ctx, char* fmt, ...) ERR("No memory left\n"); return -1; } - + buf_size = RPC_BUF_SIZE; while (1) { /* Try to print in the allocated space. */ @@ -1314,11 +1315,12 @@ static int rpc_rpl_printf(rpc_ctx_t* ctx, char* fmt, ...) } else { /* glibc 2.0 */ buf_size *= 2; /* twice the old size */ } - if ((buf = ctl_realloc(buf, buf_size)) == 0) { + if ((buf0 = ctl_realloc(buf, buf_size)) == 0) { rpc_fault(ctx, 500, "Internal Server Error (No memory left)"); ERR("No memory left\n"); goto err; } + buf = buf0; } return 0; err:

1 0

git:master:91ebd257: path: fix for handling received parameter, issue added by format support
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 91ebd25726c7f4b8870e8934d60cdc7cb90d1970 URL: https://github.com/kamailio/kamailio/commit/91ebd25726c7f4b8870e8934d60cdc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T12:23:18+02:00 path: fix for handling received parameter, issue added by format support - reported by GH #1205 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/91ebd25726c7f4b8870e8934d60cdc7… Patch: https://github.com/kamailio/kamailio/commit/91ebd25726c7f4b8870e8934d60cdc7…

1 0

git:master:5f0792e7: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 5f0792e7ee985b80601e6f952269bc48031e6356 URL: https://github.com/kamailio/kamailio/commit/5f0792e7ee985b80601e6f952269bc4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-07T11:31:22+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/5f0792e7ee985b80601e6f952269bc4… Patch: https://github.com/kamailio/kamailio/commit/5f0792e7ee985b80601e6f952269bc4… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 3e42389014..cf4bce61f6 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -32,6 +32,11 @@ Daniel-Constantin Mierla 3.5. branch_expire (int) 3.6. dialog_expire (int) 3.7. clean_interval (int) + 3.8. event_callback (str) + + 4. Event Routes + + 4.1. event_route[topos:msg-outgoing] List of Examples @@ -42,6 +47,8 @@ Daniel-Constantin Mierla 1.5. Set branch_expire parameter 1.6. Set dialog_expire parameter 1.7. Set clean_interval parameter + 1.8. Set event_callback parameter + 1.9. Usage of event_route[topos:msg-outgoing] Chapter 1. Admin Guide @@ -62,6 +69,11 @@ Chapter 1. Admin Guide 3.5. branch_expire (int) 3.6. dialog_expire (int) 3.7. clean_interval (int) + 3.8. event_callback (str) + + 4. Event Routes + + 4.1. event_route[topos:msg-outgoing] 1. Overview @@ -102,6 +114,7 @@ Chapter 1. Admin Guide 3.5. branch_expire (int) 3.6. dialog_expire (int) 3.7. clean_interval (int) + 3.8. event_callback (str) 3.1. storage (str) @@ -188,3 +201,49 @@ modparam("topos", "dialog_expire", 3600) ... modparam("topos", "clean_interval", 30) ... + +3.8. event_callback (str) + + The name of the function in the KEMI configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead of + event_route[...] blocks. + + The function receives a string parameter with the name of the event. + + Default value is 'empty' (no function is executed for events). + + Example 1.8. Set event_callback parameter +... +modparam("topos", "event_callback", "ksr_topos_event") +... +-- event callback function implemented in Lua +function ksr_topos_event(evname) + KSR.info("===== topos module triggered event: " .. evname .. "\n"); + return 1; +end +... + +4. Event Routes + + 4.1. event_route[topos:msg-outgoing] + +4.1. event_route[topos:msg-outgoing] + + It is executed before doing topology stripping processing for an + outgoing SIP message. If 'drop' is executed inside the event route, + then the module skips doing the topology hiding. + + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is not the one + to be sent out, but an internally generated one at startup, to avoid + reparsing the outgoing SIP message for the cases when topology hiding + is not wanted. + + Example 1.9. Usage of event_route[topos:msg-outgoing] +... +event_route[topos:msg-outgoing] { + if($sndto(ip)=="10.1.1.10") { + drop; + } +} +...

1 0

git:master:f6dc8715: topos: docs for event_callback param and event_route[topos:msg-outgoing]
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: f6dc87151138e600d593a345109ba2028d2dc16f URL: https://github.com/kamailio/kamailio/commit/f6dc87151138e600d593a345109ba20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T11:23:53+02:00 topos: docs for event_callback param and event_route[topos:msg-outgoing] --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f6dc87151138e600d593a345109ba20… Patch: https://github.com/kamailio/kamailio/commit/f6dc87151138e600d593a345109ba20… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 77de4b8cbd..bda8ab766d 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -223,7 +223,66 @@ modparam("topos", "clean_interval", 30) </programlisting> </example> </section> - + <section id="topos.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the KEMI configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks. + </para> + <para> + The function receives a string parameter with the name of the event. + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "event_callback", "ksr_topos_event") +... +-- event callback function implemented in Lua +function ksr_topos_event(evname) + KSR.info("===== topos module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> + </section> + <section> + <title>Event Routes</title> + <section> + <title>event_route[topos:msg-outgoing]</title> + <para> + It is executed before doing topology stripping processing for an outgoing + SIP message. If 'drop' is executed inside the event route, then the + module skips doing the topology hiding. + </para> + <para> + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is not the one + to be sent out, but an internally generated one at startup, to avoid + reparsing the outgoing SIP message for the cases when topology hiding + is not wanted. + </para> + <example> + <title>Usage of event_route[topos:msg-outgoing]</title> + <programlisting format="linespecific"> +... +event_route[topos:msg-outgoing] { + if($sndto(ip)=="10.1.1.10") { + drop; + } +} +... +</programlisting> + </example> + </section> </section> </chapter>

1 0

git:master:f16c0433: topos: added support for event_route[topos:msg-outgoing]
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: f16c0433e0190736b16d8346d1521e3c32b2e219 URL: https://github.com/kamailio/kamailio/commit/f16c0433e0190736b16d8346d1521e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T11:15:33+02:00 topos: added support for event_route[topos:msg-outgoing] - executed when a request is sent out - if drop() is used inside the event_route, then the request is no longer handled with topos --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f16c0433e0190736b16d8346d1521e3… Patch: https://github.com/kamailio/kamailio/commit/f16c0433e0190736b16d8346d1521e3… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 0141c0f2c3..4ed2628291 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -50,6 +50,9 @@ #include "../../core/parser/parse_to.h" #include "../../core/parser/parse_from.h" #include "../../core/timer_proc.h" +#include "../../core/fmsg.h" +#include "../../core/onsend.h" +#include "../../core/kemi.h" #include "../../lib/srdb1/db.h" #include "../../lib/srutils/sruid.h" @@ -81,11 +84,17 @@ extern int _tps_dialog_expire; int _tps_clean_interval = 60; +static int _tps_eventrt_outgoing = -1; +static str _tps_eventrt_callback = STR_NULL; +static str _tps_eventrt_name = str_init("topos:msg-outgoing"); + sanity_api_t scb; int tps_msg_received(sr_event_param_t *evp); int tps_msg_sent(sr_event_param_t *evp); +static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp); + /** module functions */ /* Module init function prototype */ static int mod_init(void); @@ -111,6 +120,7 @@ static param_export_t params[]={ {"branch_expire", PARAM_INT, &_tps_branch_expire}, {"dialog_expire", PARAM_INT, &_tps_dialog_expire}, {"clean_interval", PARAM_INT, &_tps_clean_interval}, + {"event_callback", PARAM_STR, &_tps_eventrt_callback}, {0,0,0} }; @@ -136,6 +146,17 @@ struct module_exports exports= { */ static int mod_init(void) { + _tps_eventrt_outgoing = route_lookup(&event_rt, _tps_eventrt_name.s); + if(_tps_eventrt_outgoing<0 + || event_rt.rlist[_tps_eventrt_outgoing]==NULL) { + _tps_eventrt_outgoing = -1; + } + + if(faked_msg_init()<0) { + LM_ERR("failed to init fmsg\n"); + return -1; + } + if(_tps_storage.len==2 && strncmp(_tps_storage.s, "db", 2)==0) { /* Find a database module */ if (db_bind_mod(&_tps_db_url, &_tpsdbf)) { @@ -352,6 +373,11 @@ int tps_msg_sent(sr_event_param_t *evp) int local; obuf = (str*)evp->data; + + if(tps_execute_event_route(NULL, evp)==1) { + return 0; + } + memset(&msg, 0, sizeof(sip_msg_t)); msg.buf = obuf->s; msg.len = obuf->len; @@ -408,6 +434,76 @@ int tps_get_branch_expire(void) /** * */ +static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) +{ + struct sip_msg *fmsg; + struct run_act_ctx ctx; + int rtb; + sr_kemi_eng_t *keng = NULL; + struct onsend_info onsnd_info = {0}; + + if(_tps_eventrt_outgoing<0) { + if(_tps_eventrt_callback.s!=NULL || _tps_eventrt_callback.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + _tps_eventrt_callback.s); + goto done; + } + } + } + + if(_tps_eventrt_outgoing<0 && keng==NULL) { + return 0; + } + + LM_DBG("executing event_route[topos:...] (%d)\n", + _tps_eventrt_outgoing); + fmsg = faked_msg_next(); + + onsnd_info.to = &evp->dst->to; + onsnd_info.send_sock = evp->dst->send_sock; + if(msg!=NULL) { + onsnd_info.buf = msg->buf; + onsnd_info.len = msg->len; + onsnd_info.msg = msg; + } else { + onsnd_info.buf = fmsg->buf; + onsnd_info.len = fmsg->len; + onsnd_info.msg = fmsg; + } + p_onsend = &onsnd_info; + + rtb = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + if(_tps_eventrt_outgoing>=0) { + run_top_route(event_rt.rlist[_tps_eventrt_outgoing], fmsg, &ctx); + } else { + if(keng!=NULL) { + if(keng->froute(fmsg, EVENT_ROUTE, + &_tps_eventrt_callback, &_tps_eventrt_name)<0) { + LM_ERR("error running event route kemi callback\n"); + p_onsend=NULL; + return -1; + } + } + } + set_route_type(rtb); + if(ctx.run_flags&DROP_R_F) { + LM_DBG("exit due to 'drop' in event route\n"); + p_onsend=NULL; + return 1; + } + +done: + p_onsend=NULL; + return 0; +} + +/** + * + */ int bind_topos(topos_api_t *api) { if (!api) { @@ -420,4 +516,4 @@ int bind_topos(topos_api_t *api) api->get_branch_expire = tps_get_branch_expire; return 0; -} +} \ No newline at end of file

1 0

git:master:f6b8bd17: core: parser - converted old log macros
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: f6b8bd17f167c0527fb240a9de71539e29b85f07 URL: https://github.com/kamailio/kamailio/commit/f6b8bd17f167c0527fb240a9de71539… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T09:16:15+02:00 core: parser - converted old log macros - indentation adjustments --- Modified: src/core/parser/hf.c Modified: src/core/parser/parse_allow.c Modified: src/core/parser/parse_content.c Modified: src/core/parser/parse_date.c Modified: src/core/parser/parse_event.c Modified: src/core/parser/parse_expires.c Modified: src/core/parser/parse_identity.c Modified: src/core/parser/parse_identityinfo.c Modified: src/core/parser/parse_methods.c Modified: src/core/parser/parse_refer_to.c Modified: src/core/parser/parse_retry_after.c Modified: src/core/parser/parse_rr.c Modified: src/core/parser/parse_sipifmatch.c Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/f6b8bd17f167c0527fb240a9de71539… Patch: https://github.com/kamailio/kamailio/commit/f6b8bd17f167c0527fb240a9de71539…

1 0

TOPOS on Edge-Proxy / Proxy-CSCF
by Carsten Bock 07 Aug '17

07 Aug '17

Hi, I think, I found one issue with Daniel's new (great) TOPOS module: I've configured it on my Edge-Proxy (aka. Proxy-CSCF) as a replacement for an SBC and I ran into a strange issue. Everything works fine, except in one Scenario: Both A and B Party are registered using the same Proxy, so TOPOS is triggered twice: On the originating Leg and on the terminating Leg. It works properly, if I'm just having one Leg on the Proxy (either because it's going to/coming from the Breakout Gateway or because the B-Party registered using a different Proxy). It appears to happen only, if the B-Party has a public IP, if no NAT involved (Wtf?!?), it actually happened initially when I called my mother. I've looked through the source-code but couldn't find a proper solution. Anyone an idea? Thanks, Carsten P.S: Please find attached a full trace of such call and the according database entries -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Millerntorplatz 1 20359 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Office +49 40 5247593-40 Fax +49 40 5247593-99 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/

2 1

git:master:31726783: core: parse uri - converted log macros
by Daniel-Constantin Mierla 06 Aug '17

06 Aug '17

Module: kamailio Branch: master Commit: 31726783dfba54c7c84b680ddd0bae879c0ee9d3 URL: https://github.com/kamailio/kamailio/commit/31726783dfba54c7c84b680ddd0bae8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-06T09:06:08+02:00 core: parse uri - converted log macros --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/31726783dfba54c7c84b680ddd0bae8… Patch: https://github.com/kamailio/kamailio/commit/31726783dfba54c7c84b680ddd0bae8…

1 0

git:master:475ef89d: tls: updated log macros for config code
by Daniel-Constantin Mierla 05 Aug '17

05 Aug '17

Module: kamailio Branch: master Commit: 475ef89d6fc5780673c7e0091a78036e74f819db URL: https://github.com/kamailio/kamailio/commit/475ef89d6fc5780673c7e0091a78036… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-05T09:45:18+02:00 tls: updated log macros for config code --- Modified: src/modules/tls/tls_config.c --- Diff: https://github.com/kamailio/kamailio/commit/475ef89d6fc5780673c7e0091a78036… Patch: https://github.com/kamailio/kamailio/commit/475ef89d6fc5780673c7e0091a78036…

1 0

git:master:20af8da0: modules: readme files regenerated - websocket ... [skip ci]
by Kamailio Dev 04 Aug '17

04 Aug '17

Module: kamailio Branch: master Commit: 20af8da05513345ccb3d372e097c71a115ebe5a7 URL: https://github.com/kamailio/kamailio/commit/20af8da05513345ccb3d372e097c71a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-04T15:16:23+02:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/20af8da05513345ccb3d372e097c71a… Patch: https://github.com/kamailio/kamailio/commit/20af8da05513345ccb3d372e097c71a… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 3541db94fb..158248654a 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -33,6 +33,7 @@ Peter Dunkley 4.6. sub_protocols (integer) 4.7. cors_mode (integer) 4.8. verbose_list (int) + 4.9. event_callback (str) 5. Functions @@ -68,10 +69,11 @@ Peter Dunkley 1.8. Set sub_protocols parameter 1.9. Set cors_mode parameter 1.10. Set verbose_list parameter - 1.11. ws_handle_handshake usage - 1.12. ws_close usage - 1.13. event_route[websocket:closed] usage - 1.14. $ws_conid usage + 1.11. Set event_callback parameter + 1.12. ws_handle_handshake usage + 1.13. ws_close usage + 1.14. event_route[websocket:closed] usage + 1.15. $ws_conid usage Chapter 1. Admin Guide @@ -99,6 +101,7 @@ Chapter 1. Admin Guide 4.6. sub_protocols (integer) 4.7. cors_mode (integer) 4.8. verbose_list (int) + 4.9. event_callback (str) 5. Functions @@ -341,6 +344,7 @@ onreply_route[WS_REPLY] { 4.6. sub_protocols (integer) 4.7. cors_mode (integer) 4.8. verbose_list (int) + 4.9. event_callback (str) 4.1. keepalive_mechanism (integer) @@ -457,6 +461,28 @@ modparam("websocket", "cors_mode", 2) modparam("websocket", "verbose_list", 1) ... +4.9. event_callback (str) + + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead of + event_route[...] blocks specific for websocket module. + + The function has one string parameter, the value is the name of the + event_route block, respectively "websocket:closed". + + Default value is 'empty' (no function is executed for events). + + Example 1.11. Set event_callback parameter +... +modparam("websocket", "event_callback", "ksr_websocket_event") +... +-- event callback function implemented in Lua +function ksr_websocket_event(evname) + KSR.info("===== websocket module triggered event: " .. evname .. "\n"); + return 1; +end +... + 5. Functions 5.1. ws_handle_handshake() @@ -476,7 +502,7 @@ Note This function returns 0, stopping all further processing of the request, when there is a problem. - Example 1.11. ws_handle_handshake usage + Example 1.12. ws_handle_handshake usage ... ws_handle_handshake(); ... @@ -501,7 +527,7 @@ Note This function can be used from ANY_ROUTE. - Example 1.12. ws_close usage + Example 1.13. ws_close usage ... ws_close(4000, "Because I say so"); ... @@ -615,7 +641,7 @@ kamcmd ws.enable connection closes. The connection may be identified using the the $si and $sp pseudo-variables. - Example 1.13. event_route[websocket:closed] usage + Example 1.14. event_route[websocket:closed] usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection from $si:$sp has closed\n"); @@ -631,7 +657,7 @@ event_route[websocket:closed] { Connection id of closed websocket connection. Can only be used in websocket:closed event route. - Example 1.14. $ws_conid usage + Example 1.15. $ws_conid usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection with id $ws_conid has closed\n");

1 0

git:master:921c2f6a: websocket: documentation for event_callback parameter
by Daniel-Constantin Mierla 04 Aug '17

04 Aug '17

Module: kamailio Branch: master Commit: 921c2f6a53108ac4ddc3e262a479a46650412bce URL: https://github.com/kamailio/kamailio/commit/921c2f6a53108ac4ddc3e262a479a46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T15:10:50+02:00 websocket: documentation for event_callback parameter --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/921c2f6a53108ac4ddc3e262a479a46… Patch: https://github.com/kamailio/kamailio/commit/921c2f6a53108ac4ddc3e262a479a46… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index c887c05158..055498862e 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -445,6 +445,37 @@ modparam("websocket", "verbose_list", 1) </programlisting> </example> </section> + <section id="websocket.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks specific for websocket module. + </para> + <para> + The function has one string parameter, the value is the name of + the event_route block, respectively "websocket:closed". + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("websocket", "event_callback", "ksr_websocket_event") +... +-- event callback function implemented in Lua +function ksr_websocket_event(evname) + KSR.info("===== websocket module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> </section>

1 0

git:master:e15f8d34: websocket: new parameter event_callback
by Daniel-Constantin Mierla 04 Aug '17

04 Aug '17

Module: kamailio Branch: master Commit: e15f8d34c5cdf83e0b3560873cd5909de99d3f97 URL: https://github.com/kamailio/kamailio/commit/e15f8d34c5cdf83e0b3560873cd5909… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T15:06:09+02:00 websocket: new parameter event_callback - allow setting the name of kemi function to be executed for event_route --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/e15f8d34c5cdf83e0b3560873cd5909… Patch: https://github.com/kamailio/kamailio/commit/e15f8d34c5cdf83e0b3560873cd5909… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index ec2833d839..b7c6e5e1fb 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -70,6 +70,8 @@ static int ws_keepalive_processes = DEFAULT_KEEPALIVE_PROCESSES; int ws_verbose_list = 0; +str ws_event_callback = STR_NULL; + static cmd_export_t cmds[] = { /* ws_frame.c */ { "ws_close", (cmd_function)w_ws_close0, @@ -105,6 +107,8 @@ static param_export_t params[] = { { "keepalive_processes", INT_PARAM, &ws_keepalive_processes }, { "verbose_list", PARAM_INT, &ws_verbose_list }, + { "event_callback", PARAM_STR, &ws_event_callback}, + { 0, 0, 0 } }; diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 3fd9207dcf..9fedf33f7b 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -29,6 +29,7 @@ #include "../../core/tcp_conn.h" #include "../../core/fmsg.h" #include "../../core/counters.h" +#include "../../core/kemi.h" #include "../../core/mem/mem.h" #include "ws_conn.h" #include "websocket.h" @@ -37,6 +38,7 @@ #define MAX_WS_CONNS_DUMP 50 extern int ws_verbose_list; +extern str ws_event_callback; ws_connection_t **wsconn_id_hash = NULL; #define wsconn_listadd tcpconn_listadd @@ -276,14 +278,25 @@ static void wsconn_run_route(ws_connection_t *wsc) int rt, backup_rt; struct run_act_ctx ctx; sip_msg_t *fmsg; + sr_kemi_eng_t *keng = NULL; + str evrtname = str_init("websocket:closed"); LM_DBG("wsconn_run_route event_route[websocket:closed]\n"); - rt = route_lookup(&event_rt, "websocket:closed"); + rt = route_lookup(&event_rt, evrtname.s); if (rt < 0 || event_rt.rlist[rt] == NULL) { - LM_DBG("route does not exist"); - return; + if(ws_event_callback.len<=0 || ws_event_callback.s==NULL) { + LM_DBG("event route does not exist"); + return; + } + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event route callback engine does not exist"); + return; + } else { + rt = -1; + } } if (faked_msg_init() < 0) @@ -297,9 +310,18 @@ static void wsconn_run_route(ws_connection_t *wsc) fmsg->rcv = wsc->rcv; backup_rt = get_route_type(); - set_route_type(REQUEST_ROUTE); + set_route_type(EVENT_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); + if(rt<0) { + /* kemi script event route callback */ + if(keng && keng->froute(fmsg, EVENT_ROUTE, + &ws_event_callback, &evrtname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } else { + /* native cfg event route */ + run_top_route(event_rt.rlist[rt], fmsg, 0); + } set_route_type(backup_rt); }

1 0

git:master:6752351b: websocket: use route_lookup() instead of route_get()
by Daniel-Constantin Mierla 04 Aug '17

04 Aug '17

Module: kamailio Branch: master Commit: 6752351b69cd991cd11f389f80cf73bd68ff5bb9 URL: https://github.com/kamailio/kamailio/commit/6752351b69cd991cd11f389f80cf73b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T14:36:42+02:00 websocket: use route_lookup() instead of route_get() - avoid creating an empty route block structure if not defined in cfg --- Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/6752351b69cd991cd11f389f80cf73b… Patch: https://github.com/kamailio/kamailio/commit/6752351b69cd991cd11f389f80cf73b… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index ad3d216a83..3fd9207dcf 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -279,7 +279,7 @@ static void wsconn_run_route(ws_connection_t *wsc) LM_DBG("wsconn_run_route event_route[websocket:closed]\n"); - rt = route_get(&event_rt, "websocket:closed"); + rt = route_lookup(&event_rt, "websocket:closed"); if (rt < 0 || event_rt.rlist[rt] == NULL) { LM_DBG("route does not exist"); @@ -291,7 +291,7 @@ static void wsconn_run_route(ws_connection_t *wsc) LM_ERR("faked_msg_init() failed\n"); return; } - + fmsg = faked_msg_next(); wsc->rcv.proto_reserved1 = wsc->id; fmsg->rcv = wsc->rcv;

1 0

git:master:1c7fc2fe: misc/examples/kemi: fixed setting the failure route callback
by Daniel-Constantin Mierla 04 Aug '17

04 Aug '17

Module: kamailio Branch: master Commit: 1c7fc2feccba9ae1ad1f97e6fdd296f83dd5b097 URL: https://github.com/kamailio/kamailio/commit/1c7fc2feccba9ae1ad1f97e6fdd296f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T13:50:32+02:00 misc/examples/kemi: fixed setting the failure route callback --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi-python.py Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/1c7fc2feccba9ae1ad1f97e6fdd296f… Patch: https://github.com/kamailio/kamailio/commit/1c7fc2feccba9ae1ad1f97e6fdd296f… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 3d434893b4..5a051ad19f 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -102,7 +102,7 @@ function ksr_route_relay() if (METHOD=="INVITE") { if (KSR.tm.t_is_set("failure_route")<0) { - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); } } diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index 6a1b8d1f44..e92f4ec995 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -104,7 +104,7 @@ function ksr_route_relay() if KSR.pv.get("$rm")=="INVITE" then if KSR.tm.t_is_set("failure_route")<0 then - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); end end diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 00b9bfa9f9..fa3c4707d6 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -131,7 +131,7 @@ def ksr_route_relay(self, msg): if KSR.pv.get("$rm")=="INVITE" : if KSR.tm.t_is_set("failure_route")<0 : - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); if KSR.tm.t_relay()<0 : KSR.sl.sl_reply_error(); diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index 2e4d44f4fc..9bf6c81f7a 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -105,7 +105,7 @@ function ksr_route_relay() if (METHOD=="INVITE") { if (KSR.tm.t_is_set("failure_route")<0) { - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); } }

1 0

git:master:61d72c90: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 61d72c90a1a3fe34aad3cedb87a3e68529be34ac URL: https://github.com/kamailio/kamailio/commit/61d72c90a1a3fe34aad3cedb87a3e68… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-03T21:31:22+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/61d72c90a1a3fe34aad3cedb87a3e68… Patch: https://github.com/kamailio/kamailio/commit/61d72c90a1a3fe34aad3cedb87a3e68… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 4be5d66028..6c35f29858 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -911,6 +911,10 @@ end For example, 100 calls in 3-hosts group with rweight params 1/2/1 will be distributed as 25/50/25. After third host failing distribution will be changed to 33/67/0. + + “12” - dispatch to all destination in setid at once (parallel + forking). Note that the AVPs are no longer set with the values + of the destination records, no re-routing making sense in this + case. + “X” - if the algorithm is not implemented, the first entry in set is chosen. * limit - the maximum number of items to be stored in AVP list for

1 0

git:master:e84ee3be: dispatcher: documentation for parallel dispatching algorithm
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: e84ee3becbf59a5afc63510596cd62bae36d1962 URL: https://github.com/kamailio/kamailio/commit/e84ee3becbf59a5afc63510596cd62b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T19:05:59+02:00 dispatcher: documentation for parallel dispatching algorithm --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e84ee3becbf59a5afc63510596cd62b… Patch: https://github.com/kamailio/kamailio/commit/e84ee3becbf59a5afc63510596cd62b… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b5315acc2d..a0d35eec8a 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1040,6 +1040,14 @@ end </listitem> <listitem> <para> + <quote>12</quote> - dispatch to all destination in setid at + once (parallel forking). Note that the AVPs are no longer set + with the values of the destination records, no re-routing + making sense in this case. + </para> + </listitem> + <listitem> + <para> <quote>X</quote> - if the algorithm is not implemented, the first entry in set is chosen. </para>

1 0

git:master:2ce57c44: dispatcher: new algorithm - parallel dispatching (12)
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 2ce57c44fee4eef112163e5dd6c712a0c68c79af URL: https://github.com/kamailio/kamailio/commit/2ce57c44fee4eef112163e5dd6c712a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T19:05:59+02:00 dispatcher: new algorithm - parallel dispatching (12) - send the request to all destinations from the setid at once - aka parallel forking to all address, so the AVPs are no longer set, not being needed for a re-routing --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/2ce57c44fee4eef112163e5dd6c712a… Patch: https://github.com/kamailio/kamailio/commit/2ce57c44fee4eef112163e5dd6c712a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 90d670d8b7..0acf264618 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -75,6 +75,7 @@ #define DS_ALG_WEIGHT 9 #define DS_ALG_CALLLOAD 10 #define DS_ALG_RELWEIGHT 11 +#define DS_ALG_PARALLEL 12 static int _ds_table_version = DS_TABLE_VERSION; @@ -1693,6 +1694,86 @@ static inline int ds_update_dst( /** * */ +int ds_add_branches(sip_msg_t *msg, ds_set_t *idx, unsigned int hash, int mode) +{ + unsigned int i = 0; + str ruri = STR_NULL; + sip_uri_t *puri = NULL; + char buri[MAX_URI_SIZE]; + + if(hash+1>=idx->nr) { + /* nothing to add */ + return 0; + } + + if(mode==1) { + /* ruri updates */ + LM_DBG("adding branches with ruri\n"); + if(parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse sip msg uri\n"); + return -1; + } + puri = &msg->parsed_uri; + } else { + /* duri updates */ + LM_DBG("adding branches with duri\n"); + } + for(i=hash+1; i<idx->nr; i++) { + if(mode==1) { + /* ruri updates */ + if(puri->user.len<=0) { + /* no username to preserve */ + if(append_branch(msg, &idx->dlist[i].uri, NULL, NULL, + Q_UNSPECIFIED, 0, idx->dlist[i].sock, NULL, 0, + NULL, NULL)<0) { + LM_ERR("failed to add branch with ruri\n"); + return -1; + } + } else { + /* new uri from ruri username and dispatcher uri */ + if(idx->dlist[i].uri.len<6) { + LM_WARN("invalid dispatcher uri - skipping (%u)\n", i); + continue; + } + if(strncmp(idx->dlist[i].uri.s, "sips:", 5)==0) { + ruri.len = snprintf(buri, MAX_URI_SIZE, "sips:%.*s@%.*s", + puri->user.len, puri->user.s, + idx->dlist[i].uri.len-5, idx->dlist[i].uri.s+5); + } else { + if(strncmp(idx->dlist[i].uri.s, "sip:", 4)==0) { + ruri.len = snprintf(buri, MAX_URI_SIZE, "sip:%.*s@%.*s", + puri->user.len, puri->user.s, + idx->dlist[i].uri.len-4, idx->dlist[i].uri.s+4); + } else { + LM_WARN("unsupported protocol schema - ignoring\n"); + continue; + } + } + ruri.s = buri; + if(append_branch(msg, &ruri, NULL, NULL, + Q_UNSPECIFIED, 0, idx->dlist[i].sock, NULL, 0, + NULL, NULL)<0) { + LM_ERR("failed to add branch with user ruri\n"); + return -1; + } + } + } else { + /* duri updates */ + if(append_branch(msg, GET_RURI(msg), &idx->dlist[i].uri, NULL, + Q_UNSPECIFIED, 0, idx->dlist[i].sock, NULL, 0, + NULL, NULL)<0) { + LM_ERR("failed to add branch with duri\n"); + return -1; + } + } + + } + return 0; +} + +/** + * + */ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) { return ds_select_dst_limit(msg, set, alg, 0, mode); @@ -1839,6 +1920,9 @@ int ds_select_dst_limit( hash = idx->rwlist[idx->rwlast]; idx->rwlast = (idx->rwlast + 1) % 100; break; + case DS_ALG_PARALLEL: /* 12 - parallel dispatching */ + hash = 0; + break; default: LM_WARN("algo %d not implemented - using first entry...\n", alg); hash = 0; @@ -1887,6 +1971,15 @@ int ds_select_dst_limit( LM_DBG("selected [%d-%d/%d] <%.*s>\n", alg, set, hash, idx->dlist[hash].uri.len, idx->dlist[hash].uri.s); + if(alg == DS_ALG_PARALLEL) { + if(ds_add_branches(msg, idx, hash, mode)<0) { + LM_ERR("failed to add additional branches\n"); + /* one destination was already set - return success anyhow */ + return 2; + } + return 1; + } + if(!(ds_flags & DS_FAILOVER_ON)) return 1;

1 0

git:master:d58fdb7c: p_usrloc: fix dereference before null check in code path
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: d58fdb7c4e2e96a1bb2c64a47cc2b17e4bd03b4e URL: https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: fix dereference before null check in code path --- Modified: src/modules/p_usrloc/ul_db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17… Patch: https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17… --- diff --git a/src/modules/p_usrloc/ul_db_query.c b/src/modules/p_usrloc/ul_db_query.c index 6185e35d2f..eff45a07e1 100644 --- a/src/modules/p_usrloc/ul_db_query.c +++ b/src/modules/p_usrloc/ul_db_query.c @@ -37,13 +37,15 @@ int db_query(ul_db_handle_t * handle, db1_con_t *** _r_h, db_func_t ** _r_f, int i; int err[DB_NUM]; int ret = -1; - order_dbs(handle, order); - memset(err, 0 , sizeof(int) * DB_NUM); if(!handle || !table || !table->s || !_r_h) { LM_ERR("NULL pointer in parameter.\n"); return -1; } + + order_dbs(handle, order); + memset(err, 0 , sizeof(int) * DB_NUM); + i = 0; do { LM_DBG("now trying id %i, db %i.\n", handle->id, handle->db[order[i]].no);

1 0

git:master:f567695d: p_usrloc: remove unnecessary increment
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: f567695de9ecbb5a5bffe4e212a294df2753a519 URL: https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294d… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: remove unnecessary increment --- Modified: src/modules/p_usrloc/ul_db_watch.c --- Diff: https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294d… Patch: https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294d… --- diff --git a/src/modules/p_usrloc/ul_db_watch.c b/src/modules/p_usrloc/ul_db_watch.c index 903abb0b39..d736f942c9 100644 --- a/src/modules/p_usrloc/ul_db_watch.c +++ b/src/modules/p_usrloc/ul_db_watch.c @@ -145,7 +145,6 @@ void check_dbs(unsigned int ticks, void *param){ ul_db_check(handles->handle); } tmp = tmp->next; - i++; } lock_release(list_lock); }

1 0

git:master:3c9b1d30: p_usrloc: eliminate unused code
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 3c9b1d30f5350973bb6063ca207a3f0145f73ec5 URL: https://github.com/kamailio/kamailio/commit/3c9b1d30f5350973bb6063ca207a3f0… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: eliminate unused code --- Modified: src/modules/p_usrloc/ul_db_handle.c Modified: src/modules/p_usrloc/ul_db_handle.h --- Diff: https://github.com/kamailio/kamailio/commit/3c9b1d30f5350973bb6063ca207a3f0… Patch: https://github.com/kamailio/kamailio/commit/3c9b1d30f5350973bb6063ca207a3f0… --- diff --git a/src/modules/p_usrloc/ul_db_handle.c b/src/modules/p_usrloc/ul_db_handle.c index cf0dabdfa7..d827450916 100644 --- a/src/modules/p_usrloc/ul_db_handle.c +++ b/src/modules/p_usrloc/ul_db_handle.c @@ -301,80 +301,6 @@ int load_location_number(db_func_t * dbf, db1_con_t* dbh, int *loc_nr){ return 0; } -int load_handles(db_func_t * dbf, db1_con_t * dbh) { - static char query[UL_DB_QUERY_LEN]; - db1_res_t * res; - db_row_t * row; - ul_db_handle_list_t * element; - int i, id, query_len; - str tmp; - - if(!dbf || !dbh){ - LM_ERR("NULL parameter passed \n"); - return -1; - } - - query_len = 25 + id_col.len + reg_table.len; - - if(query_len > UL_DB_QUERY_LEN) { - LM_ERR("weird: query larger than %i bytes.\n", UL_DB_QUERY_LEN); - return -1; - } - - memset(query, 0, UL_DB_QUERY_LEN); - - if (sprintf(query, - "SELECT DISTINCT " - "%.*s " - "FROM " - "%.*s", - id_col.len, id_col.s, - reg_table.len, reg_table.s) < 0) { - LM_ERR("could not print query\n"); - return -1; - } - tmp.s = query; - tmp.len = strlen(query); - - if (dbf->raw_query (dbh, &tmp, &res) < 0) { - LM_ERR("in database query.\n"); - return -1; - } - - if (RES_ROW_N (res) == 0) { - dbf->free_result (dbh, res); - LM_DBG ("no data found\n"); - return 1; - } - - for (i = 0; i < RES_ROW_N (res); ++i) { - row = RES_ROWS (res) + i; - - if((element = allocate_handle_list()) == NULL) { - LM_ERR("couldnt allocate handle.\n"); - goto errout; - } - - if (VAL_NULL (ROW_VALUES(row) + 0)) { - LM_ERR("Weird: Empty ID-Field\n"); - goto errout; - } - - id = VAL_INT (ROW_VALUES(row) + 0); - if(load_data(dbf, dbh, element->handle, id) < 0){ - LM_ERR("couldn't load handle data.\n"); - goto errout; - } - element->next = db_handles; - db_handles = element; - } - dbf->free_result (dbh, res); - return 0; -errout: - dbf->free_result (dbh, res); - return -1; -} - int refresh_handles(db_func_t * dbf, db1_con_t * dbh) { ul_db_handle_list_t * element; int i; diff --git a/src/modules/p_usrloc/ul_db_handle.h b/src/modules/p_usrloc/ul_db_handle.h index b9b5ade276..9916dc56ac 100644 --- a/src/modules/p_usrloc/ul_db_handle.h +++ b/src/modules/p_usrloc/ul_db_handle.h @@ -71,7 +71,6 @@ void destroy_handles(void); int refresh_handles(db_func_t * dbf, db1_con_t * dbh); int load_location_number(db_func_t * dbf, db1_con_t * dbh, int*); -int load_handles(db_func_t * dbf, db1_con_t * dbh); ul_db_handle_t * get_handle(db_func_t * dbf, db1_con_t * dbh, str * first, str * second);

1 0

git:master:a72abf8b: p_usrloc: fix out-of-bounds read
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: a72abf8b1db2ecd8fabfd3e051d1bd61fd205a07 URL: https://github.com/kamailio/kamailio/commit/a72abf8b1db2ecd8fabfd3e051d1bd6… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: fix out-of-bounds read --- Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/a72abf8b1db2ecd8fabfd3e051d1bd6… Patch: https://github.com/kamailio/kamailio/commit/a72abf8b1db2ecd8fabfd3e051d1bd6… --- diff --git a/src/modules/p_usrloc/udomain.c b/src/modules/p_usrloc/udomain.c index 11f0a131d6..227c0c4696 100644 --- a/src/modules/p_usrloc/udomain.c +++ b/src/modules/p_usrloc/udomain.c @@ -508,7 +508,7 @@ urecord_t* db_load_urecord_by_ruid(udomain_t* _d, str *_ruid) else order = &q_col; - if (ul_db_layer_query(_d, &vals[0].val.str_val, &vals[1].val.str_val, keys, 0, vals, columns, 1, 18, order, + if (ul_db_layer_query(_d, &vals[0].val.str_val, NULL, keys, 0, vals, columns, 1, 18, order, &res) < 0) { LM_ERR("db_query failed\n"); return 0;

1 0

git:master:2a67f799: p_usrloc: fix resource leak
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 2a67f79945475cfbe8d033b4df39018a73346db1 URL: https://github.com/kamailio/kamailio/commit/2a67f79945475cfbe8d033b4df39018… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: fix resource leak --- Modified: src/modules/p_usrloc/ul_db_layer.c --- Diff: https://github.com/kamailio/kamailio/commit/2a67f79945475cfbe8d033b4df39018… Patch: https://github.com/kamailio/kamailio/commit/2a67f79945475cfbe8d033b4df39018… --- diff --git a/src/modules/p_usrloc/ul_db_layer.c b/src/modules/p_usrloc/ul_db_layer.c index 36f02d5437..036adf23bb 100644 --- a/src/modules/p_usrloc/ul_db_layer.c +++ b/src/modules/p_usrloc/ul_db_layer.c @@ -218,27 +218,26 @@ int ul_add_domain_db(str * d, int t, str * url) { return -1; } memset(new_d, 0, sizeof(ul_domain_db_list_t)); - if(!d){ - return -1; - } - if(!d->s){ - return -1; - } + + if(!d || !d->s) goto error; + if((new_d->domain.name.s = pkg_malloc(d->len + 1)) == NULL) { - return -1; + goto error; } + if(t == DB_TYPE_SINGLE) { if(url) { LM_DBG("url: %.*s", url->len, url->s); if((new_d->domain.url.s = pkg_malloc(url->len + 1)) == NULL) { - return -1; + goto error; } + strncpy(new_d->domain.url.s, url->s, url->len); new_d->domain.url.s[url->len] = '\0'; new_d->domain.url.len = url->len; } else { if((new_d->domain.url.s = pkg_malloc(default_db_url.len + 1)) == NULL) { - return -1; + goto error; } strcpy(new_d->domain.url.s, default_db_url.s); new_d->domain.url.len = default_db_url.len; @@ -250,6 +249,9 @@ int ul_add_domain_db(str * d, int t, str * url) { new_d->next = domain_db_list; domain_db_list = new_d; return 1; +error: + pkg_free(new_d); + return -1; } ul_domain_db_t * ul_find_domain(const char * s) {

1 0

git:master:92f66e05: dispatcher: define values for dispatching algorithms
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 92f66e05b3b93c67acdaadfd2374cb91d01413f1 URL: https://github.com/kamailio/kamailio/commit/92f66e05b3b93c67acdaadfd2374cb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T07:29:57+02:00 dispatcher: define values for dispatching algorithms --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/92f66e05b3b93c67acdaadfd2374cb9… Patch: https://github.com/kamailio/kamailio/commit/92f66e05b3b93c67acdaadfd2374cb9…

1 0

git:master:b5bccd0f: db_text: missing breaks in checking db types compatibility
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: b5bccd0f4e14909b4a0ba2ab3957b2ea9b28ed0c URL: https://github.com/kamailio/kamailio/commit/b5bccd0f4e14909b4a0ba2ab3957b2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T05:03:24+02:00 db_text: missing breaks in checking db types compatibility --- Modified: src/modules/db_text/dbt_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/b5bccd0f4e14909b4a0ba2ab3957b2e… Patch: https://github.com/kamailio/kamailio/commit/b5bccd0f4e14909b4a0ba2ab3957b2e… --- diff --git a/src/modules/db_text/dbt_lib.c b/src/modules/db_text/dbt_lib.c index 3a1ec79eb8..0735c04c2e 100644 --- a/src/modules/db_text/dbt_lib.c +++ b/src/modules/db_text/dbt_lib.c @@ -442,30 +442,34 @@ int dbt_is_neq_type(db_type_t _t0, db_type_t _t1) case DB1_INT: if(_t0==DB1_DATETIME || _t0==DB1_BITMAP) return 0; - + break; case DB1_BIGINT: LM_ERR("BIGINT not supported\n"); return 0; - case DB1_DATETIME: if(_t0==DB1_INT) return 0; if(_t0==DB1_BITMAP) return 0; + break; case DB1_DOUBLE: break; case DB1_STRING: if(_t0==DB1_STR || _t0==DB1_BLOB) return 0; + break; case DB1_STR: if(_t0==DB1_STRING || _t0==DB1_BLOB) return 0; + break; case DB1_BLOB: if(_t0==DB1_STR || _t0==DB1_STRING) return 0; + break; case DB1_BITMAP: if (_t0==DB1_INT) return 0; + break; default: LM_ERR("invalid datatype %d\n", _t1); return 1; @@ -483,7 +487,6 @@ dbt_table_p dbt_db_get_temp_table(dbt_cache_p _dc) int hash; int hashidx; - if(!_dbt_cachetbl || !_dc) { LM_ERR("invalid parameter\n"); return NULL; @@ -500,8 +503,6 @@ dbt_table_p dbt_db_get_temp_table(dbt_cache_p _dc) _tbc = _dbt_cachetbl[hashidx].dtp; - - _tbc = dbt_table_new(&_s, &(_dc->name), NULL); _tbc->hash = hash; @@ -513,7 +514,6 @@ dbt_table_p dbt_db_get_temp_table(dbt_cache_p _dc) dbt_table_update_flags(_tbc, DBT_TBFL_TEMP, DBT_FL_SET, 0); - lock_release(&_dbt_cachetbl[hashidx].sem); return _tbc; }

1 0

git:master:b05f3637: cplc: safety checks for parameters
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: b05f3637f9cc829470d04037f6f5b88e37819706 URL: https://github.com/kamailio/kamailio/commit/b05f3637f9cc829470d04037f6f5b88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T05:02:41+02:00 cplc: safety checks for parameters --- Modified: src/modules/cplc/cpl_nonsig.c Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/b05f3637f9cc829470d04037f6f5b88… Patch: https://github.com/kamailio/kamailio/commit/b05f3637f9cc829470d04037f6f5b88… --- diff --git a/src/modules/cplc/cpl_nonsig.c b/src/modules/cplc/cpl_nonsig.c index d87c02d18f..ba53ee0ab6 100644 --- a/src/modules/cplc/cpl_nonsig.c +++ b/src/modules/cplc/cpl_nonsig.c @@ -230,11 +230,18 @@ void cpl_aux_process( int cmd_out, char *log_dir) LM_ERR("cannot set to IGNORE SIGCHLD signal\n"); } + file[0] = '\0'; + file_ptr = file; /* set the path for logging */ if (log_dir) { - strcpy( file, log_dir); - file_ptr = file + strlen(log_dir); - *(file_ptr++) = '/'; + if(strlen(log_dir)>=MAX_LOG_DIR_SIZE) { + /* fallback */ + LM_ERR("log dir path is too long, ignoring - check workdir\n"); + } else { + strcpy(file, log_dir); + file_ptr = file + strlen(log_dir); + *(file_ptr++) = '/'; + } } while(1) { diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index 4a99b2cbe4..2accfd21b9 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -873,6 +873,12 @@ inline static int is_lang_tag_matching(str *range,str *cpl_tag,str *cpl_subtag) str tag = {0,0}; str subtag = {0,0}; + if(range==NULL || cpl_tag==NULL || cpl_subtag==NULL) { + return -1; + } + if(range->s==NULL || cpl_tag->s==NULL || cpl_subtag->s==NULL) { + return -1; + } c = range->s; end = range->s + range->len;

1 0

[kamailio/kamailio] Unable to capture the SIP DATA (#1202)
by bharathg65 02 Aug '17

02 Aug '17

Dear Team, Any one pls help me , i have been struck with this more than 2 months , i have keep on changing the kamailio.cfg but nothing has worked . Initially i had plan to user captagent but unfortunately i couldn't run in CentOS since its failing in init procedure , because document which is provided in github is only for other OS . so planned to use kamailio as capture server . When ever i tried to run sipgrep , its showing data running on my server . And when i used command kamailio -c , i can see below interface is listening , but its not capturing any data and sending to mysql . root@localhost kamailio]# kamailio -c 0(6624) WARNING: <core> [ppcfg.c:221]: pp_ifdef_level_check(): different number of preprocessor directives: N(#!IF[N]DEF) - N(#!ENDIF) = 1 Listening on udp: 172.16.5.158:9060 Aliases: udp: localhost.localdom:9060 udp: localhost.localdomain:9060 And My sql is running fine without any issue . Any one can pls audit my configuration and advise me . because am New to Centos and homer . Thanks in advance -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1202

2 5

[kamailio/kamailio] Incorret code example in pipelimit documentation (#1201)
by Evgeniy 02 Aug '17

02 Aug '17

### Description In the documentation documentation for module pipelimit https://www.kamailio.org/docs/modules/4.2.x/modules/ratelimit.html has an error in example: ```# perform pipe match for authenticated user $var(limit) = 20; if (!pl_check("$au", "traildrop", "$var(limit)")) { pl_drop(); exit; } ``` If write algorithm "traildrop" in function pl_check, you every execution will get return code -2 and pipe not will be created. ### Possible Solutions Change string "traildrop" on "TAILDROP" ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 4.2.3 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1201

2 2

git:master:7bb4b7dc: pipelimit: match algorithm name case insensitive
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: master Commit: 7bb4b7dcc23c582ec666c71c9475e46e4ca12709 URL: https://github.com/kamailio/kamailio/commit/7bb4b7dcc23c582ec666c71c9475e46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T16:30:24+02:00 pipelimit: match algorithm name case insensitive --- Modified: src/modules/pipelimit/pl_ht.h --- Diff: https://github.com/kamailio/kamailio/commit/7bb4b7dcc23c582ec666c71c9475e46… Patch: https://github.com/kamailio/kamailio/commit/7bb4b7dcc23c582ec666c71c9475e46… --- diff --git a/src/modules/pipelimit/pl_ht.h b/src/modules/pipelimit/pl_ht.h index cb5b9822f5..d2feaf40d5 100644 --- a/src/modules/pipelimit/pl_ht.h +++ b/src/modules/pipelimit/pl_ht.h @@ -112,11 +112,11 @@ static inline int str_i_cmp(const str * a, const str * b) static inline int str_map_str(const str_map_t * map, const str * key, int * ret) { for (; map->str.s; map++) - if (! str_cmp(&map->str, key)) { + if (! str_i_cmp(&map->str, key)) { *ret = map->id; return 0; } - LM_DBG("str_map_str() failed map=%p key=%.*s\n", map, key->len, key->s); + LM_DBG("failed to match - map=%p key=%.*s\n", map, key->len, key->s); return -1; } @@ -131,7 +131,7 @@ static inline int str_map_int(const str_map_t * map, int key, str * ret) *ret = map->str; return 0; } - LM_DBG("str_map_str() failed map=%p key=%d\n", map, key); + LM_DBG("failed to match - failed map=%p key=%d\n", map, key); return -1; } @@ -144,7 +144,7 @@ static inline int str_cpy(str * dest, str * src) dest->len = src->len; dest->s = shm_malloc(src->len); if (! dest->s) { - LM_ERR("oom: '%.*s'\n", src->len, src->s); + LM_ERR("out of shared memory: '%.*s'\n", src->len, src->s); return -1; } memcpy(dest->s, src->s, src->len);

1 0

git:master:d3024229: tsilo: added section ids in docs
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: master Commit: d302422982aab79ec9af9b9d54d33dbf98dc7b63 URL: https://github.com/kamailio/kamailio/commit/d302422982aab79ec9af9b9d54d33db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T10:00:53+02:00 tsilo: added section ids in docs --- Modified: src/modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d302422982aab79ec9af9b9d54d33db… Patch: https://github.com/kamailio/kamailio/commit/d302422982aab79ec9af9b9d54d33db… --- diff --git a/src/modules/tsilo/doc/tsilo_admin.xml b/src/modules/tsilo/doc/tsilo_admin.xml index 457aa7a219..e6cfe9b155 100644 --- a/src/modules/tsilo/doc/tsilo_admin.xml +++ b/src/modules/tsilo/doc/tsilo_admin.xml @@ -74,7 +74,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="tsilo.p.hash_size"> <title><varname>hash_size</varname> (integer)</title> <para> The size of the hash table internally used to keep the transaction. A @@ -97,7 +97,7 @@ modparam("tsilo", "hash_size", 1024) </example> </section> - <section> + <section id="tsilo.p.use_domain"> <title><varname>use_domain</varname> (integer)</title> <para> Specify if the domain part of the URI should be also saved and used for @@ -122,7 +122,7 @@ modparam("tsilo", "use_domain", 1) <section> <title>Functions</title> - <section> + <section id="tsilo.f.ts_store"> <title><function moreinfo="none">ts_store([uri])</function></title> <para> The method stores uri, tindex and tlabel of the current transaction. If @@ -146,7 +146,7 @@ if (is_method("INVITE")) { </programlisting> </example> </section> - <section> + <section id="tsilo.f.ts_append"> <title><function moreinfo="none">ts_append(domain, ruri)</function></title> <para> The method add branches to all the stored transactions for the &sip; @@ -184,7 +184,7 @@ if (is_method("REGISTER")) { </programlisting> </example> </section> - <section> + <section id="tsilo.f.ts_append_to"> <title><function moreinfo="none">ts_append_to(tindex, tlabel, domain, [uri])</function></title> <para> The method add branches to the transaction identified by tindex and tlabel, @@ -238,7 +238,7 @@ if (is_method("REGISTER")) { <section> <title>RPC Commands</title> - <section> + <section id="tsilo.rpc.ts.dump"> <title><varname>ts.dump</varname></title> <para>Dumps the content of the TSILO table</para> <para>Name: <emphasis>ts.dump</emphasis></para> @@ -247,7 +247,7 @@ if (is_method("REGISTER")) { kamcmd ts.dump </programlisting> </section> - <section> + <section id="tsilo.rpc.ts.lookup"> <title><varname>ts.lookup</varname></title> <para>Dumps the transactions stored for the given RURI</para> <para>Name: <emphasis>ts.lookup</emphasis></para> @@ -259,31 +259,31 @@ if (is_method("REGISTER")) { </section> <section> <title>Statistics</title> - <section> + <section id="tsilo.stat.stored_ruris"> <title><varname>stored_ruris</varname></title> <para> Number of ruris currently stored in the TSILO table. </para> </section> - <section> + <section id="tsilo.stat.stored_transactions"> <title><varname>stored_transactions</varname></title> <para> Number of transactions currently stored in the TSILO table. </para> </section> - <section> + <section id="tsilo.stat.added_branches"> <title><varname>added_branches</varname></title> <para> Total number of added branches from the startup. </para> </section> - <section> + <section id="tsilo.stat.total_ruris"> <title><varname>total_ruris</varname></title> <para> Total number of stored ruris from the startup. </para> </section> - <section> + <section id="tsilo.stat.total_transactions"> <title><varname>total_transactions</varname></title> <para> Total number of stored transactions from the startup.

1 0

git:4.4:c5657b73: tls: explicit libssl v1.1+ cleanup when module is destroyed
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: 4.4 Commit: c5657b7386f8be722e3d87c70b9e049d2b843c0d URL: https://github.com/kamailio/kamailio/commit/c5657b7386f8be722e3d87c70b9e049… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T12:56:03+02:00 tls: explicit libssl v1.1+ cleanup when module is destroyed - OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls module is destroyed, to avoid being executed again on final exit (due to atexit() callback), because at that moment shared memory is already destroyed and attempts to access the locals will result in cored dump - retported by Victor Seva, GH #1189 (cherry picked from commit 00eb71da83347c9d2ea74feacec9c955f7b2a2e6) (cherry picked from commit 071b85f66cabaa3a705a014b26b7c1eb31029b26) --- Modified: modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/c5657b7386f8be722e3d87c70b9e049… Patch: https://github.com/kamailio/kamailio/commit/c5657b7386f8be722e3d87c70b9e049… --- diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index 133bc7fc83..1ce9d716a5 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -778,4 +778,10 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); +#if OPENSSL_VERSION_NUMBER >= 0x010100000L + /* explicit execution of libssl cleanup to avoid being executed again + * by atexit(), when shm is gone */ + DBG("executing openssl v1.1+ cleanup\n"); + OPENSSL_cleanup(); +#endif }

1 0

git:5.0:071b85f6: tls: explicit libssl v1.1+ cleanup when module is destroyed
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: 5.0 Commit: 071b85f66cabaa3a705a014b26b7c1eb31029b26 URL: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T10:02:45+02:00 tls: explicit libssl v1.1+ cleanup when module is destroyed - OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls module is destroyed, to avoid being executed again on final exit (due to atexit() callback), because at that moment shared memory is already destroyed and attempts to access the locals will result in cored dump - retported by Victor Seva, GH #1189 (cherry picked from commit 00eb71da83347c9d2ea74feacec9c955f7b2a2e6) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1e… Patch: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1e… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 5d977fc810..b12209a0cd 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -778,4 +778,10 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); +#if OPENSSL_VERSION_NUMBER >= 0x010100000L + /* explicit execution of libssl cleanup to avoid being executed again + * by atexit(), when shm is gone */ + DBG("executing openssl v1.1+ cleanup\n"); + OPENSSL_cleanup(); +#endif }

1 0

git:master:00eb71da: tls: explicit libssl v1.1+ cleanup when module is destroyed
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: master Commit: 00eb71da83347c9d2ea74feacec9c955f7b2a2e6 URL: https://github.com/kamailio/kamailio/commit/00eb71da83347c9d2ea74feacec9c95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T09:54:18+02:00 tls: explicit libssl v1.1+ cleanup when module is destroyed - OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls module is destroyed, to avoid being executed again on final exit (due to atexit() callback), because at that moment shared memory is already destroyed and attempts to access the locals will result in cored dump - retported by Victor Seva, GH #1189 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/00eb71da83347c9d2ea74feacec9c95… Patch: https://github.com/kamailio/kamailio/commit/00eb71da83347c9d2ea74feacec9c95… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 6d78c37551..054d687e9c 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -847,4 +847,10 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); +#if OPENSSL_VERSION_NUMBER >= 0x010100000L + /* explicit execution of libssl cleanup to avoid being executed again + * by atexit(), when shm is gone */ + DBG("executing openssl v1.1+ cleanup\n"); + OPENSSL_cleanup(); +#endif }

1 0

git:master:62f573d4: kamctl: fix dangerous 'rm -rf' code in case if variables are not defined
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: master Commit: 62f573d4ecbbebe5f0f2d3b39be7ad4c2b460e65 URL: https://github.com/kamailio/kamailio/commit/62f573d4ecbbebe5f0f2d3b39be7ad4… Author: Alexander Lutay <alutay(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T09:06:05+02:00 kamctl: fix dangerous 'rm -rf' code in case if variables are not defined --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/62f573d4ecbbebe5f0f2d3b39be7ad4… Patch: https://github.com/kamailio/kamailio/commit/62f573d4ecbbebe5f0f2d3b39be7ad4… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 30d5878482..3aaecbd15a 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2614,7 +2614,7 @@ tls_ca() { merr "Failed to create root directory $CA_PATH" exit 1 fi - rm -fr $CA_PATH/* + rm -fr "${CA_PATH:?}"/* mkdir $CA_PATH/private mkdir $CA_PATH/certs touch $CA_PATH/index.txt @@ -2685,7 +2685,7 @@ tls_ca() { merr "Failed to create user directory $USER_DIR " exit 1 fi - rm -fr $USER_DIR/* + rm -fr "${USER_DIR:?}"/* mecho "Creating user certificate request" openssl req -config $USER_CFG -out $USER_DIR/$USER-cert_req.pem \

1 0

[kamailio/kamailio] kamctl: fix dangerous 'rm -rf' code in case if variables are not defined (#1200)
by Alex Lutay 02 Aug '17

02 Aug '17

Hi, kamctl has a historical bomb which can be new https://github.com/MrMEEE/bumblebee-Old-and-abbandoned/issues/123 in case if variables are undefined for some reason. Have fun! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1200 -- Commit Summary -- * kamctl: fix dangerous 'rm -rf' code in case if variables are not defined -- File Changes -- M utils/kamctl/kamctl (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1200.patch https://github.com/kamailio/kamailio/pull/1200.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1200

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev