sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
390 discussions

git:master:42764f90: tm: split wrappers for t set flags cfg functions
by Daniel-Constantin Mierla 09 Jun '17

09 Jun '17

Module: kamailio Branch: master Commit: 42764f908c4bd8d2eedf0b940c3289cacd12362b URL: https://github.com/kamailio/kamailio/commit/42764f908c4bd8d2eedf0b940c3289c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-09T08:21:50+02:00 tm: split wrappers for t set flags cfg functions --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/42764f908c4bd8d2eedf0b940c3289c… Patch: https://github.com/kamailio/kamailio/commit/42764f908c4bd8d2eedf0b940c3289c… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 1fc7f62890..6543db5ccd 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1812,15 +1812,13 @@ int ki_t_reset_max_lifetime(sip_msg_t* msg) * static int t_set_foo(struct sip_msg* msg, char*, char* ) * that will expect fparam as first param and will set or reset T_FOO * in the current or next to be created transaction. */ -#define W_T_SET_FLAG_GEN_FUNC(fname, T_FLAG_NAME) \ - static int fname(struct sip_msg* msg, char* p1, char* p2) \ +#define T_SET_FLAG_GEN_FUNC(fname, T_FLAG_NAME) \ + static int fname(sip_msg_t* msg, int state) \ { \ - int state; \ struct cell* t; \ unsigned int set_flags; \ unsigned int reset_flags; \ \ - if (get_int_fparam(&state, msg, (fparam_t*)p1) < 0) return -1; \ t=get_t(); \ /* in REPLY_ROUTE and FAILURE_ROUTE T will be set to current transaction; \ * in REQUEST_ROUTE T will be set only if the transaction was already \ @@ -1848,28 +1846,45 @@ int ki_t_reset_max_lifetime(sip_msg_t* msg) return 1; \ } +#define W_T_SET_FLAG_GEN_FUNC(fname, T_FLAG_NAME) \ + static int w_##fname(sip_msg_t* msg, char* p1, char* p2) \ +{ \ + int state; \ + if (get_int_fparam(&state, msg, (fparam_t*)p1) < 0) return -1; \ + return fname(msg, state); \ +} /* set automatically sending 100 replies on/off for the current or * next to be created transaction */ -W_T_SET_FLAG_GEN_FUNC(w_t_set_auto_inv_100, T_AUTO_INV_100) +T_SET_FLAG_GEN_FUNC(t_set_auto_inv_100, T_AUTO_INV_100) + +W_T_SET_FLAG_GEN_FUNC(t_set_auto_inv_100, T_AUTO_INV_100) /* set 6xx handling for the current or next to be created transaction */ -W_T_SET_FLAG_GEN_FUNC(w_t_set_disable_6xx, T_DISABLE_6xx) +T_SET_FLAG_GEN_FUNC(t_set_disable_6xx, T_DISABLE_6xx) + +W_T_SET_FLAG_GEN_FUNC(t_set_disable_6xx, T_DISABLE_6xx) /* disable dns failover for the current transaction */ -W_T_SET_FLAG_GEN_FUNC(w_t_set_disable_failover, T_DISABLE_FAILOVER) +T_SET_FLAG_GEN_FUNC(t_set_disable_failover, T_DISABLE_FAILOVER) + +W_T_SET_FLAG_GEN_FUNC(t_set_disable_failover, T_DISABLE_FAILOVER) #ifdef CANCEL_REASON_SUPPORT /* disable/enable e2e cancel reason copy for the current transaction */ -W_T_SET_FLAG_GEN_FUNC(w_t_set_no_e2e_cancel_reason, T_NO_E2E_CANCEL_REASON) +T_SET_FLAG_GEN_FUNC(t_set_no_e2e_cancel_reason, T_NO_E2E_CANCEL_REASON) + +W_T_SET_FLAG_GEN_FUNC(t_set_no_e2e_cancel_reason, T_NO_E2E_CANCEL_REASON) #endif /* CANCEL_REASON_SUPPORT */ /* disable internal negative reply for the current transaction */ -W_T_SET_FLAG_GEN_FUNC(w_t_set_disable_internal_reply, T_DISABLE_INTERNAL_REPLY) +T_SET_FLAG_GEN_FUNC(t_set_disable_internal_reply, T_DISABLE_INTERNAL_REPLY) + +W_T_SET_FLAG_GEN_FUNC(t_set_disable_internal_reply, T_DISABLE_INTERNAL_REPLY) /* FAILURE_ROUTE and BRANCH_FAILURE_ROUTE only,

1 0

git:master:5e9b3121: tm: prefixed t set functions exported to config script
by Daniel-Constantin Mierla 09 Jun '17

09 Jun '17

Module: kamailio Branch: master Commit: 5e9b3121da46aa5e9e2f1347468cda211bd198c4 URL: https://github.com/kamailio/kamailio/commit/5e9b3121da46aa5e9e2f1347468cda2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-08T21:51:14+02:00 tm: prefixed t set functions exported to config script --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/5e9b3121da46aa5e9e2f1347468cda2… Patch: https://github.com/kamailio/kamailio/commit/5e9b3121da46aa5e9e2f1347468cda2…

1 0

git:4.4:650f1cb5: sca: fix core when release_appearance RPC command parameter has wrong index
by Victor Seva 08 Jun '17

08 Jun '17

Module: kamailio Branch: 4.4 Commit: 650f1cb590b927a1254562299496b0974e5f168f URL: https://github.com/kamailio/kamailio/commit/650f1cb590b927a1254562299496b09… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-06-08T13:49:43+02:00 sca: fix core when release_appearance RPC command parameter has wrong index > #0 0x00007fd8bba5a067 in raise () from /lib/x86_64-linux-gnu/libc.so.6 > #1 0x00007fd8bba5b448 in abort () from /lib/x86_64-linux-gnu/libc.so.6 > #2 0x00007fd8bba53266 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 > #3 0x00007fd8bba53312 in __assert_fail () from /lib/x86_64-linux-gnu/libc.so.6 > #4 0x00007fd8a4b16328 in sca_appearance_list_unlink_index (app_list=0x7fd8a603c528, idx=0) at sca_appearance.c:254 > #5 0x00007fd8a4ae0372 in sca_rpc_release_appearance (rpc=0x7fd8b1162300 <binrpc_callbacks>, ctx=0x7ffc2ce9eef0) at sca_rpc.c:504 > #6 0x00007fd8b0f38abb in process_rpc_req (buf=0x1e5e744 "\241\003\067oZ\274Æ\027sca.release_appearance", size=12344, bytes_needed=0x7ffc2ce9effc, sh=0xfefefefefefefe00, > saved_state=0xfefefefefefefe00) at binrpc_run.c:675 (cherry picked from commit 68045ff55f8e9972d0560ae0216b0fe1f28556d6) --- Modified: modules/sca/sca_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/650f1cb590b927a1254562299496b09… Patch: https://github.com/kamailio/kamailio/commit/650f1cb590b927a1254562299496b09… --- diff --git a/modules/sca/sca_rpc.c b/modules/sca/sca_rpc.c index 5e6873b48c..cac8465236 100644 --- a/modules/sca/sca_rpc.c +++ b/modules/sca/sca_rpc.c @@ -482,6 +482,11 @@ sca_rpc_release_appearance( rpc_t *rpc, void *ctx ) return; } + if (app_idx <= 0) { + rpc->fault(ctx, 500, "appearance-index must be > 0"); + return; + } + if (( ht = sca->appearances ) == NULL ) { rpc->fault( ctx, 500, "No active appearances" ); return;

1 0

git:5.0:bcf6cb0d: sca: fix core when release_appearance RPC command parameter has wrong index
by Victor Seva 08 Jun '17

08 Jun '17

Module: kamailio Branch: 5.0 Commit: bcf6cb0d22e851ce2a42427f1269718dca8dacae URL: https://github.com/kamailio/kamailio/commit/bcf6cb0d22e851ce2a42427f1269718… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-06-08T13:46:52+02:00 sca: fix core when release_appearance RPC command parameter has wrong index > #0 0x00007fd8bba5a067 in raise () from /lib/x86_64-linux-gnu/libc.so.6 > #1 0x00007fd8bba5b448 in abort () from /lib/x86_64-linux-gnu/libc.so.6 > #2 0x00007fd8bba53266 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 > #3 0x00007fd8bba53312 in __assert_fail () from /lib/x86_64-linux-gnu/libc.so.6 > #4 0x00007fd8a4b16328 in sca_appearance_list_unlink_index (app_list=0x7fd8a603c528, idx=0) at sca_appearance.c:254 > #5 0x00007fd8a4ae0372 in sca_rpc_release_appearance (rpc=0x7fd8b1162300 <binrpc_callbacks>, ctx=0x7ffc2ce9eef0) at sca_rpc.c:504 > #6 0x00007fd8b0f38abb in process_rpc_req (buf=0x1e5e744 "\241\003\067oZ\274Æ\027sca.release_appearance", size=12344, bytes_needed=0x7ffc2ce9effc, sh=0xfefefefefefefe00, > saved_state=0xfefefefefefefe00) at binrpc_run.c:675 (cherry picked from commit 68045ff55f8e9972d0560ae0216b0fe1f28556d6) --- Modified: src/modules/sca/sca_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/bcf6cb0d22e851ce2a42427f1269718… Patch: https://github.com/kamailio/kamailio/commit/bcf6cb0d22e851ce2a42427f1269718… --- diff --git a/src/modules/sca/sca_rpc.c b/src/modules/sca/sca_rpc.c index 8edc572bac..6005aea3a8 100644 --- a/src/modules/sca/sca_rpc.c +++ b/src/modules/sca/sca_rpc.c @@ -483,6 +483,11 @@ void sca_rpc_release_appearance(rpc_t *rpc, void *ctx) return; } + if (app_idx <= 0) { + rpc->fault(ctx, 500, "appearance-index must be > 0"); + return; + } + if ((ht = sca->appearances) == NULL) { rpc->fault(ctx, 500, "No active appearances"); return;

1 0

git:master:68045ff5: sca: fix core when release_appearance RPC command parameter has wrong index
by Victor Seva 08 Jun '17

08 Jun '17

Module: kamailio Branch: master Commit: 68045ff55f8e9972d0560ae0216b0fe1f28556d6 URL: https://github.com/kamailio/kamailio/commit/68045ff55f8e9972d0560ae0216b0fe… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-06-08T13:45:03+02:00 sca: fix core when release_appearance RPC command parameter has wrong index > #0 0x00007fd8bba5a067 in raise () from /lib/x86_64-linux-gnu/libc.so.6 > #1 0x00007fd8bba5b448 in abort () from /lib/x86_64-linux-gnu/libc.so.6 > #2 0x00007fd8bba53266 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 > #3 0x00007fd8bba53312 in __assert_fail () from /lib/x86_64-linux-gnu/libc.so.6 > #4 0x00007fd8a4b16328 in sca_appearance_list_unlink_index (app_list=0x7fd8a603c528, idx=0) at sca_appearance.c:254 > #5 0x00007fd8a4ae0372 in sca_rpc_release_appearance (rpc=0x7fd8b1162300 <binrpc_callbacks>, ctx=0x7ffc2ce9eef0) at sca_rpc.c:504 > #6 0x00007fd8b0f38abb in process_rpc_req (buf=0x1e5e744 "\241\003\067oZ\274Æ\027sca.release_appearance", size=12344, bytes_needed=0x7ffc2ce9effc, sh=0xfefefefefefefe00, > saved_state=0xfefefefefefefe00) at binrpc_run.c:675 --- Modified: src/modules/sca/sca_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/68045ff55f8e9972d0560ae0216b0fe… Patch: https://github.com/kamailio/kamailio/commit/68045ff55f8e9972d0560ae0216b0fe… --- diff --git a/src/modules/sca/sca_rpc.c b/src/modules/sca/sca_rpc.c index 8edc572bac..6005aea3a8 100644 --- a/src/modules/sca/sca_rpc.c +++ b/src/modules/sca/sca_rpc.c @@ -483,6 +483,11 @@ void sca_rpc_release_appearance(rpc_t *rpc, void *ctx) return; } + if (app_idx <= 0) { + rpc->fault(ctx, 500, "appearance-index must be > 0"); + return; + } + if ((ht = sca->appearances) == NULL) { rpc->fault(ctx, 500, "No active appearances"); return;

1 0

Docs: database structure
by Daniel-Constantin Mierla 07 Jun '17

07 Jun '17

Hello, I regenerated recently the document with the details for Kamailio's database structure, it is available at: * https://kamailio.org/docs/db-tables/kamailio-db-devel.html If you haven't read it so far, it is a good source to understand the purpose of the fields needed by kamailio from database. Contributions to the document are more than appreciated! You can update the xml files from src/lib/srdb1/schema/ and then make a pull request via github. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 0

Docker and Kamailio
by sain hassam caicedo 07 Jun '17

07 Jun '17

Dear Kamailio, My name is Sain, I from Colombia. I wonder if is possible to use Kamailio with Docker in Ubuntu 16 ? Also, respectfully do you have an easy installation manual or any recommendation to start doing some testing? I am interesting to learn more about Kamailio . Thank you very much < sr-dev (at) lists . sip-router . org >

2 1

git:master:56c85978: app_sqlang: detect arch for compiling squirrel lang libs
by Daniel-Constantin Mierla 07 Jun '17

07 Jun '17

Module: kamailio Branch: master Commit: 56c859785ba01047246f5ef9e7d7e454e16ee08d URL: https://github.com/kamailio/kamailio/commit/56c859785ba01047246f5ef9e7d7e45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-07T11:40:38+02:00 app_sqlang: detect arch for compiling squirrel lang libs --- Modified: src/modules/app_sqlang/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/56c859785ba01047246f5ef9e7d7e45… Patch: https://github.com/kamailio/kamailio/commit/56c859785ba01047246f5ef9e7d7e45… --- diff --git a/src/modules/app_sqlang/Makefile b/src/modules/app_sqlang/Makefile index 481d13ec56..b93ae18188 100644 --- a/src/modules/app_sqlang/Makefile +++ b/src/modules/app_sqlang/Makefile @@ -10,12 +10,19 @@ NAME=app_sqlang.so DEFS+=-DKAMAILIO_MOD_INTERFACE -I./squirrel/include LIBS += -L. -lsquirrel -lsqstdlib -lstdc++ +MKSQLANG= + +SQLANGARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') +ifeq ($(SQLANGARCHBSZ),64b) + MKSQLANG=sq64 +endif + include ../../Makefile.modules libsquirrel.a: - make -C ./squirrel/squirrel + make -C ./squirrel/squirrel $(MKSQLANG) libsqstdlib.a: - make -C ./squirrel/sqstdlib + make -C ./squirrel/sqstdlib $(MKSQLANG) app_sqlang.so: libsquirrel.a libsqstdlib.a

1 0

git:master:061d08c2: app_sqlang: proper jump in the exports array
by Daniel-Constantin Mierla 07 Jun '17

07 Jun '17

Module: kamailio Branch: master Commit: 061d08c29eae94741a31d002d1e99a23908a0d0f URL: https://github.com/kamailio/kamailio/commit/061d08c29eae94741a31d002d1e99a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-07T11:19:27+02:00 app_sqlang: proper jump in the exports array --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/061d08c29eae94741a31d002d1e99a2… Patch: https://github.com/kamailio/kamailio/commit/061d08c29eae94741a31d002d1e99a2… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 648e8023a0..eea36f6ab0 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1466,7 +1466,7 @@ SQInteger sqlang_open_KSR(HSQUIRRELVM J) if(emods_size>1) { for(k=1; k<emods_size; k++) { n++; - _sr_crt_J_KSRMethods += n; + _sr_crt_J_KSRMethods = _sr_J_KSRMethods + n; snprintf(mname, 128, "%s", emods[k].kexp[0].mname.s); sq_pushstring(J, mname, -1); /* stack[4] */ sq_newtable(J); /* stack[5] */

1 0

git:master:7116d1c1: app_python: proper jump in the exports array
by Daniel-Constantin Mierla 07 Jun '17

07 Jun '17

Module: kamailio Branch: master Commit: 7116d1c10e4f3224874ea689c209f1d2974806ce URL: https://github.com/kamailio/kamailio/commit/7116d1c10e4f3224874ea689c209f1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-07T11:16:41+02:00 app_python: proper jump in the exports array --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7116d1c10e4f3224874ea689c209f1d… Patch: https://github.com/kamailio/kamailio/commit/7116d1c10e4f3224874ea689c209f1d… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 37bb4b1f1f..0dd71c3448 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -986,7 +986,7 @@ int sr_apy_init_ksr(void) if(emods_size>1) { for(k=1; k<emods_size; k++) { n++; - _sr_crt_KSRMethods += n; + _sr_crt_KSRMethods = _sr_KSRMethods + n; snprintf(mname, 128, "KSR.%s", emods[k].kexp[0].mname.s); for(i=0; emods[k].kexp[i].func!=NULL; i++) { LM_DBG("exporting %s.%s(...)\n", mname,

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017