sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:5.1:7ff08c14: app_python: implement missing types for 3 params
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: 5.1 Commit: 7ff08c140d5205ebecba3adb22c05e4a8486b64d URL: https://github.com/kamailio/kamailio/commit/7ff08c140d5205ebecba3adb22c05e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T08:04:03+02:00 app_python: implement missing types for 3 params (cherry picked from commit 261cb0f91e7a85bf56c64bbf929673c46197efcf) (cherry picked from commit 695bdaf4a0501c9b5d455052141f42f9f7d8b349) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7ff08c140d5205ebecba3adb22c05e4… Patch: https://github.com/kamailio/kamailio/commit/7ff08c140d5205ebecba3adb22c05e4…

1 0

git:5.2:02d70893: app_python3: implement missing types for 3 params
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: 5.2 Commit: 02d70893718a96f552dc6426d016a0342e47247f URL: https://github.com/kamailio/kamailio/commit/02d70893718a96f552dc6426d016a03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T08:02:22+02:00 app_python3: implement missing types for 3 params (cherry picked from commit eeeecadeb1452972de7386354dfca37f483cef06) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/02d70893718a96f552dc6426d016a03… Patch: https://github.com/kamailio/kamailio/commit/02d70893718a96f552dc6426d016a03… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 15820cafd0..c9e61e78da 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -277,15 +277,15 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg LM_DBG("params[%d] for: %.*s are int-int-int: [%d] [%d] [%d]\n", i, fname.len, fname.s, vps[0].n, vps[1].n, vps[2].n); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_INT - && ket->ptypes[2]==SR_KEMIP_STR) { + && ket->ptypes[2]==SR_KEMIP_STR) { if(!PyArg_ParseTuple(args, "iis:kemi-param-nns", &vps[0].n, - &vps[1].n, &vps[2].s.s)) { + &vps[1].n, &vps[2].s.s)) { LM_ERR("unable to retrieve int-int-str params %d\n", i); return sr_kemi_apy_return_false(); } vps[2].s.len = strlen(vps[2].s.s); LM_DBG("params[%d] for: %.*s are int-int-str: [%d] [%d] [%.*s]\n", i, - fname.len, fname.s, vps[0].n, vps[1].n, vps[2].s.len, vps[2].s.s); + fname.len, fname.s, vps[0].n, vps[1].n, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "isi:kemi-param-nsn", &vps[0].n, @@ -296,6 +296,18 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg vps[1].s.len = strlen(vps[1].s.s); LM_DBG("params[%d] for: %.*s are int-str-int: [%d] [%.*s] [%d]\n", i, fname.len, fname.s, vps[0].n, vps[1].s.len, vps[1].s.s, vps[2].n); + } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "iss:kemi-param-nss", &vps[0].n, + &vps[1].s.s, &vps[2].s.s)) { + LM_ERR("unable to retrieve int-str-str param %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[1].s.len = strlen(vps[1].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are int-str-str: [%d] [%.*s]" + " [%.*s]\n", i, fname.len, fname.s, + vps[0].n, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_INT && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "sii:kemi-param-snn", &vps[0].s.s, @@ -307,6 +319,19 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg LM_DBG("params[%d] for: %.*s are str-int: [%.*s] [%d] [%d]\n", i, fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].n, vps[2].n); + } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "sis:kemi-param-ssn", &vps[0].s.s, + &vps[1].n, &vps[2].s.s)) { + LM_ERR("unable to retrieve str-int-str param %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[0].s.len = strlen(vps[0].s.s); + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are str-str-int: [%.*s] [%d] [%.*s]\n", + i, fname.len, fname.s, + vps[0].s.len, vps[0].s.s, + vps[1].n, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "ssi:kemi-param-ssn", &vps[0].s.s, @@ -330,7 +355,7 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg vps[0].s.len = strlen(vps[0].s.s); vps[1].s.len = strlen(vps[1].s.s); vps[2].s.len = strlen(vps[2].s.s); - LM_DBG("params[%d] for: %.*s are str-str-int: [%.*s] [%.*s]" + LM_DBG("params[%d] for: %.*s are str-str-str: [%.*s] [%.*s]" " [%.*s]\n", i, fname.len, fname.s, vps[0].s.len, vps[0].s.s, vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s);

1 0

git:5.2:695bdaf4: app_python: implement missing types for 3 params
by Daniel-Constantin Mierla 26 Sep '19

26 Sep '19

Module: kamailio Branch: 5.2 Commit: 695bdaf4a0501c9b5d455052141f42f9f7d8b349 URL: https://github.com/kamailio/kamailio/commit/695bdaf4a0501c9b5d455052141f42f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-26T08:02:12+02:00 app_python: implement missing types for 3 params (cherry picked from commit 261cb0f91e7a85bf56c64bbf929673c46197efcf) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/695bdaf4a0501c9b5d455052141f42f… Patch: https://github.com/kamailio/kamailio/commit/695bdaf4a0501c9b5d455052141f42f…

1 0

Kamailio ARM support improved, tests
by Henning Westerholt 25 Sep '19

25 Sep '19

Hello, as part of the testing for 5.3.0 I looked into the ARM support in Kamailio. Previously the core used some deprecated assembler functions for atomic operations (locking etc..). There was also no native support for the ARM v7 architecture available. After several fixes and extensions both topics should be now much improved. I did today a lot of tests on Rasberry Pi and also some benchmarking (will send another e-mail when the report is ready). If you use Kamailio on another embedded ARM (>= v6) system it would be great if you also give it a try. Use git master revision ccc0eb6d12a1d (or newer) for your tests. Please report eventual issues to the sr-dev list. Cheers, Henning -- Kamailio Merchandising - https://skalatan.de/merchandising/ Kamailio services - https://skalatan.de/services Henning Westerholt - https://skalatan.de/blog/

1 0

git:master:ccc0eb6d: Makefile.defs: remove over-specific -fmpu definition, not needed according to my tests
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: ccc0eb6d12a1deb61536d7887d0baf73a9cc639f URL: https://github.com/kamailio/kamailio/commit/ccc0eb6d12a1deb61536d7887d0baf7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T17:04:05+02:00 Makefile.defs: remove over-specific -fmpu definition, not needed according to my tests --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ccc0eb6d12a1deb61536d7887d0baf7… Patch: https://github.com/kamailio/kamailio/commit/ccc0eb6d12a1deb61536d7887d0baf7… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index dad6b7a36b..e5fa7fdda1 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1340,9 +1340,8 @@ ifeq ($(ARCH), arm7) # if gcc ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM - #common stuff, use armv7-a similar to debian - #build flags from https://wiki.debian.org/ArmHardFloatPort - CFLAGS=-march=armv7-a -mfpu=vfpv3-d16 $(CC_OPT) -funroll-loops -fsigned-char \ + #common stuff, use armv7-a as lowest common architecture + CFLAGS=-march=armv7-a $(CC_OPT) -funroll-loops -fsigned-char \ $(PROFILE) #if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

1 0

Generating CDRs in JSON format
by Lucian Balaceanu 25 Sep '19

25 Sep '19

Hello guys, I am trying to get the CDRs generated in JSON format just as acc_json module does for transactions accounting, but for now I didn't find a way to do this directly from Kamailio. Please correct me if I am wrong. As far as I understood from the code, acc_json and other modules extending the acc itself are based on the acc_engine structure that contains different function pointers. acc module, by means of acc_run_engines() then calls the appropriate functions in various places. The programming solutions are at least: * extend inside the acc module itself the (log_)write_cdr() function to offer on demand JSON output -- simple to implement, breaks the adaptability given until now by the acc engines * create a sort of an acc_engine for CDRs as well and have this called from an external module (acc_json module) Is there an implementation preference you see in order to attain this CDR as JSON? Do you have any suggestions? Thank you, Lucian Balaceanu

2 1

Re: [sr-dev] [kamailio/kamailio] misc/examples/ims/pcscf/route: Update the rest of the routing scripts for P-CSCF with IPSec support; Fix Rx_AAR() calls. (8f5b70c)
by Yasin CANER 25 Sep '19

25 Sep '19

well , is it possible to catch 401 reply in on_reply_route ? I think it should be in failure_route but it is impossible because ipsec_create function can be on only on OK replies. -- 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/commit/8f5b70ca81e1d49c926a6174191ffe8…

1 0

git:master:ea141f0a: jsonrpcs: cast to unsigned long, related to commit e624cbfa4b0df
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: ea141f0a63cf8a09eb11df53929ead49c5a07338 URL: https://github.com/kamailio/kamailio/commit/ea141f0a63cf8a09eb11df53929ead4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T15:35:47+02:00 jsonrpcs: cast to unsigned long, related to commit e624cbfa4b0df --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ea141f0a63cf8a09eb11df53929ead4… Patch: https://github.com/kamailio/kamailio/commit/ea141f0a63cf8a09eb11df53929ead4… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index da5f199fb6..d939be5d0f 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1011,7 +1011,7 @@ static struct rpc_delayed_ctx* jsonrpc_delayed_ctx_new(jsonrpc_ctx_t* ctx) return 0; } if(nj->valuestring!=NULL && strlen(nj->valuestring)>JSONRPC_ID_SIZE-1) { - LM_ERR("id attribute is too long (%lu/%d)\n", (long)strlen(nj->valuestring), + LM_ERR("id attribute is too long (%lu/%d)\n", (unsigned long)strlen(nj->valuestring), JSONRPC_ID_SIZE); return 0; }

1 0

git:master:074c7ce1: smsops: cast to unsigned long, related to commit a61e04757d5f
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: 074c7ce165704aaea0d5ec3cd0d920656c1cd255 URL: https://github.com/kamailio/kamailio/commit/074c7ce165704aaea0d5ec3cd0d9206… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T15:35:47+02:00 smsops: cast to unsigned long, related to commit a61e04757d5f --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/074c7ce165704aaea0d5ec3cd0d9206… Patch: https://github.com/kamailio/kamailio/commit/074c7ce165704aaea0d5ec3cd0d9206… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index be341b13f3..8dfe70163a 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -469,7 +469,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { if (!rp_data) { rp_data = (sms_rp_data_t*)pkg_malloc(sizeof(struct _sms_rp_data)); if (!rp_data) { - LM_ERR("Error allocating %lu bytes!\n", (long)sizeof(struct _sms_rp_data)); + LM_ERR("Error allocating %lu bytes!\n", (unsigned long)sizeof(struct _sms_rp_data)); return -1; } } else { @@ -846,7 +846,7 @@ int pv_set_sms(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) if (!rp_send_data) { rp_send_data = (sms_rp_data_t*)pkg_malloc(sizeof(struct _sms_rp_data)); if (!rp_send_data) { - LM_ERR("Error allocating %lu bytes!\n", (long)sizeof(struct _sms_rp_data)); + LM_ERR("Error allocating %lu bytes!\n", (unsigned long)sizeof(struct _sms_rp_data)); return -1; } // Initialize structure:

1 0

git:master:ed0bc07d: call_obj: cast to unsigned long, related to commit 2a2780cb6b04
by Henning Westerholt 25 Sep '19

25 Sep '19

Module: kamailio Branch: master Commit: ed0bc07dd66f954757695eebbcd7e49dc5333a9d URL: https://github.com/kamailio/kamailio/commit/ed0bc07dd66f954757695eebbcd7e49… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-25T15:35:47+02:00 call_obj: cast to unsigned long, related to commit 2a2780cb6b04 --- Modified: src/modules/call_obj/cobj.c --- Diff: https://github.com/kamailio/kamailio/commit/ed0bc07dd66f954757695eebbcd7e49… Patch: https://github.com/kamailio/kamailio/commit/ed0bc07dd66f954757695eebbcd7e49… --- diff --git a/src/modules/call_obj/cobj.c b/src/modules/call_obj/cobj.c index 1d513ded77..fc839bf3d7 100644 --- a/src/modules/call_obj/cobj.c +++ b/src/modules/call_obj/cobj.c @@ -112,15 +112,15 @@ int cobj_init(int start, int end) size_t total_size = (1 + end - start); /* [start, end] */ size_t array_size = total_size * sizeof(co_object_t); - LM_DBG("Element size: %lu\n", (long)sizeof(co_object_t)); - LM_DBG("List element size: %lu\n", (long)sizeof(cobj_elem_t)); + LM_DBG("Element size: %lu\n", (unsigned long)sizeof(co_object_t)); + LM_DBG("List element size: %lu\n", (unsigned long)sizeof(cobj_elem_t)); co_data->ring = (co_object_t*)shm_malloc(array_size); if (!co_data->ring) { LM_ERR("Cannot allocate shm memory for ring in call object\n"); return -1; } - LM_DBG("Allocated %lu bytes for the ring\n", (long)array_size); + LM_DBG("Allocated %lu bytes for the ring\n", (unsigned long)array_size); /* * Initialize lock.

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019