[sr-dev] git:master:0aaa50ce: modules: readme files regenerated - jsonrpcs ... [skip ci]
Module: kamailio Branch: master Commit: 0aaa50ce82030861bcc3bf5a300b7d0a96a61f0b URL: https://github.com/kamailio/kamailio/commit/0aaa50ce82030861bcc3bf5a300b7d0a96a61f0b Author: Kamailio DevCommitter: Kamailio Dev Date: 2018-03-24T04:31:31+01:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/0aaa50ce82030861bcc3bf5a300b7d0a96a61f0b.diff Patch: https://github.com/kamailio/kamailio/commit/0aaa50ce82030861bcc3bf5a300b7d0a96a61f0b.patch --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index af8df91880..59164a28d1 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -397,6 +397,7 @@ event_route[xhttp:request] { Example 1.15. jsonrpc_exec usage ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); +xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); ... 6. JSONRPC Commands ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:0fcac52f: jsonrpcs: example accessing the jsonrpc response for jsonrpc_exec()
Module: kamailio Branch: master Commit: 0fcac52fc9e6445f986c9a5a9ee1b5230030035b URL: https://github.com/kamailio/kamailio/commit/0fcac52fc9e6445f986c9a5a9ee1b5230030035b Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-24T04:21:12+01:00 jsonrpcs: example accessing the jsonrpc response for jsonrpc_exec() --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0fcac52fc9e6445f986c9a5a9ee1b5230030035b.diff Patch: https://github.com/kamailio/kamailio/commit/0fcac52fc9e6445f986c9a5a9ee1b5230030035b.patch --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index fa51c62f54..4b64db557e 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -459,6 +459,7 @@ event_route[xhttp:request] { ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); +xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); ... ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] app_java: gcj is been removed from gcc since gcc7 (#1487)
While I don't use app_java at all, I did some work to at least get it to build on modern Fedora 27 systems without GCJ and with the following patch and spec: https://messinet.com/rpms/browser/kamailio/app_java.patch, https://messinet.com/rpms/browser/kamailio/kamailio.spec Though even with that patch it probably my builds probably wouldn't work--the build is filled with lots of incompatible pointer type warnings like the following so the code probably needs some modernizing too. ``` BUILDSTDERR: java_msgobj.c: In function 'fill_sipmsg_object': BUILDSTDERR: java_msgobj.c:83:27: warning: passing argument 2 of '(*env)->SetIntField' from incompatible pointer type [-Wincompatible-pointer-types] BUILDSTDERR: (*env)->SetIntField(env, SipMsgInstance, fid, msg->id); ``` -- 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/1487#issuecomment-375822982___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Support for 192.0.0.0/29 as NATed source (#1488)
Closed #1488. -- 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/1488#event-1538734835___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Support for 192.0.0.0/29 as NATed source (#1488)
Thank you. I have merged your pull request manually to git master, closed -- 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/1488#issuecomment-375794740___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:804d6b85: nathelper: Support for 192.0.0.0/29 as NATed source (pull request GH#1488)
Module: kamailio Branch: master Commit: 804d6b85bdbe55b32edacdbd895b0ad763bf619f URL: https://github.com/kamailio/kamailio/commit/804d6b85bdbe55b32edacdbd895b0ad763bf619f Author: Henning WesterholtCommitter: Henning Westerholt Date: 2018-03-23T21:49:17+01:00 nathelper: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/804d6b85bdbe55b32edacdbd895b0ad763bf619f.diff Patch: https://github.com/kamailio/kamailio/commit/804d6b85bdbe55b32edacdbd895b0ad763bf619f.patch --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index a45588a50d..935c981ee8 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -148,6 +148,7 @@ static struct { {"172.16.0.0", 0, 0xu << 20}, {"192.168.0.0", 0, 0xu << 16}, {"100.64.0.0", 0, 0xu << 22}, /* rfc6598 - cg-nat */ + {"192.0.0.0", 0, 0xu << 3}, /* rfc7335 - IPv4 Service Continuity Prefix */ {NULL, 0, 0} }; /* clang-format on */ ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:32f1671b: nat_traversal: Support for 192.0.0.0/29 as NATed source (pull request GH#1488)
Module: kamailio Branch: master Commit: 32f1671bee21d5f8d52b5febf50ddc7b26f6919a URL: https://github.com/kamailio/kamailio/commit/32f1671bee21d5f8d52b5febf50ddc7b26f6919a Author: Henning WesterholtCommitter: Henning Westerholt Date: 2018-03-23T21:48:55+01:00 nat_traversal: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/32f1671bee21d5f8d52b5febf50ddc7b26f6919a.diff Patch: https://github.com/kamailio/kamailio/commit/32f1671bee21d5f8d52b5febf50ddc7b26f6919a.patch --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index ead4c696fe..3b2924b575 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -258,6 +258,7 @@ static NetInfo rfc1918nets[] = { {"172.16.0.0", 0xac10UL, 0xfff0UL}, {"192.168.0.0", 0xc0a8UL, 0xUL}, {"100.64.0.0", 0x6440UL, 0xffc0UL}, // include rfc6598 shared address space as technically the same for our purpose + {"192.0.0.0", 0xc000UL, 0xfff8UL}, // include rfc7335 IPv4 Service Continuity Prefix {NULL, 0UL, 0UL} }; ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:3848b528: ipops: Support for 192.0.0.0/29 as NATed source (pull request GH#1488)
Module: kamailio Branch: master Commit: 3848b5286b74894ed162e1aae8c80ee3d703c21f URL: https://github.com/kamailio/kamailio/commit/3848b5286b74894ed162e1aae8c80ee3d703c21f Author: Henning WesterholtCommitter: Henning Westerholt Date: 2018-03-23T21:43:11+01:00 ipops: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) --- Modified: src/modules/ipops/detailed_ip_type.c Modified: src/modules/ipops/detailed_ip_type.h --- Diff: https://github.com/kamailio/kamailio/commit/3848b5286b74894ed162e1aae8c80ee3d703c21f.diff Patch: https://github.com/kamailio/kamailio/commit/3848b5286b74894ed162e1aae8c80ee3d703c21f.patch --- diff --git a/src/modules/ipops/detailed_ip_type.c b/src/modules/ipops/detailed_ip_type.c index a37c4aaccd..529645e990 100644 --- a/src/modules/ipops/detailed_ip_type.c +++ b/src/modules/ipops/detailed_ip_type.c @@ -41,6 +41,7 @@ static ip4_node IPv4ranges[IPv4RANGES_SIZE] = { { 0xc0586300, "6TO4-RELAY", 0xff00 }, // 192.88.99.0/24 { 0xc200, "TEST-NET", 0xff00 }, // 192.0.2/24 { 0xc000, "RESERVED", 0xff00 }, // 192.0.0/24 +{ 0xc000, "6TO4-RELAY", 0xfff8 }, // 192.0.0.0/29 { 0xc0a8, "PRIVATE",0x }, // 192.168/16 { 0xa9fe, "LINK-LOCAL", 0x }, // 169.254/16 { 0xc612, "RESERVED", 0xfffe }, // 198.18/15 diff --git a/src/modules/ipops/detailed_ip_type.h b/src/modules/ipops/detailed_ip_type.h index 35672b9297..36cdce382a 100644 --- a/src/modules/ipops/detailed_ip_type.h +++ b/src/modules/ipops/detailed_ip_type.h @@ -25,7 +25,7 @@ #ifndef _IPOPS_DETAILED_IP_TYPE_H #define _IPOPS_DETAILED_IP_TYPE_H -#define IPv4RANGES_SIZE 16 +#define IPv4RANGES_SIZE 17 #define IPv6RANGES_SIZE 29 #include ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Support for 192.0.0.0/29 as NATed source (#1488)
henningw approved this pull request. Thank you, looks good. Next time please split the change to two commits, one per module. -- 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/1488#pullrequestreview-106639539___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] [WIP] tls: add support for OpenSSL engine and private keys in HSM (#1484)
Thanks for the comments - I have replaced malloc/free in the mapping utilities with `pkg_malloc()/pkg_free()`. Re: "I did not fully understand why you need this here, maybe you can elaborate a bit on the requirements of the HSM child_init." Background: For soft keys, we initialize the SSL_CTX `d->ctx[i]` in PROC_INIT, then fork(). All SSL_CTX objects are now completely initialized and can be used as-is by SSL* objects. For the HSM case, the private key handle from `ENGINE_load_private_key()` is a proxy for the private key in the HSM. This proxy object is not guaranteed to be valid in a different process whether by fork() or shared memory. During `mod_child()` we also cannot load the private key into `SSL_CTX *d->ctx[i]`, as the next child will simply overwrite the value since these are in shared memory. In my first implementation I forgot about shared memory so the keys are what the final child loaded. These keys would only work for the last child and the handle was invalid when other children tried to use them. In my current implementation, I leave the SSL_CTXs as keyless. Instead loading the private key into a local set, keyed by the SSL_CTX pointer. Therefore SSL_CTX for HSM domains are keyless and incomplete for SSL_accept(). At runtime, just before SSL_accept(ssl) I retrieve the SSL_CTX* from ssl, and check if it is indeed keyless, i.e, it exists in the local key set. Then we retrieve the HSM key in just-in-time mode and load into the `SSL* ssl` object. Summary: Soft key: d->ctx[i] fully initialized with private key from PEM file HSM key: d->ctx[i] keyless, the privatekey is stored in a local set: as hash table { domain0->ctx[0]: EVP_PKEY* domain0->ctx[1]: EVP_PKEY* domain1->ctx[0]: EVP_PKEY* domain1->ctx[2]: EVP_PKEY* ... }. Notes: 1. Most engines that deal with HSM private keys are wrappers around a vendor or OpenSC PKCS 11 library. 1. AWS CloudHSM engine (`libgem.so`) a wrapper around SafeNet Luna HSM `libCryptoki2_64.so` actually produces private keys that work even in a different process. If the last child/master loads its private key into `d->ctx[i]` all the other children can use this `SSL_CTX`. This type of behaviour is due to their special care in implementaion and not mandated. 1. OpenSC/libp11: this engine can wrap any PKCS11 library into an engine. When wrapping `libCryptoki2_64.so` its private keys didn't work in another process. That is why I chose to use a local set. 1. Interestingly the NGINX developers refused to accept HSM private key handling to the child. They state that is the role of the PKCS 11 library to make sure its objects are valid across a fork(). Sadly, this principle does not accord with reality. 1. Although HAProxy has engine support, they do not use engine private keys yet, so have not addressed this issue. 1. GNUTLS recommends that all PKCS 11 objects be used only in one process; i.e don't try to leak handles across fork() or shared memory. -- 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/1484#issuecomment-375671973___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] [WIP] tls: add support for OpenSSL engine and private keys in HSM (#1484)
@aalba6675 pushed 1 commit. c802024 tls: use pkg_* functions -- You are receiving this because you are subscribed to this thread. View it on GitHub: https://github.com/kamailio/kamailio/pull/1484/files/956d0f72a970ce7c826e394c9d1431da6f167b36..c802024442fd8c3ec5190382e84430d4dd4260a0 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] Support for 192.0.0.0/29 as NATed source (#1488)
Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) Checklist: - [X] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description 192.0.0.0/29 is a reserved subnet for NATtin IPv4 across an IPv6 netwerk. For example Dual Stack Lite carrier grade NAT. This is small change and updates the subnets used for NAT according to https://www.iana.org/assignments/iana-ipv4-special-registry/iana-ipv4-special-registry.xhtml You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1488 -- Commit Summary -- * Support for -- File Changes -- M src/modules/ipops/detailed_ip_type.c (1) M src/modules/ipops/detailed_ip_type.h (2) M src/modules/nat_traversal/nat_traversal.c (3) M src/modules/nathelper/nathelper.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1488.patch https://github.com/kamailio/kamailio/pull/1488.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/1488 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] [WIP] tls: add support for OpenSSL engine and private keys in HSM (#1484)
@henningw - thanks for your review and work here! I wrote it more from the perspective that I want to do also a deep review, because tls has some complexity in handling all those per server attributes and I would prefer not to break (if possible!!!). Somehow it was triggered by the reference in the comments about using private memory in the context that most of data for tls is in shared memory. I didn't want to start questioning that, preferring a look at the code before. As it could take time in my side, I made the last remark that people should not wait for me, if they need to do something else. -- 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/1484#issuecomment-375572364___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:ff5a879b: evrexec: use route_get() in modparam callback
Module: kamailio Branch: 5.1 Commit: ff5a879bb52bd2537735b453d0d5655dc837dcc3 URL: https://github.com/kamailio/kamailio/commit/ff5a879bb52bd2537735b453d0d5655dc837dcc3 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-23T08:49:32+01:00 evrexec: use route_get() in modparam callback - routing blocks might not have been parsed yet (cherry picked from commit d2479c96891db6656dbe880c6600d18f5fa38e33) --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ff5a879bb52bd2537735b453d0d5655dc837dcc3.diff Patch: https://github.com/kamailio/kamailio/commit/ff5a879bb52bd2537735b453d0d5655dc837dcc3.patch --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index a91ab4d9f7..0fdd06923a 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -158,7 +158,12 @@ void evrexec_process(evrexec_task_t *it, int idx) if(it->wait>0) sleep_us(it->wait); keng = sr_kemi_eng_get(); if(keng==NULL) { - run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + if(it->rtid>=0 && event_rt.rlist[it->rtid]!=NULL) { + run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + } else { + LM_WARN("empty event route block [%.*s]\n", + it->ename.len, it->ename.s); + } } else { sidx.s = int2str(idx, ); if(keng->froute(fmsg, EVENT_ROUTE, @@ -227,7 +232,7 @@ int evrexec_param(modparam_t type, void *val) tmp.ename.s[tmp.ename.len] = '\0'; keng = sr_kemi_eng_get(); if(keng==NULL) { - tmp.rtid = route_lookup(_rt, tmp.ename.s); + tmp.rtid = route_get(_rt, tmp.ename.s); if(tmp.rtid == -1) { LM_ERR("event route not found: %.*s\n", tmp.ename.len, tmp.ename.s); free_params(params_list); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:b4fdeb01: modules: readme files regenerated - rr ... [skip ci]
Module: kamailio Branch: master Commit: b4fdeb01bd52427e9fa2cb8696b3b3631e871a79 URL: https://github.com/kamailio/kamailio/commit/b4fdeb01bd52427e9fa2cb8696b3b3631e871a79 Author: Kamailio DevCommitter: Kamailio Dev Date: 2018-03-23T08:47:09+01:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/b4fdeb01bd52427e9fa2cb8696b3b3631e871a79.diff Patch: https://github.com/kamailio/kamailio/commit/b4fdeb01bd52427e9fa2cb8696b3b3631e871a79.patch --- diff --git a/src/modules/rr/README b/src/modules/rr/README index 9dd64a3a28..f1c00d6c12 100644 --- a/src/modules/rr/README +++ b/src/modules/rr/README @@ -169,8 +169,8 @@ Chapter 1. Admin Guide 3261 (see 12.1.1 UAS behavior). For this purpose, the modules offers the following functions: - * add_rr_param() - see Section 5.6, âadd_rr_param(param)â - * check_route_param() - see Section 5.7, âcheck_route_param(re)â + * add_rr_param() - see ??? + * check_route_param() - see ??? Example 1.1. Dialog support in RR module ... @@ -496,9 +496,8 @@ record_route_advertised_address("1.2.3.4:5080"); Adds a parameter to the Record-Route URI (param must be in â;name=valueâ format. The function may be called also before or after - the record_route() or record_route_advertised_address() calls (see - Section 5.2, ârecord_route() and record_route(string)â or Section 5.5, - ârecord_route_advertised_address(address)â)). + the record_route() or record_route_advertised_address() calls (see ??? + or ???)). Meaning of the parameters is as follows: * param - String containing the URI parameter to be added. It must @@ -516,8 +515,7 @@ add_rr_param(";nat=yes"); The function checks if the URI parameters of the local Route header (corresponding to the local server) matches the given regular - expression. It must be call after loose_route() (see Section 5.1, - âloose_route()â). + expression. It must be call after loose_route() (see ???). Meaning of the parameters is as follows: * re - regular expression to check against the Route URI parameters. @@ -535,9 +533,8 @@ if (check_route_param("nat=yes")) { The function checks the flow direction of in-dialog requests. This function uses the âftagâ parameter from the Route header, therefore the - append_fromtag (see Section 4.2, âappend_fromtag (integer)â module - parameter must be enabled. Also this must be called only after - loose_route() (see Section 5.1, âloose_route()â). + append_fromtag (see ??? module parameter must be enabled. Also this + must be called only after loose_route() (see ???). The function returns true if the âdirâ is the same with the request's flow direction. @@ -679,9 +676,8 @@ record_route_advertised_address("1.2.3.4:5090"); The function checks the flow direction of the request âmsgâ. As for checking it's used the âftagâ Route header parameter, the - append_fromtag (see Section 4.2, âappend_fromtag (integer)â module - parameter must be enables. Also this must be call only after the - loose_route is done. + append_fromtag (see ??? module parameter must be enables. Also this + must be call only after the loose_route is done. The function returns 0 if the âdirâ is the same with the request's flow direction. Otherwise, -1 is returned. ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:7907cd15: rr: docs - added section ids
Module: kamailio Branch: master Commit: 7907cd15b5aacef8990e50dc19055a4e9b8e4359 URL: https://github.com/kamailio/kamailio/commit/7907cd15b5aacef8990e50dc19055a4e9b8e4359 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-23T08:34:34+01:00 rr: docs - added section ids --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7907cd15b5aacef8990e50dc19055a4e9b8e4359.diff Patch: https://github.com/kamailio/kamailio/commit/7907cd15b5aacef8990e50dc19055a4e9b8e4359.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:d2479c96: evrexec: use route_get() in modparam callback
Module: kamailio Branch: master Commit: d2479c96891db6656dbe880c6600d18f5fa38e33 URL: https://github.com/kamailio/kamailio/commit/d2479c96891db6656dbe880c6600d18f5fa38e33 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-03-23T08:34:34+01:00 evrexec: use route_get() in modparam callback - routing blocks might not have been parsed yet --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2479c96891db6656dbe880c6600d18f5fa38e33.diff Patch: https://github.com/kamailio/kamailio/commit/d2479c96891db6656dbe880c6600d18f5fa38e33.patch --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index a91ab4d9f7..0fdd06923a 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -158,7 +158,12 @@ void evrexec_process(evrexec_task_t *it, int idx) if(it->wait>0) sleep_us(it->wait); keng = sr_kemi_eng_get(); if(keng==NULL) { - run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + if(it->rtid>=0 && event_rt.rlist[it->rtid]!=NULL) { + run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + } else { + LM_WARN("empty event route block [%.*s]\n", + it->ename.len, it->ename.s); + } } else { sidx.s = int2str(idx, ); if(keng->froute(fmsg, EVENT_ROUTE, @@ -227,7 +232,7 @@ int evrexec_param(modparam_t type, void *val) tmp.ename.s[tmp.ename.len] = '\0'; keng = sr_kemi_eng_get(); if(keng==NULL) { - tmp.rtid = route_lookup(_rt, tmp.ename.s); + tmp.rtid = route_get(_rt, tmp.ename.s); if(tmp.rtid == -1) { LM_ERR("event route not found: %.*s\n", tmp.ename.len, tmp.ename.s); free_params(params_list); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] [WIP] tls: add support for OpenSSL engine and private keys in HSM (#1484)
Sorry for the late reply, was yesterday pretty busy as well. Generally speaking, these are the different approaches that modules use for data access in kamailio child processes: * all children needs to access to a one shared data structure Create one global structure in mod_init in shm_memory, and then access it from different children. Protect the (possible) concurrent access with locks, if you support run-time modification of this data. You find examples in the carrierroute module, mod_init() -> init_route_data() and its reload functions and other modules. * All children needs access to a individual local data set Just allocate it in pkg_memory and access it from the children individually. You can find an example in the auth_diameter module, auth_diameter.c mod_child_init() function. * All children needs access to all local sets Then you need to implement a solution like you choose with a shared data structure, e.g. in a hash table that you write in child_init to. I did not fully understand why you need this here, maybe you can elaborate a bit on the requirements of the HSM child_init. I have another remark about the hash table you' added. The hash table uses system malloc() to allocate memory. Please change this to pkg_memory, if you need per-process individual memory, or shm_memory for shared memory. If you have more detailed questions, feel free to contact me per e-mail as well (hw at kamailio dot org). @miconda - as you currently traveling, I can do the further processing of this patch, no need to hurry from your side. -- 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/1484#issuecomment-375566763___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] app_java: gcj is been removed from gcc since gcc7 (#1487)
I am not familiar with app_java, but I guess here it is about compatibility of java devel library across these options, as we do not use java itself for compilation, just include header files and link against the libs. >From this perspective, I wonder if it would be easy to see if other projects >with packages in debian did this kind of conversion -- could make things >simpler to see how the did it and make similar changes here. -- 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/1487#issuecomment-375558741___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev