August 2018 - sr-dev - kamailio.org

git:5.1:1d74f30c: app_python: init cfg vars framework only in child init
by Daniel-Constantin Mierla 20 Aug '18

20 Aug '18

Module: kamailio Branch: 5.1 Commit: 1d74f30c09a79a57ed530778c3dde1fca856f14c URL: https://github.com/kamailio/kamailio/commit/1d74f30c09a79a57ed530778c3dde1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-20T11:23:04+02:00 app_python: init cfg vars framework only in child init - backport of 17a33388138c2510e9e483c0526948772a1478f4 --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1d74f30c09a79a57ed530778c3dde1f… Patch: https://github.com/kamailio/kamailio/commit/1d74f30c09a79a57ed530778c3dde1f… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index fc349dc184..936674309a 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -26,6 +26,7 @@ #include "../../core/sr_module.h" #include "../../core/mod_fix.h" #include "../../core/kemi.h" +#include "../../core/cfg/cfg_struct.h" #include "python_exec.h" #include "python_iface.h" @@ -175,6 +176,9 @@ static int mod_init(void) static int child_init(int rank) { _apy_process_rank = rank; + if (cfg_child_init()) { + return -1; + } return apy_init_script(rank); }

1 0

git:5.1:da08b814: jsonrpcs: store id attribute inside context for async response
by Daniel-Constantin Mierla 20 Aug '18

20 Aug '18

Module: kamailio Branch: 5.1 Commit: da08b81446fb4cb64a4c930cc943f851a7b19424 URL: https://github.com/kamailio/kamailio/commit/da08b81446fb4cb64a4c930cc943f85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-20T11:20:03+02:00 jsonrpcs: store id attribute inside context for async response (cherry picked from commit 8601f89bcc309e5676647019a13246578540ad71) --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c Modified: src/modules/jsonrpcs/jsonrpcs_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/da08b81446fb4cb64a4c930cc943f85… Patch: https://github.com/kamailio/kamailio/commit/da08b81446fb4cb64a4c930cc943f85… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 633847fc9d..6e43e33332 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -387,15 +387,26 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx) ctx->rpl_node = 0; } } - nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "id"); - if(nj!=NULL) { - if(nj->valuestring!=NULL) { + if(ctx->jreq!=NULL && ctx->jreq->root!=NULL) { + nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "id"); + if(nj!=NULL) { + if(nj->valuestring!=NULL) { + srjson_AddStrStrToObject(ctx->jrpl, ctx->jrpl->root, + "id", 2, + nj->valuestring, strlen(nj->valuestring)); + } else { + srjson_AddNumberToObject(ctx->jrpl, ctx->jrpl->root, "id", + nj->valuedouble); + } + } + } else { + if(ctx->jsrid_type == 1) { srjson_AddStrStrToObject(ctx->jrpl, ctx->jrpl->root, "id", 2, - nj->valuestring, strlen(nj->valuestring)); - } else { + ctx->jsrid_val, strlen(ctx->jsrid_val)); + } else if(ctx->jsrid_type == 2) { srjson_AddNumberToObject(ctx->jrpl, ctx->jrpl->root, "id", - nj->valuedouble); + (double)(*(long*)ctx->jsrid_val)); } } @@ -970,6 +981,7 @@ static struct rpc_delayed_ctx* jsonrpc_delayed_ctx_new(jsonrpc_ctx_t* ctx) jsonrpc_ctx_t* r_ctx; sip_msg_t* shm_msg; int len; + srjson_t *nj = NULL; ret=0; shm_msg=0; @@ -984,6 +996,22 @@ static struct rpc_delayed_ctx* jsonrpc_delayed_ctx_new(jsonrpc_ctx_t* ctx) LM_ERR("delayed response implemented only for HTTP transport\n"); return 0; } + + if(ctx->jreq==NULL || ctx->jreq->root==NULL) { + LM_ERR("invalid context attributes\n"); + return 0; + } + + nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "id"); + if(nj==NULL) { + LM_ERR("id attribute is missing\n"); + return 0; + } + if(nj->valuestring!=NULL && strlen(nj->valuestring)>JSONRPC_ID_SIZE-1) { + LM_ERR("id attribute is too long (%lu/%d)\n", strlen(nj->valuestring), + JSONRPC_ID_SIZE); + return 0; + } /* clone the sip msg */ if(ctx->msg!=NULL) { shm_msg=sip_msg_shm_clone(ctx->msg, &len, 1); @@ -1005,6 +1033,14 @@ static struct rpc_delayed_ctx* jsonrpc_delayed_ctx_new(jsonrpc_ctx_t* ctx) r_ctx->msg=shm_msg; r_ctx->msg_shm_block_size=len; + if(nj->valuestring!=NULL) { + strcpy(r_ctx->jsrid_val, nj->valuestring); + r_ctx->jsrid_type = 1; + } else { + *(long*)r_ctx->jsrid_val = (long)nj->valuedouble; + r_ctx->jsrid_type = 2; + } + return ret; error: if (shm_msg) diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.h b/src/modules/jsonrpcs/jsonrpcs_mod.h index ef15c3ec93..173810a42e 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.h +++ b/src/modules/jsonrpcs/jsonrpcs_mod.h @@ -29,6 +29,7 @@ #include "../../core/parser/msg_parser.h" #include "../../lib/srutils/srjson.h" +#define JSONRPC_ID_SIZE 64 /** The context of the jsonrpc request being processed. * @@ -54,6 +55,8 @@ typedef struct jsonrpc_ctx { int http_code; /**< http reply code */ str http_text; /**< http reply reason text */ int transport; /**< RPC transport */ + int jsrid_type; /**< type for Json RPC id value */ + char jsrid_val[JSONRPC_ID_SIZE]; /**< value for Json RPC id */ } jsonrpc_ctx_t; /* extra rpc_ctx_t flags */

1 0

git:master:1af0bd74: app_python3: init cfg vars framework in child init
by Daniel-Constantin Mierla 20 Aug '18

20 Aug '18

Module: kamailio Branch: master Commit: 1af0bd744b955e7618085b12d2a9911e677af2f8 URL: https://github.com/kamailio/kamailio/commit/1af0bd744b955e7618085b12d2a9911… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-20T11:12:34+02:00 app_python3: init cfg vars framework in child init --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1af0bd744b955e7618085b12d2a9911… Patch: https://github.com/kamailio/kamailio/commit/1af0bd744b955e7618085b12d2a9911… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 5d45f3f355..19dfe0aa87 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -26,6 +26,7 @@ #include "../../core/sr_module.h" #include "../../core/mod_fix.h" #include "../../core/kemi.h" +#include "../../core/cfg/cfg_struct.h" #include "python_exec.h" #include "python_iface.h" @@ -179,6 +180,9 @@ static int child_init(int rank) } _apy_process_rank = rank; PyOS_AfterFork(); + if (cfg_child_init()) { + return -1; + } return apy_init_script(rank); }

1 0

git:master:17a33388: app_python: init cfg vars framework only in child init
by Daniel-Constantin Mierla 20 Aug '18

20 Aug '18

Module: kamailio Branch: master Commit: 17a33388138c2510e9e483c0526948772a1478f4 URL: https://github.com/kamailio/kamailio/commit/17a33388138c2510e9e483c05269487… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-20T11:11:45+02:00 app_python: init cfg vars framework only in child init - apy init is executed in other parts as well --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/17a33388138c2510e9e483c05269487… Patch: https://github.com/kamailio/kamailio/commit/17a33388138c2510e9e483c05269487… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 8ed21e1c93..6535cd93b3 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -180,6 +180,9 @@ static int child_init(int rank) } _apy_process_rank = rank; PyOS_AfterFork(); + if (cfg_child_init()) { + return -1; + } return apy_init_script(rank); } @@ -436,10 +439,6 @@ int apy_init_script(int rank) goto err; } - if (cfg_child_init()) { - goto err; - } - pArgs = PyTuple_New(1); if (pArgs == NULL) { python_handle_exception("child_init");

1 0

git:master:8601f89b: jsonrpcs: store id attribute inside context for async response
by Daniel-Constantin Mierla 18 Aug '18

18 Aug '18

Module: kamailio Branch: master Commit: 8601f89bcc309e5676647019a13246578540ad71 URL: https://github.com/kamailio/kamailio/commit/8601f89bcc309e5676647019a132465… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-18T09:28:02+02:00 jsonrpcs: store id attribute inside context for async response --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c Modified: src/modules/jsonrpcs/jsonrpcs_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/8601f89bcc309e5676647019a132465… Patch: https://github.com/kamailio/kamailio/commit/8601f89bcc309e5676647019a132465… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 7ef1e39d34..11857fe11e 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -387,15 +387,26 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx) ctx->rpl_node = 0; } } - nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "id"); - if(nj!=NULL) { - if(nj->valuestring!=NULL) { + if(ctx->jreq!=NULL && ctx->jreq->root!=NULL) { + nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "id"); + if(nj!=NULL) { + if(nj->valuestring!=NULL) { + srjson_AddStrStrToObject(ctx->jrpl, ctx->jrpl->root, + "id", 2, + nj->valuestring, strlen(nj->valuestring)); + } else { + srjson_AddNumberToObject(ctx->jrpl, ctx->jrpl->root, "id", + nj->valuedouble); + } + } + } else { + if(ctx->jsrid_type == 1) { srjson_AddStrStrToObject(ctx->jrpl, ctx->jrpl->root, "id", 2, - nj->valuestring, strlen(nj->valuestring)); - } else { + ctx->jsrid_val, strlen(ctx->jsrid_val)); + } else if(ctx->jsrid_type == 2) { srjson_AddNumberToObject(ctx->jrpl, ctx->jrpl->root, "id", - nj->valuedouble); + (double)(*(long*)ctx->jsrid_val)); } } @@ -970,6 +981,7 @@ static struct rpc_delayed_ctx* jsonrpc_delayed_ctx_new(jsonrpc_ctx_t* ctx) jsonrpc_ctx_t* r_ctx; sip_msg_t* shm_msg; int len; + srjson_t *nj = NULL; ret=0; shm_msg=0; @@ -984,6 +996,22 @@ static struct rpc_delayed_ctx* jsonrpc_delayed_ctx_new(jsonrpc_ctx_t* ctx) LM_ERR("delayed response implemented only for HTTP transport\n"); return 0; } + + if(ctx->jreq==NULL || ctx->jreq->root==NULL) { + LM_ERR("invalid context attributes\n"); + return 0; + } + + nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "id"); + if(nj==NULL) { + LM_ERR("id attribute is missing\n"); + return 0; + } + if(nj->valuestring!=NULL && strlen(nj->valuestring)>JSONRPC_ID_SIZE-1) { + LM_ERR("id attribute is too long (%lu/%d)\n", strlen(nj->valuestring), + JSONRPC_ID_SIZE); + return 0; + } /* clone the sip msg */ if(ctx->msg!=NULL) { shm_msg=sip_msg_shm_clone(ctx->msg, &len, 1); @@ -1005,6 +1033,14 @@ static struct rpc_delayed_ctx* jsonrpc_delayed_ctx_new(jsonrpc_ctx_t* ctx) r_ctx->msg=shm_msg; r_ctx->msg_shm_block_size=len; + if(nj->valuestring!=NULL) { + strcpy(r_ctx->jsrid_val, nj->valuestring); + r_ctx->jsrid_type = 1; + } else { + *(long*)r_ctx->jsrid_val = (long)nj->valuedouble; + r_ctx->jsrid_type = 2; + } + return ret; error: if (shm_msg) diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.h b/src/modules/jsonrpcs/jsonrpcs_mod.h index ef15c3ec93..173810a42e 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.h +++ b/src/modules/jsonrpcs/jsonrpcs_mod.h @@ -29,6 +29,7 @@ #include "../../core/parser/msg_parser.h" #include "../../lib/srutils/srjson.h" +#define JSONRPC_ID_SIZE 64 /** The context of the jsonrpc request being processed. * @@ -54,6 +55,8 @@ typedef struct jsonrpc_ctx { int http_code; /**< http reply code */ str http_text; /**< http reply reason text */ int transport; /**< RPC transport */ + int jsrid_type; /**< type for Json RPC id value */ + char jsrid_val[JSONRPC_ID_SIZE]; /**< value for Json RPC id */ } jsonrpc_ctx_t; /* extra rpc_ctx_t flags */

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 17 Aug '18

17 Aug '18

- URL: https://github.com/kamailio/kamailio/commit/0bb4e84095e57337f7bd76253c55b0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:26:57+02:00 blst: export functions to ANY_ROUTE - simplified from masking route types (cherry picked from commit aa4f8532ea5a85245216bf4e8fb4e07e37db76ed) - URL: https://github.com/kamailio/kamailio/commit/8540e2b54d0ed1c22cf282310ccef2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:27:06+02:00 blst: exported several functions to kemi framework (cherry picked from commit 30745c2b92e526d7f352a56bc4e292fe2d36ee92) - URL: https://github.com/kamailio/kamailio/commit/adae203b5dbb3092d1fa7ba71d15146… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:28:24+02:00 topos: detect first direction for dlg requests before linking contact - related to GH #1571 (cherry picked from commit a8d4ca293dba19b4b44110e9e7f5be71ce3c090b) - URL: https://github.com/kamailio/kamailio/commit/433eb009ddc0d6f6dfd359512c86d7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:28:46+02:00 blst: more functions exported to kemi framework (cherry picked from commit f5ef3919b42541ac6daa1c3ea2ed7c1707f4dd01) - URL: https://github.com/kamailio/kamailio/commit/0c967511381d61fe1d462cdfe5b15db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:28:55+02:00 blst: removed unused parameter (cherry picked from commit 4e2290facad0768daa636df387e438d4ff931588) - URL: https://github.com/kamailio/kamailio/commit/71dbada4b68c4d9312d031780bc3269… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:30:37+02:00 sdpops: exported sdp with media functions to kemi framework (cherry picked from commit 1d53ea3dba4e59b05b2e92ecc973c44159b9bb36) - URL: https://github.com/kamailio/kamailio/commit/cd4e929d80da8f2de9119d71210126d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:31:01+02:00 blst: docs - better highlighting of examples in readme (cherry picked from commit 3c1b7f5bdfe8d1b99aa314573b73597ba8f5a657) - URL: https://github.com/kamailio/kamailio/commit/6cb426058f05ccd90b23225a5bfb6cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:31:57+02:00 sanity: allow vars in params (cherry picked from commit f66bbb5b6da13ad627bf0c8ee50bdbad9c93b43c) - URL: https://github.com/kamailio/kamailio/commit/4a41e279e5aa0d0bb11c8f3d9239f4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:32:11+02:00 sanity: note that params for sanity_check(...) can be vars (cherry picked from commit 3ddf9de8f0345db6a5fb0c632784b38482687891) - URL: https://github.com/kamailio/kamailio/commit/1c719cac05aa31503f4030f266d8814… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:33:38+02:00 permissions: exported allow_source_address_group() to kemi framework (cherry picked from commit 20ebfcf3156912d83c087156ec3e8eb15ae26c25) - URL: https://github.com/kamailio/kamailio/commit/8de7bbcc8520f5fc1451774bcef3717… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:34:09+02:00 rr: exported is_direction() to kemi framework - rework of the patch from GH #1589 (cherry picked from commit 3806ca121194d54bbd03ff257ec62505b15d0941) - URL: https://github.com/kamailio/kamailio/commit/3f597a67f5cc7f7f8c86f9fc6f8bc37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:34:29+02:00 permissions: exported allow_address_group() to kemi framework (cherry picked from commit 48524f0ce8934c4f6a46b38a1af1fff92078eb3d) - URL: https://github.com/kamailio/kamailio/commit/0e7075de8b25ed54b02f45cbf465bca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:36:19+02:00 core: mem - added shm_address_in(p) - return 1 if pointer p is inside shared memory zone, 0 otherwise (cherry picked from commit 1a20bcaa35db4aa80d6460dfb0fb9c70026248c9) - URL: https://github.com/kamailio/kamailio/commit/b10842f285dc755ed426744246f2419… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:36:30+02:00 textops: set the buffer size for re transformation to 8196 - 2048 is rather small for handlin message body - reported by #1592 (cherry picked from commit 464bf61788e86551509c08e07f9eed2a9bba0b58) - URL: https://github.com/kamailio/kamailio/commit/a13cfbc8d2b7123b168aeb44d8745dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:37:01+02:00 topoh: try to use sip uri parameters for decoding - when UA adds user=phone, turns the uri type in tel mapped over sip uri, default params pointing to tel params - reported by GH #1541 (cherry picked from commit 951df23f8ab9f4428e143949f1e580f76b4d8fc9) - URL: https://github.com/kamailio/kamailio/commit/b2f210723d303f01e97ca319c8c731e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:37:50+02:00 dialog: safety check for dialog hash table inside dlg_get() - GH #1594 (cherry picked from commit 4f13c9a291eeeb2f3d3b7654308b13396fe020af) - URL: https://github.com/kamailio/kamailio/commit/b3468ab8c8e8b9284f2f970a2b510fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:38:19+02:00 kex: docs - note that is_myself() does not match with default ports (cherry picked from commit d2841c66304196cbe73c76517f284e49aa0c76b9) - URL: https://github.com/kamailio/kamailio/commit/16572992d7e60d59b398768bfc6f95d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:38:33+02:00 uac: uac_send - small bits of formatting (cherry picked from commit 1ac4527ac8f05dbb48e3ab9e2aa9790ae86f179f) - URL: https://github.com/kamailio/kamailio/commit/f8842b1c0119702b922dd0dcd8b7f8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:38:44+02:00 uac: call event route for uac_req_send() for second response - done in case the request is resent after a 401/407 - GH #1598 (cherry picked from commit 5c3df566887e8c37d3144d4191b36fc9eba24c34) - URL: https://github.com/kamailio/kamailio/commit/e819127f1c46de9b71b4c4857e3fef0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:39:03+02:00 topos: keep original contact in 3xx responses sent out - reported by Andrew Pogrebennyk (cherry picked from commit fcf1d3d778a903852b6e21103a23bd7fd6e3bbc9) - URL: https://github.com/kamailio/kamailio/commit/70a76056b30e2558c3607fa77ccae86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:39:15+02:00 core: removed unused MAX_LISTEN - it was printed in version output, not having any relevance anymore (cherry picked from commit 79aa72011ae551c6f82816f352fce7582e371f93) - URL: https://github.com/kamailio/kamailio/commit/d2b725bc6c2983014577bf6edbb44a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:39:36+02:00 uac: docs - more details about execution of event_route[uac:reply] (cherry picked from commit 1cec5e80036808badf19c8c72ec243b504f56e28) - URL: https://github.com/kamailio/kamailio/commit/befa844b4ff1bbdfc2a0bb70a473b13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:40:06+02:00 carrierroute: docs - removed mi commands section (cherry picked from commit 4a64fb95680b9efac47c79888f2a68bdcfb29ad6) - URL: https://github.com/kamailio/kamailio/commit/29d9126cb8a558262d07d31daec3e06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:40:22+02:00 topos_redis: execute end dialog function only for BYE request - reported by GH #1608 (cherry picked from commit 3924afe2917e64066ea796597104b0e00358b180) - URL: https://github.com/kamailio/kamailio/commit/f5c944e81f98321f818100de1f9c831… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:40:48+02:00 dialog: run run_load_callbacks() on child_init for rank PROC_INIT - proper test for create_cbs - based on PR #1606 and #1607 by kosza (cherry picked from commit 3d0e1f796eb359689b75eebbb04cd09c6ee6807a) - URL: https://github.com/kamailio/kamailio/commit/a7ba7ee463847b85d98534560a9424c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:41:24+02:00 blst: small formatting bits (cherry picked from commit 941afa771b43ce5abb825ed487354750cfc71e51) - URL: https://github.com/kamailio/kamailio/commit/154fd39f7fa9bb7dc3a57cfc366354e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:41:47+02:00 app_lua: docs - more details about lua_run() params (cherry picked from commit f1f6c303baab87523d54b97af38c0a5718cf0d2f) - URL: https://github.com/kamailio/kamailio/commit/030f3b12aede10353f25b61f5c02cfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:42:01+02:00 core: more detailed debug message if new uri is too long (cherry picked from commit ada68095882368a7e05329a52e53a57b2bc818d1) - URL: https://github.com/kamailio/kamailio/commit/93c04d78df2420e42b057d215b60bc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:42:31+02:00 app_lua: docs - more examples for lua_run() (cherry picked from commit 7788aa4b396b27fe86bd535a0ded024531c5e75a) - URL: https://github.com/kamailio/kamailio/commit/87c628f9202621f09ec18df95efef75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:42:53+02:00 core: more detailed error message when no config option to route requests (cherry picked from commit 4d9f342f8a7050d9c5f7754622ddb918edb16a99) - URL: https://github.com/kamailio/kamailio/commit/9b82bf95f1dafd8fac3a7de3aff3e91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:43:50+02:00 tm: safety check for t->uas.request for forwarding local requests (cherry picked from commit ec0c583b5b054d06691a2c0d90be195f6ed51cdd) - URL: https://github.com/kamailio/kamailio/commit/103473c0b0ff41fea9ae561c4ed47eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T12:44:04+02:00 jsonrpcs: docs - updates to reflect better the transports and capabilities (cherry picked from commit 1eabace61965e9e77f18a63a71faa9d45de4b550)

1 0

git:master:27caae0f: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 17 Aug '18

17 Aug '18

Module: kamailio Branch: master Commit: 27caae0fe28d6768ad80a52fe4a3cfaa65eca4db URL: https://github.com/kamailio/kamailio/commit/27caae0fe28d6768ad80a52fe4a3cfa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-17T10:46:47+02:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/27caae0fe28d6768ad80a52fe4a3cfa… Patch: https://github.com/kamailio/kamailio/commit/27caae0fe28d6768ad80a52fe4a3cfa… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index d71e21b4c2..3854db4a74 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -18,7 +18,7 @@ Daniel-Constantin Mierla 1. Admin Guide 1. Overview - 2. Limitations + 2. Important Remarks 3. Dependencies 3.1. Kamailio Modules @@ -78,7 +78,7 @@ Chapter 1. Admin Guide Table of Contents 1. Overview - 2. Limitations + 2. Important Remarks 3. Dependencies 3.1. Kamailio Modules @@ -114,24 +114,28 @@ Chapter 1. Admin Guide 1. Overview - This module provides a JSON-RPC v2 server over HTTP implementation, - tailored for the needs of Kamailio. It implements the Kamailio RPC - interface over JSON-RPC. + This module provides a JSON-RPC v2 server, tailored for the needs of + Kamailio. It implements the Kamailio RPC interface over JSON-RPC. The specification for JSON-RPC is available at: http://www.jsonrpc.org/specification. - The JSONRPC-S module uses the xHTTP module to handle HTTP/S requests. - Read the documentation of the xHTTP module for more details. + The transports supported by the module are: FIFO file, datagram (UDP) + over unix socket files or network sockets, HTTP and HTTPS. -2. Limitations + The JSONRPCS module requires the xHTTP module to handle HTTP/S + requests. Read the documentation of the xHTTP module for more details. - * This module does not implement asynchronous RPC commands. It is - unlikely that asynchronous RPC commands will be executed from an - JSON-RPC over HTTP client. +2. Important Remarks + + * This module implements the support for asynchronous RPC commands + only for HTTP and HTTPS transports. * This module does not accept parameters embedded in a structure (see the RPC documentation for more info about how parameters can be passed to RPC). + * For the RPC interface implemented by Kamailio, the order of + parameters is important. If the parameters are given with names, + the names are ignored. 3. Dependencies

1 0

git:master:1eabace6: jsonrpcs: docs - updates to reflect better the transports and capabilities
by Daniel-Constantin Mierla 17 Aug '18

17 Aug '18

Module: kamailio Branch: master Commit: 1eabace61965e9e77f18a63a71faa9d45de4b550 URL: https://github.com/kamailio/kamailio/commit/1eabace61965e9e77f18a63a71faa9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-17T10:33:58+02:00 jsonrpcs: docs - updates to reflect better the transports and capabilities --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1eabace61965e9e77f18a63a71faa9d… Patch: https://github.com/kamailio/kamailio/commit/1eabace61965e9e77f18a63a71faa9d… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index d6d7d7c753..af24709cfa 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -16,28 +16,30 @@ <section> <title>Overview</title> <para> - This module provides a JSON-RPC v2 server over HTTP implementation, - tailored for the needs of &kamailio;. It implements the &kamailio; - RPC interface over JSON-RPC. + This module provides a JSON-RPC v2 server, tailored for the needs of + &kamailio;. It implements the &kamailio; RPC interface over JSON-RPC. </para> <para> The specification for JSON-RPC is available at: <ulink url="http://www.jsonrpc.org/specification">http://www.jsonrpc.org/specification</ulink>. </para> <para> - The JSONRPC-S module uses the xHTTP module to handle HTTP/S requests. + The transports supported by the module are: FIFO file, datagram (UDP) + over unix socket files or network sockets, HTTP and HTTPS. + </para> + <para> + The JSONRPCS module requires the xHTTP module to handle HTTP/S requests. Read the documentation of the xHTTP module for more details. </para> </section> <section> - <title>Limitations</title> + <title>Important Remarks</title> <itemizedlist> <listitem> <para> - This module does not implement asynchronous RPC commands. - It is unlikely that asynchronous RPC commands will be executed - from an JSON-RPC over HTTP client. + This module implements the support for asynchronous RPC commands only + for HTTP and HTTPS transports. </para> </listitem> <listitem> @@ -47,6 +49,14 @@ passed to RPC). </para> </listitem> + <listitem> + <para> + For the RPC interface implemented by &kamailio;, the order of parameters + is important. If the parameters are given with names, the names are + ignored. + </para> + </listitem> + </itemizedlist> </section>

1 0

git:master:3c7dd38a: pipelimit: remove unused variable 'ret', fix compile warning
by Henning Westerholt 15 Aug '18

15 Aug '18

Module: kamailio Branch: master Commit: 3c7dd38aecd3ee63edcb9ab418ce3a3fcc2c6a8a URL: https://github.com/kamailio/kamailio/commit/3c7dd38aecd3ee63edcb9ab418ce3a3… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-15T22:58:31+02:00 pipelimit: remove unused variable 'ret', fix compile warning --- Modified: src/modules/pipelimit/pl_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/3c7dd38aecd3ee63edcb9ab418ce3a3… Patch: https://github.com/kamailio/kamailio/commit/3c7dd38aecd3ee63edcb9ab418ce3a3… --- diff --git a/src/modules/pipelimit/pl_ht.c b/src/modules/pipelimit/pl_ht.c index 07f69f666d..fa2c9c5ad0 100644 --- a/src/modules/pipelimit/pl_ht.c +++ b/src/modules/pipelimit/pl_ht.c @@ -477,7 +477,6 @@ void rpc_pl_list(rpc_t *rpc, void *c) int i; pl_pipe_t *it; str pipeid = STR_NULL; - int ret; if (rpc->scan(c, "*S", &pipeid) < 1) { pipeid.s = NULL;

1 0

git:5.1:e8f47981: db_mysql: improved fix in commit 1736723cc2a15 - it did not worked for mariadb
by Henning Westerholt 15 Aug '18

15 Aug '18

Module: kamailio Branch: 5.1 Commit: e8f479817140b32429d52cb25e89dff5dac86e22 URL: https://github.com/kamailio/kamailio/commit/e8f479817140b32429d52cb25e89dff… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-15T21:22:46+02:00 db_mysql: improved fix in commit 1736723cc2a15 - it did not worked for mariadb - improved fix in commit 1736723cc2a15 - it did not worked for mariadb - Reason is that MariaDB increased its numbering scheme, they are now at 10.x - MariaDB 10 is still using my_bool type, added few more #ifs to fix this (cherry picked from commit 9f459dccf84be7d7d0fbce89ca9165f7d1c4d66b) --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_fld.h --- Diff: https://github.com/kamailio/kamailio/commit/e8f479817140b32429d52cb25e89dff… Patch: https://github.com/kamailio/kamailio/commit/e8f479817140b32429d52cb25e89dff… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 242329e295..9d6566204d 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -29,7 +29,12 @@ #include "km_my_con.h" #include "km_db_mysql.h" #include <mysql.h> + +/* MariaDB exports MYSQL_VERSION_ID as well, but changed numbering scheme */ +#if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION #include <stdbool.h> +#endif + #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/ut.h" @@ -45,7 +50,11 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) char *host, *grp, *egrp; unsigned int connection_flag = 0; #if MYSQL_VERSION_ID > 50012 +#if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION bool rec; +#else + my_bool rec; +#endif #endif if (!id) { diff --git a/src/modules/db_mysql/my_fld.h b/src/modules/db_mysql/my_fld.h index 539a4df699..c247e48407 100644 --- a/src/modules/db_mysql/my_fld.h +++ b/src/modules/db_mysql/my_fld.h @@ -29,13 +29,21 @@ #include "../../lib/srdb2/db_drv.h" #include "../../lib/srdb2/db_fld.h" #include <mysql.h> + +/* MariaDB exports MYSQL_VERSION_ID as well, but changed numbering */ +#if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION #include <stdbool.h> +#endif struct my_fld { db_drv_t gen; char* name; +#if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION bool is_null; +#else + my_bool is_null; +#endif MYSQL_TIME time; unsigned long length; str buf;

1 0