sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
380 discussions

git:master:ca546d35: core: make dst_uri null terminated

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ca546d35c326666c6389c84ce45214bd2fc5c147 URL: https://github.com/kamailio/kamailio/commit/ca546d35c326666c6389c84ce45214b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-20T18:06:22+01:00 core: make dst_uri null terminated --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/ca546d35c326666c6389c84ce45214b… Patch: https://github.com/kamailio/kamailio/commit/ca546d35c326666c6389c84ce45214b… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 281c8ad783..91095bf574 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -749,7 +749,7 @@ int set_dst_uri(struct sip_msg* const msg, const str* const uri) memcpy(msg->dst_uri.s, uri->s, uri->len); msg->dst_uri.len = uri->len; } else { - ptr = (char*)pkg_malloc(uri->len); + ptr = (char*)pkg_malloc(uri->len + 1); if (!ptr) { PKG_MEM_ERROR; return -1; @@ -759,6 +759,7 @@ int set_dst_uri(struct sip_msg* const msg, const str* const uri) if (msg->dst_uri.s) pkg_free(msg->dst_uri.s); msg->dst_uri.s = ptr; msg->dst_uri.len = uri->len; + msg->dst_uri.s[msg->dst_uri.len] = '\0'; } return 0; }

5 years

[kamailio/kamailio] s.select transformation not returning null for nonexistent indexes (#2128)

by pwakano

### Description When trying to iterate over a semi-colon separated string list, the s.select transformation seems to be returning empty string instead of null, so the suggested idea from here does not work -> https://www.kamailio.org/wiki/tutorials/faq/main#how_to_iterate_through_the… It is expected that the access to an invalid index would return null. ### Troubleshooting avp and var variables were tried and both had the same result. ### Reproduction Original piece of code is below. The while loop will run until the max_while_loops is reached. The "DEBUG" log line will print the loop iterator value and an empty string for nonexistent values. ``` $var(allowed_headers) = "X-header1; X-header2;"; if (not_empty("$var(allowed_headers)")) { xlog("L_NOTICE","Forwarding headers: $avp(allowed_headers)\n"); $var(i) = 0; while($(var(allowed_headers){s.select,$var(i),;}) != $null) { xlog("L_NOTICE","DEBUG: $var(i) - $(var(allowed_headers){s.select,$var(i),;})\n"); $var(hdr) = $(var(allowed_headers){s.select,$var(i),;}{s.trim}); if (not_empty("$var(hdr)") && not_empty("$(hdr($var(hdr)))")) { xlog("L_NOTICE","Header: $var(hdr): $(hdr($var(hdr))) allowed\n"); append_hf("$var(hdr): $(hdr($var(hdr)))\r\n"); } $var(i) = $var(i) + 1; } } ``` It is also possible to simulate it by simply doing this: ``` $var(allowed_headers) = "X-header1; X-header2;"; if ($(var(allowed_headers){s.select,100,;}) != $null) { xlog("L_ERR","THIS IS WRONG :("); } ``` ### Possible Solutions Other while conditions can be done. but this is the most elegant and is not working.... For example, checking with "not_empty" works, but then we can't actually have empty values in the semi-colon separated list because it would stop the loop and entries after that would not be reached.... ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.2.2 (x86_64/linux) 67f967 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 67f967 compiled on 11:40:41 Mar 11 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` # uname -a Linux voice-conn-kamailio-1 3.10.0-514.21.2.el7.x86_64 #1 SMP Tue Jun 20 12:24:47 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2128

5 years

[kamailio/kamailio] build warnings on modern dists (#2135)

by sergey-safarov

### Description On `Fedora 31` dist master build log contains this warnings ``` make --no-print-directory -C ./squirrel/squirrel SQMARCH64="-m64" CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" sq64 gcc -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c sqapi.cpp sqbaselib.cpp sqfuncstate.cpp sqdebug.cpp sqlexer.cpp sqobject.cpp sqcompiler.cpp sqstate.cpp sqtable.cpp sqmem.cpp sqvm.cpp sqclass.cpp -I../include -I. -Iinclude -fPIC In file included from sqobject.h:5, from sqpcheader.h:17, from sqapi.cpp:4: squtils.h: In instantiation of 'void sqvector::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqapi.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqbaselib.cpp:4: squtils.h: In instantiation of 'void sqvector::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqbaselib.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqobject.cpp:4: squtils.h: In instantiation of 'void sqvector::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqobject.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqstate.cpp:4: squtils.h: In instantiation of 'void sqvector::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqstate.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqvm.cpp:4: squtils.h: In instantiation of 'void sqvector::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqvm.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ ar rc ../../libsquirrel.a *.o ``` -- 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/2135

5 years

Broken: sergey-safarov/kamailio#160 (master - 297e7aa)

by Travis CI

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #160 Status: Broken Duration: 3 mins and 29 secs Commit: 297e7aa (master) Author: Sergey Safarov Message: src/modules/app_sqlang: used shared lib for Squirrel module View the changeset: https://github.com/sergey-safarov/kamailio/compare/b0fc60403b53...297e7aa7e… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/614110986?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

5 years

git:master:b0fc6040: app_sqlang: imported latest squirrel interpreter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b0fc60403b539672c6a2638083e8955783c65e0b URL: https://github.com/kamailio/kamailio/commit/b0fc60403b539672c6a2638083e8955… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-19T15:34:00+01:00 app_sqlang: imported latest squirrel interpreter --- Modified: src/modules/app_sqlang/squirrel/include/sqstdaux.h Modified: src/modules/app_sqlang/squirrel/include/sqstdstring.h Modified: src/modules/app_sqlang/squirrel/include/squirrel.h Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdaux.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqapi.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqcompiler.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqfuncstate.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqfuncstate.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqobject.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp --- Diff: https://github.com/kamailio/kamailio/commit/b0fc60403b539672c6a2638083e8955… Patch: https://github.com/kamailio/kamailio/commit/b0fc60403b539672c6a2638083e8955…

5 years

Kamailio meeting Istanbul and Cairo

by Henning Westerholt

Hello, I will be in about 2 weeks in Istanbul and in Cairo a few days later. I am thinking of organizing a Kamailio/SIP/VoIP social networking event (perhaps a dinner or a pub meeting). Possible dates are the 19th- 20th November in Istanbul and the 23th - 24th November in Cairo. Are people from the community interested in joining such event? If yes, write me your preferred date -- based on feedback in the next days, it will be decided whether it is going to happen and when. Best regards, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

5 years

git:master:9d59f5cb: dispatcher: new variable $dsv(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9d59f5cbb7896ad5a6077b94a418bfdc7e2ef374 URL: https://github.com/kamailio/kamailio/commit/9d59f5cbb7896ad5a6077b94a418bfd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-19T10:15:15+01:00 dispatcher: new variable $dsv(...) - access attributes related to response code when executing event routes - $dsv(code) - the response code that triggered execution of the event_route dispatcher:dst-up or dispatcher:dst-down - $dsv(reason) - the response reason; $dsv(flags) - internal flags set during event route execution --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/9d59f5cbb7896ad5a6077b94a418bfd… Patch: https://github.com/kamailio/kamailio/commit/9d59f5cbb7896ad5a6077b94a418bfd…

5 years

[kamailio/kamailio] Unable to pass Extra parameter to IMS_CHARGING module (#2138)

by harishyadav1465

**Version** : kamailio 4.2 **platform** : linux **Description** Currently I am using **ims_charging** module ...so from the script we are calling **RO_CCR(6 param)** function ..Until this point it is working fine But the problem occurs when i am passing extra parameter in **RO_CCR(7 param)** function,we are getting **Too many arguments error** from the script **BUT** we made appropriate changes in ims_charging for this.please see the below code changes for more info. **static int **w_ro_ccr****(struct sip_msg *msg, str* route_name, str* direction, str* charge_type, str* unit_type, int reservation_units, char *_d,char *cpaas); static cmd_export_t cmds[] = { { "Ro_CCR", (cmd_function) **w_ro_ccr**,7, ro_fixup, 0, REQUEST_ROUTE }, { 0, 0, 0, 0, 0, 0} }; -- 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/2138

5 years

[kamailio/kamailio] listen advertise using ACL (#2131)

by sergey-safarov

### Description **Use case** Kamailio installed in AWS cloud. Exist phones located in internet and exist phones connected via VPN. As option, also may exist phones connected via docker VxLAN or any other Kubernetes providers. I want use same `listen` for all this connections types. Need to `advertise` different IP for each connection type. Could you add ability advertise different IP using ACL info. As example ``` listen=udp:eth0:5060 advertise 192.168.34.34:5060 for_acl 0 listen=udp:eth0:5060 advertise 172.16.20.41:5060 for_acl 1 listen=udp:eth0:5060 advertise 10.14.11.4:5060 for_acl 2 listen=udp:eth0:5060 advertise 52.24.22.57:5060 ``` ### Expected behavior Kamailio will apply different `advertise` option dependent of source IP of incoming packet. #### Actual observed behavior Listener support only one `advertise` param. -- 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/2131

5 years

git:5.3:404c3ee3: utils/db_berkeley: fixed unused var

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: 404c3ee38b6158d755f196c66f69eeee234f97e2 URL: https://github.com/kamailio/kamailio/commit/404c3ee38b6158d755f196c66f69eee… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-18T20:09:38+01:00 utils/db_berkeley: fixed unused var kambdb_recover.c: In function 'load_metadata_columns': kambdb_recover.c:819:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] 819 | int ret,n,len; | ^~~ (cherry picked from commit 792261b43d74518e6d67f807df60b6622ba2d9f8) --- Modified: utils/db_berkeley/kambdb_recover.c --- Diff: https://github.com/kamailio/kamailio/commit/404c3ee38b6158d755f196c66f69eee… Patch: https://github.com/kamailio/kamailio/commit/404c3ee38b6158d755f196c66f69eee… --- diff --git a/utils/db_berkeley/kambdb_recover.c b/utils/db_berkeley/kambdb_recover.c index 30733a01ff..a3fa82dfd6 100644 --- a/utils/db_berkeley/kambdb_recover.c +++ b/utils/db_berkeley/kambdb_recover.c @@ -816,11 +816,11 @@ table_p create_table(char *_s) */ int load_metadata_columns(table_p _tp, char* line) { - int ret,n,len; + int n,len; char *s = NULL; char cn[64], ct[16]; column_p col; - ret = n = len = 0; + n = len = 0; if(!_tp) return -1; if(_tp->ncols!=0) return 0;

5 years

← Newer
1
...
23
24
25
26
27
28
29
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019