sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
312 discussions

git:master:14e82498: secsipid: docs for secsipid_get_url()
by Daniel-Constantin Mierla 17 Nov '20

17 Nov '20

Module: kamailio Branch: master Commit: 14e82498f24dff5cf7ebd416e9bb88500583645b URL: https://github.com/kamailio/kamailio/commit/14e82498f24dff5cf7ebd416e9bb885… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-17T11:45:06+01:00 secsipid: docs for secsipid_get_url() --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/14e82498f24dff5cf7ebd416e9bb885… Patch: https://github.com/kamailio/kamailio/commit/14e82498f24dff5cf7ebd416e9bb885… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index ecc9060ce3..878000efa5 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -207,11 +207,33 @@ request_route { ... </programlisting> </example> + </section> + <section id="secsipid.f.secsipid_get_url"> + <title> + <function moreinfo="none">secsipid_get_url(url, ovar)</function> + </title> <para> - Further checks can be done with config operations, decoding the JWT header - and payload using {s.select} and {s.decode.base64t} transformations - together with jansson module. + Get the content of a URL and store the result in a variable. + </para> + <para> + The url parameters can contain pseudo-variables and ovar has to be + the name of a writtable pseudo-variable. + </para> + <para> + This function can be used from ANY_ROUTE. </para> + <example> + <title><function>secsipid_get_url</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_get_url("https://$fd/stirshaken/cert.pem", "$var(pubkey)")) { ... } + ... +} +... +</programlisting> + </example> </section> <section id="secsipid.f.secsipid_add_identity"> <title>

1 0

git:master:c29fffb6: secsipid: new function secsipid_get_url(url, ovar)
by Daniel-Constantin Mierla 17 Nov '20

17 Nov '20

Module: kamailio Branch: master Commit: c29fffb6890ffbf099ba2556ca6d90138b4497cd URL: https://github.com/kamailio/kamailio/commit/c29fffb6890ffbf099ba2556ca6d901… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-17T11:45:06+01:00 secsipid: new function secsipid_get_url(url, ovar) - convenience function to get the content of an URL and store the result in a variable, can be used to build caching of public keys with htable --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c29fffb6890ffbf099ba2556ca6d901… Patch: https://github.com/kamailio/kamailio/commit/c29fffb6890ffbf099ba2556ca6d901… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index b6f4bd53aa..4ea510b4e0 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -29,6 +29,7 @@ #include "../../core/dprint.h" #include "../../core/mod_fix.h" #include "../../core/data_lump.h" +#include "../../core/lvalue.h" #include "../../core/kemi.h" #include "secsipid.h" @@ -49,6 +50,7 @@ static int w_secsipid_check_identity(sip_msg_t *msg, char *pkeypath, char *str2) static int w_secsipid_check_identity_pubkey(sip_msg_t *msg, char *pkeyval, char *str2); static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); +static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *pout); /* clang-format off */ @@ -59,6 +61,8 @@ static cmd_export_t cmds[]={ fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"secsipid_add_identity", (cmd_function)w_secsipid_add_identity, 6, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"secsipid_get_url", (cmd_function)w_secsipid_get_url, 2, + fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -316,6 +320,85 @@ static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, &attest, &origid, &x5u, &keypath); } +/** + * + */ +static str _secsipid_get_url_val = STR_NULL; +/** + * + */ +static sr_kemi_xval_t _sr_kemi_secsipid_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_secsipid_get_url(sip_msg_t *msg, str *surl) +{ + int r; + + memset(&_sr_kemi_secsipid_xval, 0, sizeof(sr_kemi_xval_t)); + + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_secsipid_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_secsipid_xval; + } + + if(_secsipid_get_url_val.s != NULL) { + free(_secsipid_get_url_val.s); + _secsipid_get_url_val.len = 0; + } + + r = SecSIPIDGetURLContent(surl->s, secsipid_timeout, &_secsipid_get_url_val.s, + &_secsipid_get_url_val.len); + if(r!=0) { + sr_kemi_xval_null(&_sr_kemi_secsipid_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_secsipid_xval; + } + + _sr_kemi_secsipid_xval.vtype = SR_KEMIP_STR; + _sr_kemi_secsipid_xval.v.s = _secsipid_get_url_val; + + return &_sr_kemi_secsipid_xval; +} + +/** + * + */ +static int w_secsipid_get_url(sip_msg_t *msg, char *purl, char *povar) +{ + int r; + pv_spec_t *ovar; + pv_value_t val; + str surl = {NULL, 0}; + + if(fixup_get_svalue(msg, (gparam_t*)purl, &surl)<0) { + LM_ERR("failed to get url parameter\n"); + return -1; + } + if(_secsipid_get_url_val.s != NULL) { + free(_secsipid_get_url_val.s); + _secsipid_get_url_val.len = 0; + } + + r = SecSIPIDGetURLContent(surl.s, secsipid_timeout, &_secsipid_get_url_val.s, + &_secsipid_get_url_val.len); + if(r!=0) { + return -1; + } + ovar = (pv_spec_t *)povar; + + val.rs = _secsipid_get_url_val; + val.flags = PV_VAL_STR; + if(ovar->setf) { + ovar->setf(msg, &ovar->pvp, (int)EQ_T, &val); + } else { + LM_WARN("target pv is not writable\n"); + return -1; + } + + return 1; +} + /** * */ @@ -336,6 +419,11 @@ static sr_kemi_t sr_kemi_secsipid_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("secsipid"), str_init("secsipid_get_url"), + SR_KEMIP_XVAL, ki_secsipid_get_url, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:2250d1b3: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 17 Nov '20

17 Nov '20

Module: kamailio Branch: master Commit: 2250d1b335698a4f061e920bed6480cf20d50a70 URL: https://github.com/kamailio/kamailio/commit/2250d1b335698a4f061e920bed6480c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-17T10:31:17+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/2250d1b335698a4f061e920bed6480c… Patch: https://github.com/kamailio/kamailio/commit/2250d1b335698a4f061e920bed6480c… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index a65afcf78e..b741987e98 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -34,7 +34,8 @@ Daniel-Constantin Mierla 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_add_identity(origTN, destTN, attest, origID, + 4.2. secsipid_check_identity(pubkeyVal) + 4.3. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) 5. Installation @@ -46,8 +47,9 @@ Daniel-Constantin Mierla 1.3. Set cache_dir parameter 1.4. Set cache_expire parameter 1.5. secsipid_check_identity usage - 1.6. secsipid_add_identity usage - 1.7. Libsecsipid usage + 1.6. secsipid_check_identity_pubkey usage + 1.7. secsipid_add_identity usage + 1.8. Libsecsipid usage Chapter 1. Admin Guide @@ -69,7 +71,8 @@ Chapter 1. Admin Guide 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_add_identity(origTN, destTN, attest, origID, x5u, + 4.2. secsipid_check_identity(pubkeyVal) + 4.3. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) 5. Installation @@ -155,7 +158,8 @@ modparam("secsipid", "cache_expire", 7200) 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_add_identity(origTN, destTN, attest, origID, x5u, + 4.2. secsipid_check_identity(pubkeyVal) + 4.3. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) 4.1. secsipid_check_identity(keyPath) @@ -186,7 +190,32 @@ request_route { header and payload using {s.select} and {s.decode.base64t} transformations together with jansson module. -4.2. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) +4.2. secsipid_check_identity(pubkeyVal) + + Similar to secsipid_check_identity() with the public key value provided + in the parameter. + + The parameters can contain pseudo-variables. + + This function can be used from ANY_ROUTE. + + Example 1.6. secsipid_check_identity_pubkey usage +... +request_route { + ... + http_client_query("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)") +; + ... + if(secsipid_check_identity_pubkey("$var(pubkey)")) { ... } + ... +} +... + + Further checks can be done with config operations, decoding the JWT + header and payload using {s.select} and {s.decode.base64t} + transformations together with jansson module. + +4.3. secsipid_add_identity(origTN, destTN, attest, origID, x5u, keyPath) Add Identity header using the key specified by "keyPath" to sign the JWT body. If origID is empty, a UUID string is generated to fill the @@ -200,7 +229,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.6. secsipid_add_identity usage + Example 1.7. secsipid_add_identity usage ... request_route { ... @@ -224,7 +253,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.7. Libsecsipid usage + Example 1.8. Libsecsipid usage ... go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/

1 0

git:master:c5ca978b: secsipid: docs for secsipid_check_identity_pubkey()
by Daniel-Constantin Mierla 17 Nov '20

17 Nov '20

Module: kamailio Branch: master Commit: c5ca978b5b3fc0c0f15a3f48c8f56233ed54a844 URL: https://github.com/kamailio/kamailio/commit/c5ca978b5b3fc0c0f15a3f48c8f5623… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-17T10:16:55+01:00 secsipid: docs for secsipid_check_identity_pubkey() --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c5ca978b5b3fc0c0f15a3f48c8f5623… Patch: https://github.com/kamailio/kamailio/commit/c5ca978b5b3fc0c0f15a3f48c8f5623… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 8f0a3d48db..ecc9060ce3 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -171,6 +171,40 @@ request_route { ... } ... +</programlisting> + </example> + <para> + Further checks can be done with config operations, decoding the JWT header + and payload using {s.select} and {s.decode.base64t} transformations + together with jansson module. + </para> + </section> + <section id="secsipid.f.secsipid_check_identity_pubkey"> + <title> + <function moreinfo="none">secsipid_check_identity(pubkeyVal)</function> + </title> + <para> + Similar to secsipid_check_identity() with the public key value + provided in the parameter. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_check_identity_pubkey</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + http_client_query("https://provider.com/stir-shaken/cert.pem", "$var(pubkey)"); + ... + if(secsipid_check_identity_pubkey("$var(pubkey)")) { ... } + ... +} +... </programlisting> </example> <para>

1 0

git:master:84fb4a20: secsipid: added secsipid_check_identity_pubkey(pubkeyVal)
by Daniel-Constantin Mierla 17 Nov '20

17 Nov '20

Module: kamailio Branch: master Commit: 84fb4a20a81e065d5bb1bc96b10697bf066ddf33 URL: https://github.com/kamailio/kamailio/commit/84fb4a20a81e065d5bb1bc96b10697b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-17T10:11:29+01:00 secsipid: added secsipid_check_identity_pubkey(pubkeyVal) - functions that checks the identity header validity with a public key provided in the parameter --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/84fb4a20a81e065d5bb1bc96b10697b… Patch: https://github.com/kamailio/kamailio/commit/84fb4a20a81e065d5bb1bc96b10697b… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index bd757b173d..b6f4bd53aa 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -46,6 +46,7 @@ static int child_init(int); static void mod_destroy(void); static int w_secsipid_check_identity(sip_msg_t *msg, char *pkeypath, char *str2); +static int w_secsipid_check_identity_pubkey(sip_msg_t *msg, char *pkeyval, char *str2); static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, char *pattest, char *porigid, char *px5u, char *pkeypath); @@ -54,6 +55,8 @@ static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, static cmd_export_t cmds[]={ {"secsipid_check_identity", (cmd_function)w_secsipid_check_identity, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"secsipid_check_identity_pubkey", (cmd_function)w_secsipid_check_identity_pubkey, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"secsipid_add_identity", (cmd_function)w_secsipid_add_identity, 6, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -162,6 +165,57 @@ static int w_secsipid_check_identity(sip_msg_t *msg, char *pkeypath, char *str2) return ki_secsipid_check_identity(msg, &keypath); } +/** + * + */ +static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) +{ + int ret = 1; + str ibody = STR_NULL; + hdr_field_t *hf; + + for (hf=msg->headers; hf; hf=hf->next) { + if (hf->name.len==SECSIPID_HDR_IDENTITY_LEN + && strncasecmp(hf->name.s, SECSIPID_HDR_IDENTITY, + SECSIPID_HDR_IDENTITY_LEN)==0) + break; + } + + if(hf == NULL) { + LM_DBG("no identity header\n"); + return -1; + } + + ibody = hf->body; + + ret = SecSIPIDCheckFullPubKey(ibody.s, ibody.len, secsipid_expire, keyval->s, + keyval->len); + + if(ret==0) { + LM_DBG("identity check: ok\n"); + return 1; + } + + LM_DBG("identity check: failed\n"); + return -1; +} + +/** + * + */ +static int w_secsipid_check_identity_pubkey(sip_msg_t *msg, char *pkeyval, char *str2) +{ + str keyval = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)pkeyval, &keyval)<0) { + LM_ERR("failed to get keyval parameter\n"); + return -1; + } + + return ki_secsipid_check_identity_pubkey(msg, &keyval); +} + + /** * */ @@ -277,6 +331,11 @@ static sr_kemi_t sr_kemi_secsipid_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR } }, + { str_init("secsipid"), str_init("secsipid_check_identity_pubkey"), + SR_KEMIP_INT, ki_secsipid_check_identity_pubkey, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:3bc4ff8d: secsipid: synced libsecsipid.h
by Daniel-Constantin Mierla 17 Nov '20

17 Nov '20

Module: kamailio Branch: master Commit: 3bc4ff8d6ce02ec1c10bb20fcc4d3b9d0c5ade0e URL: https://github.com/kamailio/kamailio/commit/3bc4ff8d6ce02ec1c10bb20fcc4d3b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-17T10:02:04+01:00 secsipid: synced libsecsipid.h --- Modified: src/modules/secsipid/libsecsipid.h --- Diff: https://github.com/kamailio/kamailio/commit/3bc4ff8d6ce02ec1c10bb20fcc4d3b9… Patch: https://github.com/kamailio/kamailio/commit/3bc4ff8d6ce02ec1c10bb20fcc4d3b9…

1 0

[kamailio/kamailio] Compile Kamailio with gcov for code coverage analysis (#2551)
by Thuan Pham 16 Nov '20

16 Nov '20

Hi, Has anyone successfully compiled Kmailio with gcov? I tried the following commands but these do not work ```bash make CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs -ftest-coverage" cfg make CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs -ftest-coverage" all ``` I received the following compilation errors ``` ... corex_rpc.c:(.text+0x209a): undefined reference to `get_debug_facility' corex_rpc.c:(.text+0x20d3): undefined reference to `log_level_info' corex_rpc.c:(.text+0x2108): undefined reference to `_ksr_slog_func' corex_rpc.c:(.text+0x2138): undefined reference to `log_stderr' corex_rpc.c:(.text+0x2161): undefined reference to `log_color' corex_rpc.c:(.text+0x218d): undefined reference to `dprint_color' corex_rpc.c:(.text+0x2194): undefined reference to `log_prefix_val' corex_rpc.c:(.text+0x21a0): undefined reference to `log_prefix_val' corex_rpc.c:(.text+0x21c3): undefined reference to `log_prefix_val' corex_rpc.c:(.text+0x21cf): undefined reference to `log_prefix_val' corex_rpc.c:(.text+0x2214): undefined reference to `log_level_info' corex_rpc.c:(.text+0x221c): undefined reference to `my_pid' corex_rpc.c:(.text+0x2236): undefined reference to `process_no' corex_rpc.c:(.text+0x2281): undefined reference to `log_color' corex_rpc.c:(.text+0x22a5): undefined reference to `dprint_color_reset' corex_rpc.c:(.text+0x22c3): undefined reference to `_km_log_func' corex_rpc.c:(.text+0x22ca): undefined reference to `log_prefix_val' corex_rpc.c:(.text+0x22d6): undefined reference to `log_prefix_val' corex_rpc.c:(.text+0x22fa): undefined reference to `log_prefix_val' corex_rpc.c:(.text+0x2306): undefined reference to `log_prefix_val' corex_rpc.c:(.text+0x2349): undefined reference to `log_level_info' corex_rpc.c:(.text+0x2361): undefined reference to `log_level_info' corex_rpc.c:(.text+0x2373): undefined reference to `get_debug_facility' corex_rpc.c:(.text+0x23bd): undefined reference to `dprint_crit' corex_rpc.c:(.text+0x23c6): undefined reference to `dprint_crit' collect2: error: ld returned 1 exit status ../../Makefile.rules:191: recipe for target 'corex.so' failed make[2]: *** [corex.so] Error 1 Makefile:511: recipe for target 'modules' failed make[1]: *** [modules] Error 1 make[1]: Leaving directory '/home/ubuntu/experiments/kamailio-gcov/src' ``` I suspect that my CFLAGS and LDFLAGS have overwritten the ones configured by Kamailio. However, I haven't successfully fixed these errors. You help/suggestions would be really appreciated! Thanks -- 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/2551

2 3

git:master:08a9ed3d: jsonrpcs: exported dispatch() function to kemi
by Daniel-Constantin Mierla 16 Nov '20

16 Nov '20

Module: kamailio Branch: master Commit: 08a9ed3d136c861f990e4f63c2c0544e08d9078d URL: https://github.com/kamailio/kamailio/commit/08a9ed3d136c861f990e4f63c2c0544… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-16T10:06:20+01:00 jsonrpcs: exported dispatch() function to kemi --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/08a9ed3d136c861f990e4f63c2c0544… Patch: https://github.com/kamailio/kamailio/commit/08a9ed3d136c861f990e4f63c2c0544… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 6f3491b038..c3b8003046 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1227,7 +1227,7 @@ static void mod_destroy(void) /** * */ -static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) +static int ki_jsonrpcs_dispatch(sip_msg_t* msg) { rpc_export_t* rpce; jsonrpc_ctx_t* ctx; @@ -1315,6 +1315,14 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) } +/** + * + */ +static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) +{ + return ki_jsonrpcs_dispatch(msg); +} + int jsonrpc_exec_ex(str *cmd, str *rpath) { rpc_export_t* rpce; @@ -1551,6 +1559,11 @@ static sr_kemi_xval_t* ki_jsonrpcs_response(sip_msg_t *msg) */ /* clang-format off */ static sr_kemi_t sr_kemi_jsonrpcs_exports[] = { + { str_init("jsonrpcs"), str_init("dispatch"), + SR_KEMIP_INT, ki_jsonrpcs_dispatch, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("jsonrpcs"), str_init("exec"), SR_KEMIP_INT, ki_jsonrpcs_exec, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:04f301af: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 16 Nov '20

16 Nov '20

Module: kamailio Branch: master Commit: 04f301af45b9def08bac4eddedb8b78898c8c5dc URL: https://github.com/kamailio/kamailio/commit/04f301af45b9def08bac4eddedb8b78… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-16T09:16:24+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/04f301af45b9def08bac4eddedb8b78… Patch: https://github.com/kamailio/kamailio/commit/04f301af45b9def08bac4eddedb8b78… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 2414364c70..baff8e8b32 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -795,6 +795,9 @@ modparam("acc", "acc_prepare_always", 1) corresponding script variable is not defined or has $null value. If set to 0, the value is saved as empty string (the existing behavior). + Database columns may need to be altered to DROP NOT NULL constraints + and DROP DEFAULT values in order to accept NULL values. + Default value is 0. Example 1.9. acc_extra_nullable example @@ -1148,6 +1151,9 @@ modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" not defined in config operation (or set to $null) will be saved as NULL. + Database columns may need to be altered to DROP NOT NULL constraints + and DROP DEFAULT values in order to accept NULL values. + Default value is 0. Example 1.36. cdr_extra_nullable example

1 0

[kamailio/kamailio] acc: docs - database column constraint alteration for acc_extra_nulla… (#2550)
by Anthony Messina 16 Nov '20

16 Nov '20

acc: docs - database column constraint alteration for acc_extra_nullable and cdr_extra_nullable [skip ci]   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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 - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [X] Related to issue #2531 (replace XXXX with an open issue number) #### Description  Documentation update related to https://github.com/kamailio/kamailio/issues/2531#issuecomment-724762135 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2550 -- Commit Summary -- * acc: docs - database column constraint alteration for acc_extra_nullable and cdr_extra_nullable [skip ci] -- File Changes -- M src/modules/acc/doc/acc_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2550.patch https://github.com/kamailio/kamailio/pull/2550.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/2550

2 2

← Newer
1
...
18
19
20
21
22
23
24
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020