sr-dev August 2016

sr-dev@lists.kamailio.org

25 participants
198 discussions

git:master:20a4f7e0: permissions: fixed rpc array
by Kelvin Chua 22 Aug '16

22 Aug '16

Module: kamailio Branch: master Commit: 20a4f7e029262a94c5c4bcdc68a90e404b506c98 URL: https://github.com/kamailio/kamailio/commit/20a4f7e029262a94c5c4bcdc68a90e4… Author: Kelvin Chua <kelchy(a)gmail.com> Committer: Kelvin Chua <kelchy(a)gmail.com> Date: 2016-08-20T15:03:09Z permissions: fixed rpc array - added array structure when returning multiple address and subnets --- Modified: modules/permissions/hash.c Modified: modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/20a4f7e029262a94c5c4bcdc68a90e4… Patch: https://github.com/kamailio/kamailio/commit/20a4f7e029262a94c5c4bcdc68a90e4… --- diff --git a/modules/permissions/hash.c b/modules/permissions/hash.c index 9f90bac..e8824f2 100644 --- a/modules/permissions/hash.c +++ b/modules/permissions/hash.c @@ -612,15 +612,15 @@ int addr_hash_table_rpc_print(struct addr_list** table, rpc_t* rpc, void* c) struct addr_list *np; - if (rpc->add(c, "{", &th) < 0) - { - rpc->fault(c, 500, "Internal error creating rpc"); - return -1; - } - for (i = 0; i < PERM_HASH_SIZE; i++) { np = table[i]; while (np) { + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return -1; + } + if(rpc->struct_add(th, "dd{", "table", i, "group", np->grp, @@ -847,13 +847,13 @@ int subnet_table_rpc_print(struct subnet* table, rpc_t* rpc, void* c) count = table[PERM_MAX_SUBNETS].grp; - if (rpc->add(c, "{", &th) < 0) - { - rpc->fault(c, 500, "Internal error creating rpc"); - return -1; - } - for (i = 0; i < count; i++) { + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return -1; + } + if(rpc->struct_add(th, "dd{", "id", i, "group", table[i].grp, diff --git a/modules/permissions/permissions.c b/modules/permissions/permissions.c index b935e37..0445fbb 100644 --- a/modules/permissions/permissions.c +++ b/modules/permissions/permissions.c @@ -1016,8 +1016,8 @@ rpc_export_t permissions_rpc[] = { {"permissions.trustedReload", rpc_trusted_reload, rpc_trusted_reload_doc, 0}, {"permissions.addressReload", rpc_address_reload, rpc_address_reload_doc, 0}, {"permissions.trustedDump", rpc_trusted_dump, rpc_trusted_dump_doc, 0}, - {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, 0}, - {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, 0}, + {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, RET_ARRAY}, + {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, RET_ARRAY}, {"permissions.domainDump", rpc_domain_name_dump, rpc_domain_name_dump_doc, 0}, {"permissions.testUri", rpc_test_uri, rpc_test_uri_doc, 0}, {0, 0, 0, 0}

1 0

[kamailio/kamailio] permissions: fixed rpc array (#755)
by kelchy 22 Aug '16

22 Aug '16

- added array structure when returning multiple address and subnets You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/755 -- Commit Summary -- * permissions: fixed rpc array -- File Changes -- M modules/permissions/hash.c (24) M modules/permissions/permissions.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/755.patch https://github.com/kamailio/kamailio/pull/755.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/755

2 2

T_replicate and tls
by Olle E. Johansson 19 Aug '16

19 Aug '16

Hi! I have this interesting scenario that I’m not sure whether it’s a bug or a hidden feature or just a misunderstanding… The incoming request arrives over TLS to Kamailio. It hits t_replicate(“192.168.40.40”, “5060”); Kamailio now tries to set up a TLS connection to port 5060 which we didn’t anticipate, but looking at the script it makes sense (knowing that Kamailio prefers to use the same transport for the outbound message). I will move that code to using a URI with a specific transport - but I wonder if this should be documented somewhere… At least a warning in the docs. I have succeeded rather well in convincing myself that this is not a bug. Am I right? /O

1 0

[kamailio/kamailio] Async Routes and Route-Types (#750)
by ng-voice GmbH 19 Aug '16

19 Aug '16

Issue: ------------------------------------------ Asynchronous Route Blocks gets executed as a failure_route, even though there never ever was a failure. Version: ------------------------------------------ GIT Trunk (dev), not checked earlier versions. Example Config / how to reproduce ------------------------------------------ I've got the following main route: ``` route { [...] if (is_method("PUBLISH") && search("^(Event|o)([ \t]*):([ \t]*)reg")) { route(PUBLISH); break; } async_sleep("1"); #Set DLG flag to track dialogs using dialog2 if (!is_method("REGISTER|SUBSCRIBE")) setflag(FLT_DIALOG); [...] } ``` With debugger module enabled, it shows as follows in syslog: ``` Aug 17 15:41:09 ubuntu-2gb-fra1-01 [6968]: ERROR: *** cfgtrace:request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=397 a=25 n=is_method Aug 17 15:41:09 ubuntu-2gb-fra1-01 [6968]: ERROR: *** cfgtrace:request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=407 a=16 n=if Aug 17 15:41:09 ubuntu-2gb-fra1-01 [6968]: ERROR: *** cfgtrace:request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=402 a=25 n=is_method Aug 17 15:41:09 ubuntu-2gb-fra1-01 [6968]: ERROR: *** cfgtrace:request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=407 a=25 n=async_sleep Aug 17 15:41:09 ubuntu-2gb-fra1-01 [6975]: ERROR: *** cfgtrace:failure_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=414 a=16 n=if Aug 17 15:41:09 ubuntu-2gb-fra1-01 [6975]: ERROR: *** cfgtrace:failure_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=410 a=25 n=is_method ``` ------------------------------------------ Why is route_type suddenly a failure-route? At a different part of my logic, this leads to unexpected results. Looking at modules/tm/t_suspend.c (lines 277 ff.), I see the reason: ``` route_type_bk = get_route_type(); set_route_type(FAILURE_ROUTE); /* execute the pre/post -script callbacks based on original route block */ if (exec_pre_script_cb(&faked_req, cb_type)>0) { if (run_top_route(route, &faked_req, 0)<0) LM_ERR("failure inside run_top_route\n"); exec_post_script_cb(&faked_req, cb_type); } set_route_type(route_type_bk); ``` Any particular reason, why the route-type is explicitly set to FAILURE_ROUTE? Thanks, Carsten -- 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/750

2 5

[kamailio/kamailio] RPC fix for arrays on permissions module (#751)
by kelchy 19 Aug '16

19 Aug '16

subnet dump and address dump You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/751 -- Commit Summary -- * fix rpc array for address * fix subnet rpc array -- File Changes -- M modules/permissions/hash.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/751.patch https://github.com/kamailio/kamailio/pull/751.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/751

2 5

git:master:cfb806e4: outbound: use pkg-config for libcrypto in makefile
by Daniel-Constantin Mierla 19 Aug '16

19 Aug '16

Module: kamailio Branch: master Commit: cfb806e41ecde8392105a12c4e8ace31f1345352 URL: https://github.com/kamailio/kamailio/commit/cfb806e41ecde8392105a12c4e8ace3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-08-19T09:03:44+02:00 outbound: use pkg-config for libcrypto in makefile --- Modified: modules/outbound/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/cfb806e41ecde8392105a12c4e8ace3… Patch: https://github.com/kamailio/kamailio/commit/cfb806e41ecde8392105a12c4e8ace3… --- diff --git a/modules/outbound/Makefile b/modules/outbound/Makefile index df43360..4f6f0f3 100644 --- a/modules/outbound/Makefile +++ b/modules/outbound/Makefile @@ -1,4 +1,4 @@ -# +# # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs @@ -6,15 +6,32 @@ auto_gen= NAME=outbound.so ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +endif + +ifneq ($(BUILDER),) SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) + +CRYPTO_BUILDER=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'pkg-config libcrypto'; \ + fi) endif +ifneq ($(BUILDER),) + ifneq ($(SSL_BUILDER),) DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs) +endif +ifneq ($(CRYPTO_BUILDER),) + DEFS += $(shell $(CRYPTO_BUILDER) --cflags) + LIBS += $(shell $(CRYPTO_BUILDER) --libs) +endif + else DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \

1 0

git:master:d61ff2e4: core: fix some logging in tcp_read.c
by Dragos Oancea 17 Aug '16

17 Aug '16

Module: kamailio Branch: master Commit: d61ff2e4cf49479a811019c2f01ace46344cacc2 URL: https://github.com/kamailio/kamailio/commit/d61ff2e4cf49479a811019c2f01ace4… Author: Dragos Oancea <dragos.oancea(a)athonet.com> Committer: Dragos Oancea <dragos.oancea(a)athonet.com> Date: 2016-08-17T11:15:19+02:00 core: fix some logging in tcp_read.c --- Modified: tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/d61ff2e4cf49479a811019c2f01ace4… Patch: https://github.com/kamailio/kamailio/commit/d61ff2e4cf49479a811019c2f01ace4… --- diff --git a/tcp_read.c b/tcp_read.c index 499db29..a31d3a2 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -287,11 +287,10 @@ int tcp_read_data(int fd, struct tcp_connection *c, } } LOG(cfg_get(core, core_cfg, corelog), - "error reading: %s (%d) ([%s]:%u -> [%s]:%u)\n", + "error reading: %s (%d) ([%s]:%u ->", strerror(errno), errno, - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); - + ip_addr2a(&c->rcv.src_ip), c->rcv.src_port); + LOG(cfg_get(core, core_cfg, corelog),"-> [%s]:%u)\n", ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); if((errno == ECONNRESET || errno == ETIMEDOUT) && likely(c->rcv.proto_reserved1 != 0)){ tcp_make_closed_event(&c->rcv, c); } @@ -305,9 +304,8 @@ int tcp_read_data(int fd, struct tcp_connection *c, if (likely(c->rcv.proto_reserved1 != 0)){ tcp_make_closed_event(&c->rcv, c); } - LM_DBG("EOF on %p, FD %d ([%s]:%u -> [%s]:%u)\n", c, fd, - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); + LM_DBG("EOF on %p, FD %d ([%s]:%u ->", c, fd, ip_addr2a(&c->rcv.src_ip), c->rcv.src_port); + LM_DBG("-> [%s]:%u)\n", ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); }else{ if (unlikely(c->state==S_CONN_CONNECT || c->state==S_CONN_ACCEPT)){ TCP_STATS_ESTABLISHED(c->state);

1 0

git:master:ec25a62f: Merge pull request #749 from athonet-open/fix__log_tcp
by GitHub 17 Aug '16

17 Aug '16

Module: kamailio Branch: master Commit: ec25a62f059584b5e653e319169f03fc63b25848 URL: https://github.com/kamailio/kamailio/commit/ec25a62f059584b5e653e319169f03f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-17T11:49:22+02:00 Merge pull request #749 from athonet-open/fix__log_tcp core: fix some logging in tcp_read.c --- Modified: tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/ec25a62f059584b5e653e319169f03f… Patch: https://github.com/kamailio/kamailio/commit/ec25a62f059584b5e653e319169f03f… --- diff --git a/tcp_read.c b/tcp_read.c index 499db29..a31d3a2 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -287,11 +287,10 @@ int tcp_read_data(int fd, struct tcp_connection *c, } } LOG(cfg_get(core, core_cfg, corelog), - "error reading: %s (%d) ([%s]:%u -> [%s]:%u)\n", + "error reading: %s (%d) ([%s]:%u ->", strerror(errno), errno, - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); - + ip_addr2a(&c->rcv.src_ip), c->rcv.src_port); + LOG(cfg_get(core, core_cfg, corelog),"-> [%s]:%u)\n", ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); if((errno == ECONNRESET || errno == ETIMEDOUT) && likely(c->rcv.proto_reserved1 != 0)){ tcp_make_closed_event(&c->rcv, c); } @@ -305,9 +304,8 @@ int tcp_read_data(int fd, struct tcp_connection *c, if (likely(c->rcv.proto_reserved1 != 0)){ tcp_make_closed_event(&c->rcv, c); } - LM_DBG("EOF on %p, FD %d ([%s]:%u -> [%s]:%u)\n", c, fd, - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); + LM_DBG("EOF on %p, FD %d ([%s]:%u ->", c, fd, ip_addr2a(&c->rcv.src_ip), c->rcv.src_port); + LM_DBG("-> [%s]:%u)\n", ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); }else{ if (unlikely(c->state==S_CONN_CONNECT || c->state==S_CONN_ACCEPT)){ TCP_STATS_ESTABLISHED(c->state);

1 0

[kamailio/kamailio] core: fix some logging in tcp_read.c (#749)
by Dragos Oancea 17 Aug '16

17 Aug '16

This patch to emphasize that ip_addr2a() uses a static buffer and because of this lots of log lines in tcp_read.c print the same IP as src and dst . It can be confusing when debugging TCP connections. Practically LM_DBG or LOG print the same buffer twice in these cases. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/749 -- Commit Summary -- * core: fix some logging in tcp_read.c -- File Changes -- M tcp_read.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/749.patch https://github.com/kamailio/kamailio/pull/749.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/749

2 2

[kamailio/kamailio] modules/siptrace: fix parsing of unsecure ws uris (#746)
by Sebastian Denz 15 Aug '16

15 Aug '16

due to missing adaption of cutlen, the first decimal number of the ip address is cut off when using 'ws:' uris You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/746 -- Commit Summary -- * modules/siptrace: fix parsing of unsecure ws uris -- File Changes -- M modules/siptrace/siptrace.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/746.patch https://github.com/kamailio/kamailio/pull/746.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/746

2 2

← Newer
1
...
11
12
13
14
15
16
17
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2016