sr-dev December 2019

sr-dev@lists.kamailio.org

19 participants
279 discussions

git:master:46e4389a: pv_headers: add clang-format directives to skip format on kemi_exports

by Victor Seva

Module: kamailio Branch: master Commit: 46e4389a8d4f546041cc0056473ef3fa7ebade63 URL: https://github.com/kamailio/kamailio/commit/46e4389a8d4f546041cc0056473ef3f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-09T08:59:41+01:00 pv_headers: add clang-format directives to skip format on kemi_exports format is important for generating docs by our python tool --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/46e4389a8d4f546041cc0056473ef3f… Patch: https://github.com/kamailio/kamailio/commit/46e4389a8d4f546041cc0056473ef3f… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index 999802c127..9c383220e1 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -313,6 +313,7 @@ int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb) return 1; } +/* clang-format off */ static sr_kemi_t pvh_kemi_exports[] = { { str_init("pv_headers"), str_init("pvh_collect_headers"), SR_KEMIP_INT, ki_pvh_collect_headers, @@ -351,6 +352,7 @@ static sr_kemi_t pvh_kemi_exports[] = { }, {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}} }; +/* clang-format on */ int mod_register(char *path, int *dlflags, void *p1, void *p2) {

4 years, 5 months

[kamailio/kamailio] KEMI record_route_preset requires 2 parameters instead of 1 (#2171)

by Whitey

### Description Hi all! It looks like in https://github.com/kamailio/kamailio/pull/2051 `record_route_preset` was exposed to KEMI, which is awesome (thank you @aalba6675 !). However the second parameter in this function should be optional (see https://kamailio.org/docs/modules/devel/modules/rr.html#rr.f.record_route_p…). ### Troubleshooting When using with a single parameter, the following error is thrown: `Dec 9 13:24:13 ip-10-0-0-1 /usr/local/sbin/kamailio[15828]: ERROR: app_ruby [app_ruby_api.c:499]: sr_kemi_ruby_exec_func_ex(): invalid str parameter type 2 (1)` #### Reproduction (ruby Kemi) ```ruby # Failure KSR::RR.record_route_preset('1.2.3.4:5060') # Success KSR::RR.record_route_preset('1.2.3.4:5060', '') # Success KSR::RR.record_route_preset('1.2.3.4:5060', '1.2.3.4:5060') ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.0-dev2 (x86_64/linux) 283e46-dirty ``` -- 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/2171

4 years, 5 months

git:master:b05b0891: rr: exported to kemi record_route_preset_one()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b05b0891d890d55b649d19ec22105b2bdcfd3ba5 URL: https://github.com/kamailio/kamailio/commit/b05b0891d890d55b649d19ec22105b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T07:03:18+01:00 rr: exported to kemi record_route_preset_one() - the variant for record_route_preset() with one parameter - GH #2171 --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b05b0891d890d55b649d19ec22105b2… Patch: https://github.com/kamailio/kamailio/commit/b05b0891d890d55b649d19ec22105b2… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 31a6031a5f..6ed7cd8131 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -292,26 +292,45 @@ static int ki_record_route(sip_msg_t *msg) } /** - * wrapper for record_route_preset(msg, key1, key2) + * wrapper for record_route_preset(msg, addr1, addr2) */ -static int ki_record_route_preset(sip_msg_t *msg, str *key1, str *key2) +static int ki_record_route_preset(sip_msg_t *msg, str *addr1, str *addr2) { if (msg->msg_flags & FL_RR_ADDED) { LM_ERR("Double attempt to record-route\n"); return -1; } - if (key2 && !enable_double_rr) { + if (addr2 && addr2->len>0 && !enable_double_rr) { LM_ERR("Attempt to double record-route while 'enable_double_rr' param is disabled\n"); return -1; } - if ( record_route_preset( msg, key1)<0 ) + if ( record_route_preset(msg, addr1)<0 ) return -1; - if (!key2) + if (!addr2 || addr2->len<=0) goto done; - if ( record_route_preset( msg, key2)<0 ) + if ( record_route_preset(msg, addr2)<0 ) + return -1; + +done: + msg->msg_flags |= FL_RR_ADDED; + return 1; + +} + +/** + * wrapper for record_route_preset(msg, addr1) + */ +static int ki_record_route_preset_one(sip_msg_t *msg, str *addr1) +{ + if (msg->msg_flags & FL_RR_ADDED) { + LM_ERR("Double attempt to record-route\n"); + return -1; + } + + if ( record_route_preset( msg, addr1)<0 ) return -1; done: @@ -776,6 +795,11 @@ static sr_kemi_t sr_kemi_rr_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("rr"), str_init("record_route_preset_one"), + SR_KEMIP_INT, ki_record_route_preset_one, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("rr"), str_init("record_route_preset"), SR_KEMIP_INT, ki_record_route_preset, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

4 years, 5 months

git:master:0c29f0e3: pv_headers: fixed kemi export for pvh_append_header()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0c29f0e36b5b287266b5180efac14d4366fbe272 URL: https://github.com/kamailio/kamailio/commit/0c29f0e36b5b287266b5180efac14d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-09T07:00:51+01:00 pv_headers: fixed kemi export for pvh_append_header() - reformat kemi exports structure to be able to parse with python tool for generating docs --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/0c29f0e36b5b287266b5180efac14d4… Patch: https://github.com/kamailio/kamailio/commit/0c29f0e36b5b287266b5180efac14d4… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index 97308479ce..999802c127 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -314,35 +314,43 @@ int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb) } static sr_kemi_t pvh_kemi_exports[] = { - {str_init("pv_headers"), str_init("pvh_collect_headers"), SR_KEMIP_INT, - ki_pvh_collect_headers, - {SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_apply_headers"), SR_KEMIP_INT, - ki_pvh_apply_headers, - {SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_reset_headers"), SR_KEMIP_INT, - pvh_reset_headers, - {SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_check_header"), SR_KEMIP_INT, - pvh_check_header, - {SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_append_header"), SR_KEMIP_INT, - pvh_check_header, - {SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_modify_header"), SR_KEMIP_INT, - pvh_modify_header, - {SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {str_init("pv_headers"), str_init("pvh_remove_header"), SR_KEMIP_INT, - pvh_remove_header, - {SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, - {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}}}; + { str_init("pv_headers"), str_init("pvh_collect_headers"), + SR_KEMIP_INT, ki_pvh_collect_headers, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_apply_headers"), + SR_KEMIP_INT, ki_pvh_apply_headers, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_reset_headers"), + SR_KEMIP_INT, pvh_reset_headers, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_check_header"), + SR_KEMIP_INT, pvh_check_header, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_append_header"), + SR_KEMIP_INT, pvh_append_header, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_modify_header"), + SR_KEMIP_INT, pvh_modify_header, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + { str_init("pv_headers"), str_init("pvh_remove_header"), + SR_KEMIP_INT, pvh_remove_header, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE} + }, + {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}} +}; int mod_register(char *path, int *dlflags, void *p1, void *p2) {

4 years, 5 months

[kamailio/kamailio] dispatcher: select using IP proto (#2170)

by sergey-safarov

### Description Some daemon not able to handle IPv4 and IPv6 calls simultaneously. As example `FreeSwitch`. Need to create two dispatcher records for IPv4 and IPv6 FreeSwitch sockets. Each socket will be able to handle appropriate call type. Mixing not allowed. Could you add `dispatcher` module options to compare used IP version for incoming call and for dispatcher backend sip uri. And select backend only if IP versions matched. -- 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/2170

4 years, 5 months

git:master:64f43879: pkg/kamailio/obs: packaged pv_headers module

by Sergey Safarov

Module: kamailio Branch: master Commit: 64f4387952fee51a696dd0906ce0f8020fbe204a URL: https://github.com/kamailio/kamailio/commit/64f4387952fee51a696dd0906ce0f80… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-06T17:15:19+03:00 pkg/kamailio/obs: packaged pv_headers module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/64f4387952fee51a696dd0906ce0f80… Patch: https://github.com/kamailio/kamailio/commit/64f4387952fee51a696dd0906ce0f80… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f5c8bd5e41..89c6d849b1 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1553,6 +1553,7 @@ fi %doc %{_docdir}/kamailio/modules/README.print %doc %{_docdir}/kamailio/modules/README.print_lib %doc %{_docdir}/kamailio/modules/README.pv +%doc %{_docdir}/kamailio/modules/README.pv_headers %doc %{_docdir}/kamailio/modules/README.pua_rpc %doc %{_docdir}/kamailio/modules/README.qos %doc %{_docdir}/kamailio/modules/README.ratelimit @@ -1711,6 +1712,7 @@ fi %{_libdir}/kamailio/modules/print_lib.so %{_libdir}/kamailio/modules/pua_rpc.so %{_libdir}/kamailio/modules/pv.so +%{_libdir}/kamailio/modules/pv_headers.so %{_libdir}/kamailio/modules/qos.so %{_libdir}/kamailio/modules/ratelimit.so %{_libdir}/kamailio/modules/registrar.so

4 years, 5 months

git:master:7515d64f: janssonrpcc: replaced str dup wrapers with the functions from core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7515d64f6a390e19d6caa1508348e7d21523c582 URL: https://github.com/kamailio/kamailio/commit/7515d64f6a390e19d6caa1508348e7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-06T09:49:51+01:00 janssonrpcc: replaced str dup wrapers with the functions from core - they were basic wrappers and returning variables declared on stack - time conversion inline function replaced with macro --- Modified: src/modules/janssonrpcc/janssonrpc.h Modified: src/modules/janssonrpcc/janssonrpc_funcs.c Modified: src/modules/janssonrpcc/janssonrpc_io.c Modified: src/modules/janssonrpcc/janssonrpc_request.c Modified: src/modules/janssonrpcc/janssonrpc_server.c Modified: src/modules/janssonrpcc/janssonrpc_srv.c --- Diff: https://github.com/kamailio/kamailio/commit/7515d64f6a390e19d6caa1508348e7d… Patch: https://github.com/kamailio/kamailio/commit/7515d64f6a390e19d6caa1508348e7d…

4 years, 5 months

Broken: kamailio/kamailio#8177 (master - 7515d64)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #8177 Status: Broken Duration: 6 mins and 48 secs Commit: 7515d64 (master) Author: Daniel-Constantin Mierla Message: janssonrpcc: replaced str dup wrapers with the functions from core - they were basic wrappers and returning variables declared on stack - time conversion inline function replaced with macro View the changeset: https://github.com/kamailio/kamailio/compare/e03244bd5804...7515d64f6a39 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/621500894?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. 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.

4 years, 5 months

git:master:f6050e23: janssonrpcc: fixed errors from previous commit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f6050e2342c3b7f2c7ede45ce96707a5a45b5aa8 URL: https://github.com/kamailio/kamailio/commit/f6050e2342c3b7f2c7ede45ce96707a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-06T09:57:54+01:00 janssonrpcc: fixed errors from previous commit --- Modified: src/modules/janssonrpcc/janssonrpc.h Modified: src/modules/janssonrpcc/janssonrpc_io.c Modified: src/modules/janssonrpcc/janssonrpc_request.c Modified: src/modules/janssonrpcc/janssonrpc_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f6050e2342c3b7f2c7ede45ce96707a… Patch: https://github.com/kamailio/kamailio/commit/f6050e2342c3b7f2c7ede45ce96707a… --- diff --git a/src/modules/janssonrpcc/janssonrpc.h b/src/modules/janssonrpcc/janssonrpc.h index 32d14a7cb1..d8b6ffbedb 100644 --- a/src/modules/janssonrpcc/janssonrpc.h +++ b/src/modules/janssonrpcc/janssonrpc.h @@ -94,8 +94,8 @@ extern const str null_str; #define jsr_ms_to_tv(ms, tv) \ do { \ memset(&tv, 0, sizeof(struct timeval)); \ - tv.tv_sec = time/1000; \ - tv.tv_usec = ((time % 1000) * 1000); \ + tv.tv_sec = ms/1000; \ + tv.tv_usec = ((ms % 1000) * 1000); \ } while(0) #endif /* _JSONRPC_H_ */ diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index 3818662c4a..ebb64705b5 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -444,7 +444,7 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) free_req_cmd(req->cmd); free_request(req); } else { - const struct timeval tv; + struct timeval tv; jsr_ms_to_tv(req->timeout, tv); req->timeout_ev = evtimer_new(global_ev_base, timeout_cb, (void*)req); diff --git a/src/modules/janssonrpcc/janssonrpc_request.c b/src/modules/janssonrpcc/janssonrpc_request.c index 8cddee5704..ecd43c1476 100644 --- a/src/modules/janssonrpcc/janssonrpc_request.c +++ b/src/modules/janssonrpcc/janssonrpc_request.c @@ -230,7 +230,7 @@ void retry_cb(int fd, short event, void* arg) int schedule_retry(jsonrpc_request_t* req) { - const struct timeval tv; + struct timeval tv; unsigned int ltime; if(!req) { diff --git a/src/modules/janssonrpcc/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c index e8c50cc3fa..6c4b999b50 100644 --- a/src/modules/janssonrpcc/janssonrpc_server.c +++ b/src/modules/janssonrpcc/janssonrpc_server.c @@ -280,7 +280,7 @@ int jsonrpc_server_from_srv(str conn, str srv, server = create_server(); CHECK_MALLOC(server); - shm_str_dup(&server->conn, &/conn); + shm_str_dup(&server->conn, &conn); CHECK_MALLOC_GOTO(server->conn.s, error); shm_str_dup(&server->addr, &name);

4 years, 5 months

git:master:e03244bd: janssonrpcc: fix build warning

by Victor Seva

Module: kamailio Branch: master Commit: e03244bd5804045a0ea06fb1afbd2d8269855c19 URL: https://github.com/kamailio/kamailio/commit/e03244bd5804045a0ea06fb1afbd2d8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-05T20:08:08+01:00 janssonrpcc: fix build warning > In file included from janssonrpc_connect.c:41: > ./janssonrpc.h:98:9: warning: variable 'res' is uninitialized when used here [-Wuninitialized] > return res; > ^~~ > ./janssonrpc.h:96:2: note: variable 'res' is declared here > str res; > ^ > ./janssonrpc.h:105:9: warning: variable 'res' is uninitialized when used here [-Wuninitialized] > return res; > ^~~ > ./janssonrpc.h:103:2: note: variable 'res' is declared here > str res; > ^ > > 2 warnings generated. --- Modified: src/modules/janssonrpcc/janssonrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/e03244bd5804045a0ea06fb1afbd2d8… Patch: https://github.com/kamailio/kamailio/commit/e03244bd5804045a0ea06fb1afbd2d8… --- diff --git a/src/modules/janssonrpcc/janssonrpc.h b/src/modules/janssonrpcc/janssonrpc.h index 3756c817e3..b76e13fbfe 100644 --- a/src/modules/janssonrpcc/janssonrpc.h +++ b/src/modules/janssonrpcc/janssonrpc.h @@ -93,14 +93,14 @@ extern const str null_str; static inline str pkg_strdup(str src) { - str res; + str res = STR_NULL; pkg_str_dup(&src, &res); return res; } static inline str shm_strdup(str src) { - str res; + str res = STR_NULL; shm_str_dup(&src, &res); return res; }

4 years, 5 months

← Newer
1
...
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2019