sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
271 discussions

[kamailio/kamailio] nats: Add publish function (PR #2915)
by Stefan Mititelu 22 Dec '21

22 Dec '21

#### 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) - [X] 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Added a publish function to nats module. When the function is called, the routing process tries to connect to the url (param) and tries to send the payload (param) to the subject queue (param). No libuv is used for this. Probably a better approach is to make publisher workers (like subscriber workers) and pass payload from routing processes to publisher worker processes via shared memory. Right now I see this as an improvement and find the new function good enough, for now. @eschmidbauer what do you think of this? Thank you, Stefan P.S. Will update doc after review. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2915 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2915/commits/121ae374e0c309027eeb…">nats: Add publish function</a> -- File Changes -- M src/modules/nats/nats_mod.c (71) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2915.patch https://github.com/kamailio/kamailio/pull/2915.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/2915

2 12

[kamailio/kamailio] ldap: rename private function ldap_connect (PR #2975)
by micmac1 22 Dec '21

22 Dec '21

``` When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 ``` [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### 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 - [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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hi all, Small compile fix. I saw kamailio is failing to build on OpenWrt build bots since a recent openldap bump from 2.4.58 to 2.6.0. I linked a curl commit in the commit message, they also renamed some of their functions, although they did rename all their ldap_* functions to oldap_. I didn't dare do that in kamailio :) Renaming a single function was enough to make it compile again. Maybe you want to do something different to address this issue, I don't know. I didn't runtest this. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2975 -- Commit Summary -- * ldap: rename private function ldap_connect -- File Changes -- M src/modules/ldap/ldap_connect.c (2) M src/modules/ldap/ldap_connect.h (2) M src/modules/ldap/ldap_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2975.patch https://github.com/kamailio/kamailio/pull/2975.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/2975

2 2

git:master:362c6de0: ldap: rename private function ldap_connect
by Daniel-Constantin Mierla 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: 362c6de08058948d0a70a1eeb14ec718f922b4e5 URL: https://github.com/kamailio/kamailio/commit/362c6de08058948d0a70a1eeb14ec71… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-22T08:43:33+01:00 ldap: rename private function ldap_connect When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/ldap/ldap_connect.c Modified: src/modules/ldap/ldap_connect.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/362c6de08058948d0a70a1eeb14ec71… Patch: https://github.com/kamailio/kamailio/commit/362c6de08058948d0a70a1eeb14ec71… --- diff --git a/src/modules/ldap/ldap_connect.c b/src/modules/ldap/ldap_connect.c index 06850705e3..352db480ff 100644 --- a/src/modules/ldap/ldap_connect.c +++ b/src/modules/ldap/ldap_connect.c @@ -185,7 +185,7 @@ int ldap_connect_ex(char *_ld_name, int llevel) return 0; } -int ldap_connect(char *_ld_name) +int oldap_connect(char *_ld_name) { return ldap_connect_ex(_ld_name, L_DBG); } diff --git a/src/modules/ldap/ldap_connect.h b/src/modules/ldap/ldap_connect.h index 32a39e8c57..725e55cd90 100644 --- a/src/modules/ldap/ldap_connect.h +++ b/src/modules/ldap/ldap_connect.h @@ -31,7 +31,7 @@ #include "../../core/str.h" #include "../../core/dprint.h" -extern int ldap_connect(char *_ld_name); +extern int oldap_connect(char *_ld_name); extern int ldap_disconnect(char *_ld_name); extern int ldap_reconnect(char *_ld_name); extern int ldap_get_vendor_version(char **_version); diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index 4eb4118c5b..1fea95e458 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -167,7 +167,7 @@ static int child_init(int rank) return -1; } - if(ldap_connect(ld_name) != 0) { + if(oldap_connect(ld_name) != 0) { LM_ERR("[%s]: failed to connect to LDAP host(s)\n", ld_name); ldap_disconnect(ld_name); return -1;

1 0

git:master:b6e264c9: uac: exposed internal flags for $uac_req(key) variable
by Daniel-Constantin Mierla 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: b6e264c9780fc0432e6e746f473024e41bc1126b URL: https://github.com/kamailio/kamailio/commit/b6e264c9780fc0432e6e746f473024e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-22T08:37:40+01:00 uac: exposed internal flags for $uac_req(key) variable - if set to 1, the password is considered to be HA1 value - GH #2982 --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/b6e264c9780fc0432e6e746f473024e… Patch: https://github.com/kamailio/kamailio/commit/b6e264c9780fc0432e6e746f473024e… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index d906a1c27f..e5ea420d72 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -43,6 +43,8 @@ #include "uac_send.h" #include "uac_reg.h" +#define UAC_SEND_FL_HA1 (1<<0) + #define MAX_UACH_SIZE 2048 #define MAX_UACB_SIZE 32768 #define MAX_UACD_SIZE 128 @@ -492,6 +494,19 @@ int pv_set_uac_req(struct sip_msg* msg, pv_param_t *param, } _uac_req.evtype = tval->ri; break; + case 17: + if(tval==NULL) + { + _uac_req.flags = 0; + return 0; + } + if(!(tval->flags&PV_VAL_INT)) + { + LM_ERR("Invalid value type\n"); + return -1; + } + _uac_req.flags = tval->ri; + break; } return 0; } @@ -528,6 +543,8 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) case 5: if(strncmp(in->s, "auser", 5)==0) sp->pvp.pvn.u.isname.name.n = 9; + else if(strncmp(in->s, "flags", 5)==0) + sp->pvp.pvn.u.isname.name.n = 17; else goto error; break; case 6: @@ -721,8 +738,8 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) struct hdr_field *hdr; HASHHEX response; str *new_auth_hdr = NULL; - static struct authenticate_body auth; - struct uac_credential cred; + static authenticate_body_t auth; + uac_credential_t cred; char b_hdrs[MAX_UACH_SIZE]; str s_hdrs; uac_req_t uac_r; @@ -771,6 +788,9 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) cred.realm = auth.realm; cred.user = tp->s_auser; cred.passwd = tp->s_apasswd; + if(tp->flags & UAC_SEND_FL_HA1) { + cred.aflags = UAC_FLCRED_HA1; + } do_uac_auth(&tp->s_method, &tp->s_ruri, &cred, &auth, response); new_auth_hdr=build_authorization_hdr(ps->code, &tp->s_ruri, &cred,

1 0

[kamailio/kamailio] Potential resource leaks (Issue #2983)
by ryancaicse 22 Dec '21

22 Dec '21

`fclose(pf);` should be put before `Line 295`? https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2983 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2983(a)github.com>

3 6

git:master:84cdc334: auth_identity: close file in case of errors
by Daniel-Constantin Mierla 22 Dec '21

22 Dec '21

Module: kamailio Branch: master Commit: 84cdc33429c61fe7cac91cbedf96bef560267313 URL: https://github.com/kamailio/kamailio/commit/84cdc33429c61fe7cac91cbedf96bef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-22T08:12:20+01:00 auth_identity: close file in case of errors - GH #2983 --- Modified: src/modules/auth_identity/auth_identity.c --- Diff: https://github.com/kamailio/kamailio/commit/84cdc33429c61fe7cac91cbedf96bef… Patch: https://github.com/kamailio/kamailio/commit/84cdc33429c61fe7cac91cbedf96bef… --- diff --git a/src/modules/auth_identity/auth_identity.c b/src/modules/auth_identity/auth_identity.c index 4b4bb4bb08..d43df5a6c5 100644 --- a/src/modules/auth_identity/auth_identity.c +++ b/src/modules/auth_identity/auth_identity.c @@ -359,18 +359,22 @@ static int mod_init(void) } if (x509_get_notafter(&glb_imycertnotafter, pmycert)) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: Error getting certificate expiration date\n"); + fclose(hpemfile); return -13; } if (x509_get_notbefore(&ttmp, pmycert)) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: Error getting certificate validity date\n"); + fclose(hpemfile); return -13; } if ((tnow=time(0)) < 0) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: time error %s\n", strerror(errno)); + fclose(hpemfile); return -13; } if (tnow < ttmp || tnow > glb_imycertnotafter) { LOG(L_ERR, "AUTH_IDENTITY:mod_init: Date of certificate is invalid (%s)\n", glb_sservercertpath); + fclose(hpemfile); return -14; }

1 0

git:master:81b8eb2c: ctl: implement long and long long types of values
by Daniel-Constantin Mierla 21 Dec '21

21 Dec '21

Module: kamailio Branch: master Commit: 81b8eb2c2f8e3fb370185bad05bd77656351dd06 URL: https://github.com/kamailio/kamailio/commit/81b8eb2c2f8e3fb370185bad05bd776… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-21T10:31:01+01:00 ctl: implement long and long long types of values - convert/store from/to double, based on supported types by binrpc, similar to xmlrpc --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/81b8eb2c2f8e3fb370185bad05bd776… Patch: https://github.com/kamailio/kamailio/commit/81b8eb2c2f8e3fb370185bad05bd776…

1 0

git:master:ff2d9e84: xmlrpc: implemented specifier for long and long long types of values
by Daniel-Constantin Mierla 21 Dec '21

21 Dec '21

Module: kamailio Branch: master Commit: ff2d9e84e43e87483cacc6bdbcf875f650b4d292 URL: https://github.com/kamailio/kamailio/commit/ff2d9e84e43e87483cacc6bdbcf875f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-21T09:07:17+01:00 xmlrpc: implemented specifier for long and long long types of values - they are mapped over double, xmlrpc defines only int and double types http://xmlrpc.com/spec.md --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ff2d9e84e43e87483cacc6bdbcf875f… Patch: https://github.com/kamailio/kamailio/commit/ff2d9e84e43e87483cacc6bdbcf875f…

1 0

git:master:92683311: jsonrpcs: support for long/long values in rpc messages
by Daniel-Constantin Mierla 20 Dec '21

20 Dec '21

Module: kamailio Branch: master Commit: 92683311d16dafe56951d9603a3a1e9a1b219d9a URL: https://github.com/kamailio/kamailio/commit/92683311d16dafe56951d9603a3a1e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-20T10:15:36+01:00 jsonrpcs: support for long/long values in rpc messages - l and j for long and unsigned long - L and J for long long and unsigned long long --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/92683311d16dafe56951d9603a3a1e9… Patch: https://github.com/kamailio/kamailio/commit/92683311d16dafe56951d9603a3a1e9… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index a5a92e1537..a966f6438e 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -484,6 +484,18 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) case 'f': nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, double)); break; + case 'l': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, long)); + break; + case 'j': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, unsigned long)); + break; + case 'L': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, long long)); + break; + case 'J': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, unsigned long long)); + break; case 'b': nj = srjson_CreateBool(ctx->jrpl, ((va_arg(*ap, int)==0)?0:1)); break; @@ -586,6 +598,10 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) { int *int_ptr; unsigned int *uint_ptr; + long *long_ptr; + unsigned long *ulong_ptr; + long long *llong_ptr; + unsigned long long *ullong_ptr; char **char_ptr; double *double_ptr; str *str_ptr; @@ -635,6 +651,22 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) double_ptr = va_arg(ap, double*); *double_ptr = ctx->req_node->valuedouble; break; + case 'l': /* Long */ + long_ptr = va_arg(ap, long*); + *long_ptr = SRJSON_GET_LONG(ctx->req_node); + break; + case 'j': /* Unsigned Long */ + ulong_ptr = va_arg(ap, unsigned long*); + *ulong_ptr = SRJSON_GET_ULONG(ctx->req_node); + break; + case 'L': /* Long Long */ + llong_ptr = va_arg(ap, long long*); + *llong_ptr = SRJSON_GET_LLONG(ctx->req_node); + break; + case 'J': /* Unsigned Long Long */ + ullong_ptr = va_arg(ap, unsigned long long*); + *ullong_ptr = SRJSON_GET_ULLONG(ctx->req_node); + break; case 's': /* zero terminated string */ char_ptr = va_arg(ap, char**); if(ctx->req_node->type==srjson_String) {

1 0

git:master:04763fe7: core: utils/srjon - macros to get long long values
by Daniel-Constantin Mierla 20 Dec '21

20 Dec '21

Module: kamailio Branch: master Commit: 04763fe7de760005535e145f7fd783bbb60b2586 URL: https://github.com/kamailio/kamailio/commit/04763fe7de760005535e145f7fd783b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-20T10:14:27+01:00 core: utils/srjon - macros to get long long values --- Modified: src/core/utils/srjson.h --- Diff: https://github.com/kamailio/kamailio/commit/04763fe7de760005535e145f7fd783b… Patch: https://github.com/kamailio/kamailio/commit/04763fe7de760005535e145f7fd783b… --- diff --git a/src/core/utils/srjson.h b/src/core/utils/srjson.h index dd56449340..dce2ae9252 100644 --- a/src/core/utils/srjson.h +++ b/src/core/utils/srjson.h @@ -53,6 +53,8 @@ extern "C" #define SRJSON_GET_UINT(sj) ((unsigned int)((sj)->valuedouble)) #define SRJSON_GET_LONG(sj) ((long)((sj)->valuedouble)) #define SRJSON_GET_ULONG(sj) ((unsigned long)((sj)->valuedouble)) +#define SRJSON_GET_LLONG(sj) ((long long)((sj)->valuedouble)) +#define SRJSON_GET_ULLONG(sj) ((unsigned long long)((sj)->valuedouble)) /* The srjson node structure: */ typedef struct srjson {

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021