sr-dev August 2023

sr-dev@lists.kamailio.org

15 participants
203 discussions

git:master:18ae7720: pkg/kamailio/deb: rule to print excluded modules [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 18ae77207409b816d6dffb13b41e3be9c251d62c URL: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-10T09:56:30+02:00 pkg/kamailio/deb: rule to print excluded modules [skip ci] --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be… Patch: https://github.com/kamailio/kamailio/commit/18ae77207409b816d6dffb13b41e3be…

9 months, 1 week

git:master:5c7de00b: regex: convert to memory error logging helper

by Victor Seva

Module: kamailio Branch: master Commit: 5c7de00bc0826cf739577010ba7b4882e83819cc URL: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-09T13:21:05+02:00 regex: convert to memory error logging helper --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… Patch: https://github.com/kamailio/kamailio/commit/5c7de00bc0826cf739577010ba7b488… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index e9943dc57e0..2860e11a413 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -198,13 +198,13 @@ static int mod_init(void) /* Pointer to pcres */ if((pcres_addr = shm_malloc(sizeof(pcre **))) == 0) { - LM_ERR("no memory for pcres_addr\n"); + SHM_MEM_ERROR; goto err; } /* Integer containing the number of pcres */ if((num_pcres = shm_malloc(sizeof(int))) == 0) { - LM_ERR("no memory for num_pcres\n"); + SHM_MEM_ERROR; goto err; } @@ -425,14 +425,14 @@ static int load_pcres(int action) shm_free(pcres); } if((pcres = shm_malloc(sizeof(pcre *) * num_pcres_tmp)) == 0) { - LM_ERR("no more memory for pcres\n"); + SHM_MEM_ERROR; goto err; } memset(pcres, 0, sizeof(pcre *) * num_pcres_tmp); for(i = 0; i < num_pcres_tmp; i++) { pcre_rc = pcre_fullinfo(pcres_tmp[i], NULL, PCRE_INFO_SIZE, &pcre_size); if((pcres[i] = shm_malloc(pcre_size)) == 0) { - LM_ERR("no more memory for pcres[%i]\n", i); + SHM_MEM_ERROR; goto err; } memcpy(pcres[i], pcres_tmp[i], pcre_size);

9 months, 2 weeks

[kamailio/kamailio] fix warnings detected via codeql (PR #3497)

by Victor Seva

#### 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 - [ ] Tested changes locally You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3497 -- Commit Summary -- * sipcapture: use memcpy instead of strncpy for coherence * rtpproxy: use memcpy instead of strcpy for coherence -- File Changes -- M src/modules/rtpproxy/rtpproxy.c (40) M src/modules/sipcapture/sipcapture.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3497.patch https://github.com/kamailio/kamailio/pull/3497.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3497 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3497(a)github.com>

9 months, 2 weeks

git:master:11b24eb3: ctl: use snprintf() to set boundaries

by Victor Seva

Module: kamailio Branch: master Commit: 11b24eb35f4bb1e9825b3191d8f6e0fc9c0a3e28 URL: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-08-09T13:20:52+02:00 ctl: use snprintf() to set boundaries > https://github.com/kamailio/kamailio/security/code-scanning/1839 --- Modified: src/modules/ctl/ctl.c --- Diff: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… Patch: https://github.com/kamailio/kamailio/commit/11b24eb35f4bb1e9825b3191d8f6e0f… --- diff --git a/src/modules/ctl/ctl.c b/src/modules/ctl/ctl.c index 87654c8534c..5e289cfa8d9 100644 --- a/src/modules/ctl/ctl.c +++ b/src/modules/ctl/ctl.c @@ -212,6 +212,7 @@ static int mod_init(void) { struct id_list *l; char ctl_socket_path[CTL_SOCKET_PATH_SIZE]; + int len; binrpc_callbacks_init(); @@ -226,17 +227,14 @@ static int mod_init(void) if(strcmp(runtime_dir, RUN_DIR) == 0) { add_binrpc_socket(PARAM_STRING, DEFAULT_CTL_SOCKET); } else { - if(sizeof(DEFAULT_CTL_SOCKET_PROTO) - + sizeof(DEFAULT_CTL_SOCKET_NAME) - + strlen(runtime_dir) + 4 - > CTL_SOCKET_PATH_SIZE) { + len = sizeof(DEFAULT_CTL_SOCKET_PROTO) + + sizeof(DEFAULT_CTL_SOCKET_NAME) + strlen(runtime_dir) + 4; + if(len > CTL_SOCKET_PATH_SIZE) { LM_ERR("ctl socket path is too big\n"); return -1; } - strcpy(ctl_socket_path, DEFAULT_CTL_SOCKET_PROTO); - strcat(ctl_socket_path, runtime_dir); - strcat(ctl_socket_path, "/"); - strcat(ctl_socket_path, DEFAULT_CTL_SOCKET_NAME); + snprintf(ctl_socket_path, len, "%s%s/%s", DEFAULT_CTL_SOCKET_PROTO, + runtime_dir, DEFAULT_CTL_SOCKET_NAME); add_binrpc_socket(PARAM_STRING, ctl_socket_path); } }

9 months, 2 weeks

[kamailio/kamailio] Halo Experts, really appreciated if I can get some assistance on the start failure issue when doing patching from kamailio 5.5.4 to 5.5.6 with the error, 'terminating due to SIGCHLD' . Thanks a lot! (Issue #3533)

by Louis Liu

### Description  ### Troubleshooting #### Reproduction  #### 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` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3533 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3533(a)github.com>

9 months, 2 weeks

Question for not_empty() config function

by Stefan-Cristian Mititelu

Hello, I have a question for [1] config function. Can I extend it to work with INTs too? e.g. if pv not NULL and INT flag, return 1. This would help, because one won't need to know the type of the pvar beforehand, for using this function. Or is it meant to be used only with string pv only? [1] https://www.kamailio.org/docs/modules/devel/modules/pv.html#pv.f.not_empty Thank you, Stefan

9 months, 2 weeks

git:master:d893f3af: core: Add TCP_USER_TIMEOUT socket option on listening socket.

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d893f3af1444c8c4c5db6cd53fb577703007c90c URL: https://github.com/kamailio/kamailio/commit/d893f3af1444c8c4c5db6cd53fb5777… Author: Walter Schober <walter.schober(a)neotel.at> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-07T19:32:53+02:00 core: Add TCP_USER_TIMEOUT socket option on listening socket. Use tcp_send_timeout config option also on listening socket to timeout outbound messages sent on passive inbound connections. --- Modified: src/core/tcp_main.c Modified: src/core/tcp_options.h --- Diff: https://github.com/kamailio/kamailio/commit/d893f3af1444c8c4c5db6cd53fb5777… Patch: https://github.com/kamailio/kamailio/commit/d893f3af1444c8c4c5db6cd53fb5777… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e96d68c40b2..7f07d724108 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3172,6 +3172,18 @@ int tcp_init(struct socket_info *sock_info) } #endif init_sock_keepalive(sock_info->socket); +#ifdef HAVE_TCP_USER_TIMEOUT + if((optval = TICKS_TO_S(cfg_get(tcp, tcp_cfg, send_timeout)))) { + optval *= 1000; + if(setsockopt(sock_info->socket, IPPROTO_TCP, TCP_USER_TIMEOUT, &optval, + sizeof(optval)) + < 0) { + LM_WARN("failed to set TCP_USER_TIMEOUT: %s\n", strerror(errno)); + } else { + LM_INFO("Set TCP_USER_TIMEOUT=%d ms\n", optval); + } + } +#endif if(bind(sock_info->socket, &addr->s, sockaddru_len(*addr)) == -1) { LM_ERR("bind(%x, %p, %d) on %s:%d : %s\n", sock_info->socket, &addr->s, (unsigned)sockaddru_len(*addr), sock_info->address_str.s, diff --git a/src/core/tcp_options.h b/src/core/tcp_options.h index d5a628a1128..84c551e2a3b 100644 --- a/src/core/tcp_options.h +++ b/src/core/tcp_options.h @@ -68,6 +68,13 @@ #endif /* __OS_ */ #endif /* NO_TCP_LINGER2 */ +/* tcp user_timeout */ +#ifndef NO_TCP_USER_TIMEOUT +#ifdef __OS_linux +#define HAVE_TCP_USER_TIMEOUT +#endif /* __OS_ */ +#endif /* NO_TCP_LINGER2 */ + /* keepalive */ #ifndef NO_TCP_KEEPALIVE #define HAVE_SO_KEEPALIVE

9 months, 2 weeks

git:master:63445544: modules: readme files regenerated - acc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 63445544d994d7876ff76eb66203400c5a3a4b91 URL: https://github.com/kamailio/kamailio/commit/63445544d994d7876ff76eb66203400… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-08-07T15:49:07+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/app_perl/README Modified: src/modules/cdp/README Modified: src/modules/cdp_avp/README Modified: src/modules/dialog/README Modified: src/modules/dispatcher/README Modified: src/modules/ims_dialog/README Modified: src/modules/ims_registrar_scscf/README Modified: src/modules/ims_usrloc_pcscf/README Modified: src/modules/ims_usrloc_scscf/README Modified: src/modules/nathelper/README Modified: src/modules/registrar/README Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README Modified: src/modules/snmpstats/README --- Diff: https://github.com/kamailio/kamailio/commit/63445544d994d7876ff76eb66203400… Patch: https://github.com/kamailio/kamailio/commit/63445544d994d7876ff76eb66203400…

9 months, 2 weeks

[kamailio/kamailio] Typos (PR #3520)

by Дилян Палаузов

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3520 -- Commit Summary -- * docs/ : typos * etc/ typos -- File Changes -- M INSTALL (2) M doc/docbook/catalog.xml (2) M doc/docbook/dep.xsl (4) M doc/docbook/entities.xml (10) M doc/docbook/html.chunked.xsl (2) M doc/doxygen/main.dox (2) M doc/man/kamailio.cfg.5 (2) M doc/misc/HISTORY (10) M doc/misc/NEWS (58) M doc/misc/TODO (10) M doc/misc/cvs-commit-rules.txt (6) M doc/stylesheets/dbschema_k/catalog.xml (2) M doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl (4) M doc/stylesheets/dbschema_k/xsl/db_redis.xsl (4) M doc/stylesheets/dbschema_k/xsl/dbtext.xsl (4) M doc/stylesheets/dbschema_k/xsl/mysql.xsl (2) M doc/stylesheets/dbschema_k/xsl/pi_framework_mod.xsl (2) M doc/tutorials/presence/cfg/ps.cfg (2) M doc/tutorials/presence/install.xml (2) M doc/tutorials/presence/intro.xml (4) M doc/tutorials/serdev/routing_engine.xml (2) M doc/tutorials/seruser/otherapps.xml (2) M etc/kamailio.cfg (4) M etc/sip-router.cfg (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3520.patch https://github.com/kamailio/kamailio/pull/3520.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3520 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3520(a)github.com>

9 months, 2 weeks

git:master:6e9335ff: etc/ typos

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6e9335ff2245596b74bc1c749d1e7805bf186f02 URL: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-07T15:32:56+02:00 etc/ typos --- Modified: etc/kamailio.cfg Modified: etc/sip-router.cfg --- Diff: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780… Patch: https://github.com/kamailio/kamailio/commit/6e9335ff2245596b74bc1c749d1e780… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 68493736d41..715c289af1e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -227,7 +227,7 @@ enable_sctp=no ####### Custom Parameters ######### -/* These parameters can be modified runtime via RPC interface +/* These parameters can be modified at runtime via RPC interface * - see the documentation of 'cfg_rpc' module. * * Format: group.id = value 'desc' description @@ -389,7 +389,7 @@ modparam("registrar", "path_mode", 0) modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) -/* by default ww do not adjust the direct of the sequential requests. +/* by default we do not adjust the direct of the sequential requests. * if you enable this parameter, be sure the enable "append_fromtag" * in "rr" module */ modparam("acc", "detect_direction", 0) diff --git a/etc/sip-router.cfg b/etc/sip-router.cfg index 0390ef7ec57..8669ea63d79 100644 --- a/etc/sip-router.cfg +++ b/etc/sip-router.cfg @@ -1,7 +1,7 @@ # # $Id$ # -# Example configuration file (simpler then ser-oob.cfg, but more +# Example configuration file (simpler than ser-oob.cfg, but more # complex then ser-basic.cfg). # # First start SER sample config script with: @@ -73,7 +73,7 @@ rev_dns=no # (cmd. line: -R) #group=ser #disable_core=yes #disables core dumping #open_fd_limit=1024 # sets the open file descriptors limit -#mhomed=yes # usefull for multihomed hosts, small performance penalty +#mhomed=yes # useful for multihomed hosts, small performance penalty #disable_tcp=yes #tcp_accept_aliases=yes # accepts the tcp alias via option (see NEWS) sip_warning=yes @@ -172,7 +172,7 @@ modparam("ctl", "binrpc", "tcp:127.0.0.1:2046") # failed transactions (=negative responses) should be logged to modparam("acc_db", "failed_transactions", 1) -# comment the next line if you dont want to have accounting to DB +# comment the next line if you don't want to have accounting to DB modparam("acc_db", "log_flag", "FLAG_ACC") # -- tm params -- @@ -197,7 +197,7 @@ modparam("tls", "private_key", "ser-selfsigned.key") # -- xmlrpc params -- -# using a sub-route from the module is a lot safer then relying on the +# using a sub-route from the module is a lot safer than relying on the # request method to distinguish HTTP from SIP modparam("xmlrpc", "route", "RPC"); @@ -358,8 +358,8 @@ route[RR] # particularly good if upstream and downstream entities # use different transport protocol - # if the inital INVITE got the ACC flag store this in - # an RR AVP cookie. this is more for demonstration purpose + # if the initial INVITE got the ACC flag store this in + # an RR AVP cookie. This is more for demonstration purpose if (isflagset(FLAG_ACC)) { $account = "yes"; setavpflag($account, "dialog_cookie"); @@ -377,7 +377,7 @@ route[DOMAIN] # check if the callee is at a local domain lookup_domain("$td", "@ruri.host"); - # we dont know the domain of the caller and also not + # we don't know the domain of the caller and also not # the domain of the callee -> somone uses our proxy as # a relay if (strempty($t.did) && strempty($f.did)) { @@ -528,7 +528,7 @@ route[INBOUND] if (lookup_contacts("location")) { append_hf("P-hint: usrloc applied\r\n"); - # we set the TM module timers according to the prefences + # we set the TM module timers according to the preferences # of the callee (avoid too long ringing of his phones) # Note1: timer values have to be in ms now! # Note2: this makes even more sense if you switch to a voicemail

9 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2023