sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
312 discussions

git:master:1a406e09: core: flags - use unsigned literal for bit shifting operations
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 1a406e093ea7ac07428c92aec21ac67f8caa1093 URL: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 core: flags - use unsigned literal for bit shifting operations --- Modified: src/core/flags.c --- Diff: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… Patch: https://github.com/kamailio/kamailio/commit/1a406e093ea7ac07428c92aec21ac67… --- diff --git a/src/core/flags.c b/src/core/flags.c index 551eefe2ee..207849c198 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -43,12 +43,12 @@ static flag_t sflags = 0; int setflag( struct sip_msg* msg, flag_t flag ) { - msg->flags |= 1 << flag; + msg->flags |= 1u << flag; return 1; } int resetflag( struct sip_msg* msg, flag_t flag ) { - msg->flags &= ~ (1 << flag); + msg->flags &= ~ (1u << flag); return 1; } @@ -58,7 +58,7 @@ int resetflags( struct sip_msg* msg, flag_t flags ) { } int isflagset( struct sip_msg* msg, flag_t flag ) { - return (msg->flags & (1<<flag)) ? 1 : -1; + return (msg->flags & (1u<<flag)) ? 1 : -1; } int flag_in_range( flag_t flag ) { @@ -79,21 +79,21 @@ int setsflagsval(flag_t val) int setsflag(flag_t flag) { - sflags |= 1 << flag; + sflags |= 1u << flag; return 1; } int resetsflag(flag_t flag) { - sflags &= ~ (1 << flag); + sflags &= ~ (1u << flag); return 1; } int issflagset(flag_t flag) { - return (sflags & (1<<flag)) ? 1 : -1; + return (sflags & (1u<<flag)) ? 1 : -1; } @@ -126,7 +126,7 @@ static unsigned char registered_flags[MAX_FLAG+1]; void init_named_flags() { int r; - + for (r=0; r<FLAGS_NAME_HASH_ENTRIES; r++) clist_init(&name2flags[r], next, prev); } @@ -149,7 +149,7 @@ inline static struct flag_entry* flag_search(struct flag_hash_head* lst, char* name, int len) { struct flag_entry* fe; - + clist_foreach(lst, fe, next){ if ((fe->name.len==len) && (memcmp(fe->name.s, name, len)==0)){ /* found */ @@ -176,7 +176,7 @@ inline static struct flag_entry* get_flag_entry(char* name, int len) int get_flag_no(char* name, int len) { struct flag_entry* fe; - + fe=get_flag_entry(name, len); return (fe)?fe->no:-1; } @@ -184,7 +184,7 @@ int get_flag_no(char* name, int len) /* resgiter a new flag name and associates it with pos - * pos== -1 => any position will do + * pos== -1 => any position will do * returns flag pos on success (>=0) * -1 flag is an alias for an already existing flag * -2 flag already registered @@ -199,7 +199,7 @@ int register_flag(char* name, int pos) static unsigned int crt_flag=0; unsigned int last_flag; unsigned int h; - + len=strlen(name); h=get_hash1_raw(name, len) & (FLAGS_NAME_HASH_ENTRIES-1); /* check if the name already exists */ @@ -235,7 +235,7 @@ int register_flag(char* name, int pos) } } registered_flags[pos]++; - + e=pkg_malloc(sizeof(struct flag_entry)); if (e==0){ PKG_MEM_ERROR; @@ -259,7 +259,7 @@ int setxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] |= 1 << fb; + msg->xflags[fi] |= 1u << fb; return 1; } @@ -272,7 +272,7 @@ int resetxflag(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - msg->xflags[fi] &= ~ (1 << fb); + msg->xflags[fi] &= ~ (1u << fb); return 1; } @@ -285,5 +285,5 @@ int isxflagset(struct sip_msg* msg, flag_t flag) uint32_t fb; fi = flag / (sizeof(flag_t)*CHAR_BIT); fb = flag % (sizeof(flag_t)*CHAR_BIT); - return (msg->xflags[fi] & (1<<fb)) ? 1 : -1; + return (msg->xflags[fi] & (1u<<fb)) ? 1 : -1; }

1 0

git:master:8c30109d: nat_traversal: declare flag literal as unsigned
by Daniel-Constantin Mierla 29 Nov '21

29 Nov '21

Module: kamailio Branch: master Commit: 8c30109df0b479cc3fce39a765717149e9c70ddf URL: https://github.com/kamailio/kamailio/commit/8c30109df0b479cc3fce39a76571714… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-29T11:25:08+01:00 nat_traversal: declare flag literal as unsigned - GH #2954 --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/8c30109df0b479cc3fce39a76571714… Patch: https://github.com/kamailio/kamailio/commit/8c30109df0b479cc3fce39a76571714… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index edaa6dfe3d..58d1b78c70 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -85,7 +85,7 @@ MODULE_VERSION /* WARNING: Keep this aligned with parser/msg_parser.h! */ -#define FL_DO_KEEPALIVE (1 << 31) +#define FL_DO_KEEPALIVE (1u << 31) #define HASH_SIZE 512

1 0

git:master:1ba6f2fa: modules: readme files regenerated - uac_redirect ... [skip ci]
by Kamailio Dev 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: 1ba6f2fa77459ed1fcec04f446fe9e8c210b94d6 URL: https://github.com/kamailio/kamailio/commit/1ba6f2fa77459ed1fcec04f446fe9e8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-26T22:46:22+01:00 modules: readme files regenerated - uac_redirect ... [skip ci] --- Modified: src/modules/uac_redirect/README --- Diff: https://github.com/kamailio/kamailio/commit/1ba6f2fa77459ed1fcec04f446fe9e8… Patch: https://github.com/kamailio/kamailio/commit/1ba6f2fa77459ed1fcec04f446fe9e8… --- diff --git a/src/modules/uac_redirect/README b/src/modules/uac_redirect/README index 88e9e22859..812755bc5d 100644 --- a/src/modules/uac_redirect/README +++ b/src/modules/uac_redirect/README @@ -212,8 +212,7 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") Its values may be: * acc_log_request * acc_db_request - * acc_rad_request - * acc_diam_request + * acc_request The default value is “acc_log_request”.

1 0

git:master:a0ef1ccd: uac_redirect: use inter-module acc api instead of config export lookup
by Daniel-Constantin Mierla 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: a0ef1ccd17368775d68f8687f25b0d72656ac273 URL: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-26T15:32:54+01:00 uac_redirect: use inter-module acc api instead of config export lookup - use acc functions via inter-module acc api, intead of config file function export lookup, to get the right signature and avoid workaround of fixing a modparam like a function param and improper access of expected fields by offset - GH #2953 --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml Modified: src/modules/uac_redirect/rd_funcs.c Modified: src/modules/uac_redirect/rd_funcs.h Modified: src/modules/uac_redirect/uac_redirect.c --- Diff: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7… Patch: https://github.com/kamailio/kamailio/commit/a0ef1ccd17368775d68f8687f25b0d7…

1 0

git:master:35767f38: acc: expose accounting functions via inter-module api
by Daniel-Constantin Mierla 26 Nov '21

26 Nov '21

Module: kamailio Branch: master Commit: 35767f387bbcd2766bf7a4ff1345183612219225 URL: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-25T13:36:59+01:00 acc: expose accounting functions via inter-module api --- Modified: src/modules/acc/acc_api.h Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… Patch: https://github.com/kamailio/kamailio/commit/35767f387bbcd2766bf7a4ff1345183… --- diff --git a/src/modules/acc/acc_api.h b/src/modules/acc/acc_api.h index 0a6df2e32c..04b893483b 100644 --- a/src/modules/acc/acc_api.h +++ b/src/modules/acc/acc_api.h @@ -146,8 +146,16 @@ typedef acc_extra_t* (*parse_extra_f)(char *extra_str); typedef int (*register_cdr_engine_f)(cdr_engine_t *eng); typedef int (*cdr_api_exec_f)(struct dlg_cell *dlg, struct sip_msg *rq, cdr_engine_t *eng, acc_param_t* comment); +typedef int (*acc_log_request_f)(sip_msg_t *msg, str *comment); +typedef int (*acc_db_request_f)(sip_msg_t *msg, str *comment, str *dbtable); +typedef int (*acc_request_f)(sip_msg_t *msg, str *comment, str *dbtable); + + /* the acc API */ typedef struct acc_api { + acc_log_request_f acc_log_request; + acc_db_request_f acc_db_request; + acc_request_f acc_request; leg_info_f get_leg_info; core2strar_f get_core_attrs; extra2strar_f get_extra_attrs; diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index 5afcab113b..801a908025 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -644,6 +644,12 @@ static int bind_acc(acc_api_t* api) return -1; } + memset(api, 0, sizeof(acc_api_t)); + + api->acc_log_request = ki_acc_log_request; + api->acc_db_request = ki_acc_db_request; + api->acc_request = ki_acc_request; + api->register_engine = acc_register_engine; api->get_leg_info = get_leg_info; api->get_core_attrs = core2strar;

1 0

[kamailio/kamailio] Config errors (Issue #2957)
by SerhiiZahuba 26 Nov '21

26 Nov '21

Perhaps I am doing something wrong? New installation, new config file and when starting the server I see an error 1) parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 165, column 1-5: syntax error 164 / * LOG Levels: 3 = DBG, 2 = INFO, 1 = NOTICE, 0 = WARN, -1 = ERR, ... * / 165 debug = DBGLEVEL 166 2) /usr/local/etc/kamailio/kamailio.cfg, line 34, column 1-9: syntax error 32 # *** To enable authentication execute: 33 #mysql 34 WITH_AUTH Where can there be an error if this file is downloaded from your server? Please tell me this is driving me crazy. -- 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/2957

2 4

parse error in core/receive.c
by Juha Heinanen 26 Nov '21

26 Nov '21

Is it only me who gets this with master? -- Juha CC (gcc) [pres-serv] core/receive.o In file included from core/ut.h:42, from core/ip_addr.h:39, from core/receive.h:32, from core/receive.c:34: core/receive.c: In function 'receive_msg': core/receive.c:376:5: error: expected ')' before 'ip_addr2a' 376 | ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, | ^~~~~~~~~ core/dprint.h:317:30: note: in definition of macro 'LOG_FX' 317 | _ksr_slog_func(&__kld, fmt, ## args); \ | ^~~ core/dprint.h:351:4: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ...

1 1

[kamailio/kamailio] cannot adopt OIDs in KAMAILIO-SIP-COMMON-MIB (Issue #2955)
by abonela 25 Nov '21

25 Nov '21

Please try to fill this template as much as possible for any issue. It helps the developers to troubleshoot the issue. we have configured snmp module following https://www.kamailio.org/dokuwiki/doku.php/utils:kamailio-and-snmp ### Description  we could able to poll or snmpwalk most of the OIDs in KAMAILIO-REG-MIB , KAMAILIO-SIP-SERVER-MIB but having issues below from KAMAILIO-SIP-COMMON-MIB snmpd[358730]: Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsMethod ::= { kamailioSIPMethodStatsEntry 1 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsOutbounds ::= { kamailioSIPMethodStatsEntry 2 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatsInbounds ::= { kamailioSIPMethodStatsEntry 3 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeMethod ::= { kamailioSIPStatusCodesEntry 1 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeValue ::= { kamailioSIPStatusCodesEntry 2 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeIns ::= { kamailioSIPStatusCodesEntry 3 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeOuts ::= { kamailioSIPStatusCodesEntry 4 } Cannot adopt OID in KAMAILIO-SIP-COMMON-MIB: kamailioSIPStatusCodeRowStatus ::= { kamailioSIPStatusCodesEntry 5 } ### Troubleshooting root@host# snmpwalk -v2c -c public localhost .1.3.6.1.4.1.34352.3.1.1.1.4.1.1.2.0 SNMPv2-SMI::enterprises.34352.3.1.1.1.4.1.1.2.0 = No Such Object available on this agent at this OID root@host# snmpwalk -v2c -c public localhost .1.3.6.1.4.1.34352.3.1.1.1.4.1.1.2 SNMPv2-SMI::enterprises.34352.3.1.1.1.4.1.1.2 = No Such Object available on this agent at this OID #### Reproduction using snmpwalk or snmget to any of the above mentioned kamailioSIPStats* OIDs will do ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.1 (x86_64/linux) 307af8-dirty ``` * **Operating System**:  ``` No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.2 LTS Release: 20.04 Codename: focal ``` -- 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/2955

2 2

[kamailio/kamailio] OpenSSL:It(PTHREAD_PROCESS_SHARED) is not initialized, which may cause the Kamailio worker process to block (Issue #2956)
by 陈庆毅 25 Nov '21

25 Nov '21

why the process sharing option (PTHREAD_PROCESS_SHARED) was not used for initialization, which might cause the Kamailio worker process to block -- 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/2956

2 2

git:master:b3f77460: tls: get local/remote issuer line via $tls(key)
by Daniel-Constantin Mierla 25 Nov '21

25 Nov '21

Module: kamailio Branch: master Commit: b3f77460ff78f4d38542ca79bb13398180cd7710 URL: https://github.com/kamailio/kamailio/commit/b3f77460ff78f4d38542ca79bb13398… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-25T09:55:31+01:00 tls: get local/remote issuer line via $tls(key) - new keys: m_issuer_line, p_issuer_line --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/b3f77460ff78f4d38542ca79bb13398… Patch: https://github.com/kamailio/kamailio/commit/b3f77460ff78f4d38542ca79bb13398… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 9a1f6b94b3..985e6dcec1 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -1263,6 +1263,13 @@ int pv_parse_tls_name(pv_spec_p sp, str *in) return -1; switch(in->len) { + case 13: + if(strncmp(in->s, "m_issuer_line", 13)==0) + sp->pvp.pvn.u.isname.name.n = 1001; + else if(strncmp(in->s, "p_issuer_line", 13)==0) + sp->pvp.pvn.u.isname.name.n = 5001; + else goto error; + break; case 14: if(strncmp(in->s, "m_subject_line", 14)==0) sp->pvp.pvn.u.isname.name.n = 1000; @@ -1309,9 +1316,9 @@ int pv_get_tls(struct sip_msg *msg, pv_param_t *param, : SSL_get_peer_certificate(ssl); if (cert == NULL) { if (param->pvn.u.isname.name.n < 5000) { - LM_ERR("Unable to retrieve my TLS certificate from SSL structure\n"); + LM_ERR("failed to retrieve my TLS certificate from SSL structure\n"); } else { - LM_ERR("Unable to retrieve peer TLS certificate from SSL structure\n"); + LM_ERR("failed to retrieve peer TLS certificate from SSL structure\n"); } goto error; } @@ -1325,8 +1332,21 @@ int pv_get_tls(struct sip_msg *msg, pv_param_t *param, if(X509_NAME_oneline(X509_get_subject_name(cert), sv.s, sv.len)==NULL) { goto error; } + tcpconn_put(c); + return pv_get_strzval(msg, param, res, sv.s); + break; + + case 1001: + case 5001: + sv.s = pv_get_buffer(); + sv.len = pv_get_buffer_size() - 1; + if(X509_NAME_oneline(X509_get_issuer_name(cert), sv.s, sv.len)==NULL) { + goto error; + } + tcpconn_put(c); return pv_get_strzval(msg, param, res, sv.s); break; + default: goto error; }

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
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 2021