sr-dev September 2024

sr-dev@lists.kamailio.org

15 participants
169 discussions

[kamailio/kamailio] core: parser - use sip_parser_log (PR #3967)

by Lucian Balaceanu

Silencing messages that tend to appear when processing HEP.   #### 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) - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3967 -- Commit Summary -- * core: parser - use sip_parser_log -- File Changes -- M src/core/parser/msg_parser.c (5) M src/core/parser/parse_hname2.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3967.patch https://github.com/kamailio/kamailio/pull/3967.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3967 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3967(a)github.com>

2 months, 1 week

git:master:e6a3b355: core: parser - use sip_parser_log

by Lucian Balaceanu

Module: kamailio Branch: master Commit: e6a3b3554af01e5141ba063df408a06b28261927 URL: https://github.com/kamailio/kamailio/commit/e6a3b3554af01e5141ba063df408a06… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2024-09-09T14:01:48+03:00 core: parser - use sip_parser_log Silencing messages that tend to appear when processing HEP. --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/parse_hname2.c --- Diff: https://github.com/kamailio/kamailio/commit/e6a3b3554af01e5141ba063df408a06… Patch: https://github.com/kamailio/kamailio/commit/e6a3b3554af01e5141ba063df408a06… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index a8504873073..3e094c50907 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -95,7 +95,7 @@ char *get_hdr_field( tmp = parse_hname(buf, end, hdr); if(hdr->type == HDR_ERROR_T) { - ERR("bad header\n"); + LOG(cfg_get(core, core_cfg, sip_parser_log), "bad header\n"); goto error; } @@ -336,7 +336,8 @@ int parse_headers( rest = get_hdr_field(tmp, end, hf); switch(hf->type) { case HDR_ERROR_T: - ERR("bad header field [%.*s]\n", + LOG(cfg_get(core, core_cfg, sip_parser_log), + "bad header field [%.*s]\n", (end - tmp > 100) ? 100 : (int)(end - tmp), tmp); goto error; case HDR_EOH_T: diff --git a/src/core/parser/parse_hname2.c b/src/core/parser/parse_hname2.c index e7d0792e988..49c62d3d181 100644 --- a/src/core/parser/parse_hname2.c +++ b/src/core/parser/parse_hname2.c @@ -278,7 +278,8 @@ char *parse_sip_header_name(char *const begin, const char *const end, if(*p != ' ' && *p != '\t') { /* no white space - bad header name format */ if(likely(logmode)) { - LM_ERR("invalid header name for [%.*s]\n", (int)(end - begin), + LOG(cfg_get(core, core_cfg, sip_parser_log), + "invalid header name for [%.*s]\n", (int)(end - begin), begin); } hdr->type = HDR_ERROR_T;

2 months, 1 week

RFC: Support for icc or suncc compilers

by Daniel-Constantin Mierla

Hello, I was wondering if icc or suncc compilers are still used in the community, and by that if it still worth trying to support them via Makefiles and compile time flags (defines). Personally I haven't had to deal with them for more than 10-15 years, I have no access with a system offering them. Furthermore, I am not even sure if the code compiles with them. Maybe someone (or many) in the community use one or the other and confirm that they still worth to be kept. If not, maybe we can consider them for removing, it can be a good task to be done during Kamailio development meeting planned in Dusseldorf, Germany during November. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio Advanced Training, October 8-10, 2024 -- asipto.com

2 months, 1 week

cdp: Should "poll" be used instead of "select"?

by whliu＠citictel.com

Hi All, I am using kamailio 5.8.3 as IMS-PCSCF. It connects to PCRF and uses module. It is found that in module cdp, "select" is used in receiving message, which has a limitation in the value for file descriptor. It does not work if the value of fd is greater than 1023. Any idea on how to tackle the case when the value of fd is greater than 1023? Please advise. Thank you. Regards, Hong

2 months, 1 week

git:master:c5c84099: core: dprint - add possibility to set the structured log function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c5c84099fc29623c4f0b8faf9e6151eeaf4421c1 URL: https://github.com/kamailio/kamailio/commit/c5c84099fc29623c4f0b8faf9e6151e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-09T11:29:20+02:00 core: dprint - add possibility to set the structured log function --- Modified: src/core/dprint.c Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/c5c84099fc29623c4f0b8faf9e6151e… Patch: https://github.com/kamailio/kamailio/commit/c5c84099fc29623c4f0b8faf9e6151e… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 83d1e30f3ca..f167fac0fc4 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -828,6 +828,14 @@ void ksr_slog_init(char *ename) } } +/** + * + */ +void km_slog_func_set(ksr_slog_f f) +{ + _ksr_slog_func = f; +} + static void log_callid_set(sip_msg_t *msg) { if(!(_ksr_slog_json_flags & KSR_SLOGJSON_FL_CALLID)) { diff --git a/src/core/dprint.h b/src/core/dprint.h index 13957b269c9..a72b297e194 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -112,7 +112,8 @@ /** * */ -typedef struct ksr_loglevels { +typedef struct ksr_loglevels +{ int ll_alert; int ll_bug; int ll_crit; @@ -123,8 +124,10 @@ typedef struct ksr_loglevels { int ll_dbg; } ksr_loglevels_t; -#define KSR_LOGLEVELS_DEFAULTS {L_ALERT, L_BUG, L_CRIT2, L_ERR, L_WARN, \ - L_NOTICE, L_INFO, L_DBG} +#define KSR_LOGLEVELS_DEFAULTS \ + { \ + L_ALERT, L_BUG, L_CRIT2, L_ERR, L_WARN, L_NOTICE, L_INFO, L_DBG \ + } /** * data fileds used for structured logging */ @@ -148,6 +151,7 @@ typedef void (*ksr_slog_f)(ksr_logdata_t *, const char *, ...); void ksr_slog_init(char *ename); extern ksr_slog_f _ksr_slog_func; +void km_slog_func_set(ksr_slog_f f); /** @brief my_pid(), process_no are from pt.h but we cannot \#include it here because of circular dependencies */ @@ -458,9 +462,9 @@ void log_prefix_init(void); #ifdef MOD_NAMEID -#define KSR_LLMODVAR_COMBINEZ(X,Y) X##Y -#define KSR_LLMODVAR_COMBINE(X,Y) KSR_LLMODVAR_COMBINEZ(X,Y) -#define KSR_LLMODVAR KSR_LLMODVAR_COMBINE(_ksr_loglevels_,MOD_NAMEID) +#define KSR_LLMODVAR_COMBINEZ(X, Y) X##Y +#define KSR_LLMODVAR_COMBINE(X, Y) KSR_LLMODVAR_COMBINEZ(X, Y) +#define KSR_LLMODVAR KSR_LLMODVAR_COMBINE(_ksr_loglevels_, MOD_NAMEID) /* use local log level mapping */ #define LLM_ALERT(fmt, args...) LOG(KSR_LLMODVAR.alert, fmt, ##args)

2 months, 2 weeks

[kamailio/kamailio] New weighted distribution over hash algorithm for dispatcher module. (Issue #3916)

by Ben Kaufman

### Description Feature request/suggestion: Currently, the predicative hashing algorithm for dispatcher gives equal weight to all members of the set. It would be convenient to use the rweight attribute to allow something like [weighted rendezvous hashing](https://en.wikipedia.org/wiki/Rendezvous_hashing#Weighted_rendezvo… to provide weighted load balancing will still keeping correct routing for stateless messages (most specifically CANCELs). -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3916 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3916(a)github.com>

2 months, 2 weeks

git:master:8a13a1d8: utils/kamctl: regenerate db table definitions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8a13a1d8301aa22baa9b3a52b891fd04a04c3768 URL: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-06T10:16:50+02:00 utils/kamctl: regenerate db table definitions --- Modified: utils/kamctl/db_sqlite/htable-create.sql Modified: utils/kamctl/mysql/htable-create.sql Modified: utils/kamctl/oracle/htable-create.sql Modified: utils/kamctl/postgres/htable-create.sql Modified: utils/kamctl/xhttp_pi/acc-mod Modified: utils/kamctl/xhttp_pi/alias_db-mod Modified: utils/kamctl/xhttp_pi/auth_db-mod Modified: utils/kamctl/xhttp_pi/avpops-mod Modified: utils/kamctl/xhttp_pi/carrierroute-mod Modified: utils/kamctl/xhttp_pi/cpl-mod Modified: utils/kamctl/xhttp_pi/dialog-mod Modified: utils/kamctl/xhttp_pi/dialplan-mod Modified: utils/kamctl/xhttp_pi/dispatcher-mod Modified: utils/kamctl/xhttp_pi/domain-mod Modified: utils/kamctl/xhttp_pi/domainpolicy-mod Modified: utils/kamctl/xhttp_pi/drouting-mod Modified: utils/kamctl/xhttp_pi/group-mod Modified: utils/kamctl/xhttp_pi/htable-mod Modified: utils/kamctl/xhttp_pi/imc-mod Modified: utils/kamctl/xhttp_pi/lcr-mod Modified: utils/kamctl/xhttp_pi/matrix-mod Modified: utils/kamctl/xhttp_pi/mohqueue-mod Modified: utils/kamctl/xhttp_pi/msilo-mod Modified: utils/kamctl/xhttp_pi/mtree-mod Modified: utils/kamctl/xhttp_pi/pdt-mod Modified: utils/kamctl/xhttp_pi/permissions-mod Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/pipelimit-mod Modified: utils/kamctl/xhttp_pi/presence-mod Modified: utils/kamctl/xhttp_pi/purple-mod Modified: utils/kamctl/xhttp_pi/registrar-mod Modified: utils/kamctl/xhttp_pi/rls-mod Modified: utils/kamctl/xhttp_pi/rtpengine-mod Modified: utils/kamctl/xhttp_pi/rtpproxy-mod Modified: utils/kamctl/xhttp_pi/sca-mod Modified: utils/kamctl/xhttp_pi/secfilter-mod Modified: utils/kamctl/xhttp_pi/siptrace-mod Modified: utils/kamctl/xhttp_pi/speeddial-mod Modified: utils/kamctl/xhttp_pi/standard-mod Modified: utils/kamctl/xhttp_pi/topos-mod Modified: utils/kamctl/xhttp_pi/uac-mod Modified: utils/kamctl/xhttp_pi/uid_auth_db-mod Modified: utils/kamctl/xhttp_pi/uid_avp_db-mod Modified: utils/kamctl/xhttp_pi/uid_domain-mod Modified: utils/kamctl/xhttp_pi/uid_gflags-mod Modified: utils/kamctl/xhttp_pi/uid_uri_db-mod Modified: utils/kamctl/xhttp_pi/uri_db-mod Modified: utils/kamctl/xhttp_pi/userblocklist-mod Modified: utils/kamctl/xhttp_pi/usrloc-mod --- Diff: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0… Patch: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0…

2 months, 2 weeks

git:master:12cdb896: lib/srdb1/schema: increase default size of columns for htable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 12cdb896fed98a38bfd9b77e1ace1dd346901cc3 URL: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-06T10:07:41+02:00 lib/srdb1/schema: increase default size of columns for htable - same type, version kept, code nca work with different size already --- Modified: src/lib/srdb1/schema/htable.xml --- Diff: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… Patch: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… --- diff --git a/src/lib/srdb1/schema/htable.xml b/src/lib/srdb1/schema/htable.xml index 9ee35d2fe71..ab60cc7fd3c 100644 --- a/src/lib/srdb1/schema/htable.xml +++ b/src/lib/srdb1/schema/htable.xml @@ -36,7 +36,7 @@ <column id="key_name"> <name>key_name</name> <type>string</type> - <size>64</size> + <size>256</size> <default/> <description>Name of the hash key</description> </column> @@ -58,7 +58,7 @@ <column id="attribute"> <name>key_value</name> <type>string</type> - <size>128</size> + <size>512</size> <default/> <description>The value of the key</description> </column>

2 months, 2 weeks

[kamailio/kamailio] [htable] db_sql "key_value" length = 128 too small, what if change to 1024 ? (Issue #3944)

by gao114882

### Description  ### Expected behavior large "key_value" can store to db_sql。 #### Actual observed behavior the key_value = "{\"id\":1,\"in_port\":\"5263\",\"in_ptl\":\"udp\",\"rate_limit\":\"\",\"out_port\":\"5262\",\"out_ptl\":\"udp\",\"mode\":2,\"proxied_ip\":\"172.16.4.114\",\"proxied_port\":\"5080\",\"in_gateway_ip\":\"116.198.229.196\",\"in_gateway_port\":\"5080\",\"black_list\":{\"ip\":[\"127.0.0.1\"],\"user\":[]},\"white_list\":{\"ip\":[\"127.0.0.1\"],\"user\":[]},\"called_prefix\":[{\"match_num\":\"\",\"caller_rule\":{\"start_pos\":0,\"length\":2,\"new_num\":\"\",\"type\":2},\"called_rule\":{\"start_pos\":0,\"length\":0,\"new_num\":\"\",\"type\":0}}],\"caller_prefix\":[{\"match_num\":\"\",\"caller_rule\":{\"start_pos\":0,\"length\":2,\"new_num\":\"\",\"type\":1},\"called_rule\":{\"start_pos\":0,\"length\":0,\"new_num\":\"\",\"type\":0}}]}" <img width="913" alt="企业微信截图_17234562508919" src="https://github.com/user-attachments/assets/ab0acd4b-980a-4dc5-95b3-8e8afb7a…"> #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: compiled on 11:50:37 Aug 9 2024 with gcc 4.8.5 ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3944 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3944(a)github.com>

2 months, 2 weeks

git:master:60165196: registrar: safety check for uri and remove duplicated aor extract

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 60165196ad3144597c24eb9f7bb7fb0cd56f8c25 URL: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-05T11:28:08+02:00 registrar: safety check for uri and remove duplicated aor extract - follow up of changes from previous commit --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… Patch: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 4bd4a1505a1..1f5b7e0acbd 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -936,7 +936,7 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) int novariation = 0; - if(_uri->len > 0) { + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, &turi) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1043,11 +1043,6 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) get_act_time(); c = get_first_contact(_m); - if(extract_aor((_uri) ? _uri : &get_to(_m)->uri, &aor, NULL) < 0) { - LM_ERR("failed to extract Address Of Record\n"); - goto error; - } - mem_only = is_cflag_set(REG_SAVE_MEM_FL) ? FL_MEM : FL_NONE; novariation = is_cflag_set(REG_SAVE_NOVARIATION_FL) ? 1 : 0; @@ -1118,7 +1113,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) if(_ruid == NULL || _ruid->len <= 0) { /* No ruid provided - remove all contacts for aor */ - if(_uri->len > 0) { + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, &turi) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1142,9 +1137,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) } } else { /* ruid provided - remove a specific contact */ - - if(_uri->len > 0) { - + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, NULL) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1162,9 +1155,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) return -2; } _reg_ul.unlock_udomain(_d, &aor); - } else { - res = _reg_ul.delete_urecord_by_ruid(_d, _ruid); switch(res) { case -1:

2 months, 2 weeks

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2024