sr-dev

sr-dev@lists.kamailio.org

13 participants
44204 discussions

[kamailio/kamailio] pkg: Add systemd template for starting multiple kamailio services (PR #3904)

by Xenofon Karamanos

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR aims to allow multiple kamailio instances with different configs to be managed by systemd. The new `kamailio@.service` is the systemd template file, where one can provide an instance name after `systemctl start kamailio@dev`, to start a new kamailio instance with name `kamailio-dev` and use config file found in `/etc/kamailio/kamailio-dev.cfg`. I tested that this file and its content can work by placing the file in `/etc/systemd/system/kamailio@.service` and using the above `dev` instance name as an example. Kamailio loads and handles any new messages along with the default kamailio service. My question right now, as I am not really familiar with the packaging workflow, is this an appropriate way to accomplish it. If yes what should be modified to install this alongside the normal `kamailio.service`. Any feedback and review is appreciated and greatly needed! Thanks! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3904 -- Commit Summary -- * pkg: Add systemd template for starting multiple kamailio services -- File Changes -- A pkg/kamailio/deb/debian/kamailio@.service (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3904.patch https://github.com/kamailio/kamailio/pull/3904.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3904 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3904(a)github.com>

5 months, 2 weeks

git:master:097cd735: pkg/kamailio/deb: refresh after service template added

by Victor Seva

Module: kamailio Branch: master Commit: 097cd7353efc251fb764e6f7c88e3330c794d369 URL: https://github.com/kamailio/kamailio/commit/097cd7353efc251fb764e6f7c88e333… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-07-29T12:31:10+02:00 pkg/kamailio/deb: refresh after service template added at a8cb23903b271a1b78456fed5da8e10474aee405 --- Added: pkg/kamailio/deb/bionic/kamailio@.service Added: pkg/kamailio/deb/bookworm/kamailio@.service Added: pkg/kamailio/deb/bullseye/kamailio@.service Added: pkg/kamailio/deb/buster/kamailio@.service Added: pkg/kamailio/deb/focal/kamailio@.service Added: pkg/kamailio/deb/jammy/kamailio@.service Added: pkg/kamailio/deb/jessie/kamailio@.service Added: pkg/kamailio/deb/precise/kamailio@.service Added: pkg/kamailio/deb/sid/kamailio@.service Added: pkg/kamailio/deb/stretch/kamailio@.service Added: pkg/kamailio/deb/trusty/kamailio@.service Added: pkg/kamailio/deb/wheezy/kamailio@.service Added: pkg/kamailio/deb/xenial/kamailio@.service --- Diff: https://github.com/kamailio/kamailio/commit/097cd7353efc251fb764e6f7c88e333… Patch: https://github.com/kamailio/kamailio/commit/097cd7353efc251fb764e6f7c88e333…

5 months, 2 weeks

git:master:add65a47: sdpops: use proper include guard for the file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: add65a4799c1650ea36c657d190fa0027e798404 URL: https://github.com/kamailio/kamailio/commit/add65a4799c1650ea36c657d190fa00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-29T11:24:00+02:00 sdpops: use proper include guard for the file --- Modified: src/modules/sdpops/sdpops_path.h --- Diff: https://github.com/kamailio/kamailio/commit/add65a4799c1650ea36c657d190fa00… Patch: https://github.com/kamailio/kamailio/commit/add65a4799c1650ea36c657d190fa00… --- diff --git a/src/modules/sdpops/sdpops_path.h b/src/modules/sdpops/sdpops_path.h index 0e7d7088a97..620d9981a00 100644 --- a/src/modules/sdpops/sdpops_path.h +++ b/src/modules/sdpops/sdpops_path.h @@ -20,8 +20,8 @@ */ -#ifndef _SDPOPS_DATA_H_ -#define _SDPOPS_DATA_H_ +#ifndef _SDPOPS_PATH_H_ +#define _SDPOPS_PATH_H_ #include "../../core/str.h" #include "../../core/parser/sdp/sdp.h"

5 months, 2 weeks

git:master:fc2f34e8: core: tcp - use long long constants for operations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fc2f34e8bab022b0c99e8313aee3e4a87c1f2e52 URL: https://github.com/kamailio/kamailio/commit/fc2f34e8bab022b0c99e8313aee3e4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-29T09:44:47+02:00 core: tcp - use long long constants for operations --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/fc2f34e8bab022b0c99e8313aee3e4a… Patch: https://github.com/kamailio/kamailio/commit/fc2f34e8bab022b0c99e8313aee3e4a… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8fa6566c14b..fd60918fe34 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -449,9 +449,9 @@ int tcp_read_headers(struct tcp_connection *c, rd_conn_flags_t *read_flags) if(bytes <= 0) return bytes; gettimeofday(&tvnow, NULL); - tvdiff = 1000000 * (tvnow.tv_sec - r->tvrstart.tv_sec) + tvdiff = 1000000LL * (tvnow.tv_sec - r->tvrstart.tv_sec) + (tvnow.tv_usec - r->tvrstart.tv_usec); - if(tvdiff >= ksr_tcp_msg_read_timeout * 1000000) { + if(tvdiff >= 1000000LL * ksr_tcp_msg_read_timeout) { LM_ERR("message reading timeout after %lld usec\n", tvdiff); r->parsed = r->buf; r->content_len = 0;

5 months, 2 weeks

git:master:49a9c0a0: cplc: use long long constants for operations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 49a9c0a0f391c2e9fc45dff7c37a087dde0f7ba3 URL: https://github.com/kamailio/kamailio/commit/49a9c0a0f391c2e9fc45dff7c37a087… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-29T10:07:43+02:00 cplc: use long long constants for operations --- Modified: src/modules/cplc/cpl_time.c --- Diff: https://github.com/kamailio/kamailio/commit/49a9c0a0f391c2e9fc45dff7c37a087… Patch: https://github.com/kamailio/kamailio/commit/49a9c0a0f391c2e9fc45dff7c37a087… --- diff --git a/src/modules/cplc/cpl_time.c b/src/modules/cplc/cpl_time.c index b22fe5e8cf9..aea3265d8e8 100644 --- a/src/modules/cplc/cpl_time.c +++ b/src/modules/cplc/cpl_time.c @@ -264,8 +264,9 @@ int cpl_ac_print(cpl_ac_tm_p _atp) return -1; } - printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (unsigned long long)_atp->time, - _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); + printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", + (unsigned long long)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, + _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year + 1900, _atp->t.tm_mon + 1, _atp->t.tm_mday); printf("Year day: %d\nYear week-day: %d\nYear week: %d\n", _atp->t.tm_yday, @@ -994,8 +995,8 @@ int cpl_check_freq_interval(cpl_tmrec_p _trp, cpl_ac_tm_p _atp) ? REC_MATCH : REC_NOMATCH; #ifdef USE_YWEEK_U - _t0 -= _trp->ts.tm_wday * 24 * 3600; - _t1 -= _atp->t.tm_wday * 24 * 3600; + _t0 -= 24ULL * _trp->ts.tm_wday * 3600; + _t1 -= 24ULL * _atp->t.tm_wday * 3600; #else _t0 -= ((_trp->ts.tm_wday + 6) % 7) * 24 * 3600; _t1 -= ((_atp->t.tm_wday + 6) % 7) * 24 * 3600; @@ -1004,7 +1005,7 @@ int cpl_check_freq_interval(cpl_tmrec_p _trp, cpl_ac_tm_p _atp) ? REC_MATCH : REC_NOMATCH; case FREQ_MONTHLY: - _t0 = (_atp->t.tm_year - _trp->ts.tm_year) * 12 + _atp->t.tm_mon + _t0 = 12ULL * (_atp->t.tm_year - _trp->ts.tm_year) + _atp->t.tm_mon - _trp->ts.tm_mon; return (_t0 % _trp->interval == 0) ? REC_MATCH : REC_NOMATCH; case FREQ_YEARLY:

5 months, 2 weeks

Contribute with AUR package

by Nikos Toutountzoglou

Dear Sirs, I have adopted an orphaned AUR package and tried to fine tune it to be used with Your great Kamailio open source project. I can continue to maintain it in the AUR space. If anything needs to be modified in the package please let me know. Link to the package: https://aur.archlinux.org/packages/kamailio or web search !aur kamailio Regards, Nikos

5 months, 2 weeks

git:master:e86d6ee3: db_berkeley: buffer size set to the argument of strftime()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e86d6ee30227a3fc5cff98e7983d4a80f0c42c4b URL: https://github.com/kamailio/kamailio/commit/e86d6ee30227a3fc5cff98e7983d4a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-27T18:16:40+02:00 db_berkeley: buffer size set to the argument of strftime() --- Modified: src/modules/db_berkeley/km_bdb_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/e86d6ee30227a3fc5cff98e7983d4a8… Patch: https://github.com/kamailio/kamailio/commit/e86d6ee30227a3fc5cff98e7983d4a8… --- diff --git a/src/modules/db_berkeley/km_bdb_lib.c b/src/modules/db_berkeley/km_bdb_lib.c index 06feb6e4bac..4761084c974 100644 --- a/src/modules/db_berkeley/km_bdb_lib.c +++ b/src/modules/db_berkeley/km_bdb_lib.c @@ -676,7 +676,7 @@ int km_bdblib_create_journal(table_p _tp) { char *s; char fn[1024]; - char d[64]; + char d[128]; FILE *fp = NULL; struct tm *t; int bl;

5 months, 2 weeks

git:master:3333611a: core: cfg select - check res when getting the variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3333611a3ef9078cbcb9867db88921f0c48fce1b URL: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-26T19:50:40+02:00 core: cfg select - check res when getting the variable --- Modified: src/core/cfg/cfg_select.c --- Diff: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… Patch: https://github.com/kamailio/kamailio/commit/3333611a3ef9078cbcb9867db88921f… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index e6c599a204e..b4e9e6ebef7 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -212,7 +212,7 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) group = (cfg_group_t *)s->params[1].v.p; var = (cfg_mapping_t *)s->params[2].v.p; - if(!group || !var) + if(!group || !var || !res) return -1; /* use the module's handle to access the variable, so the variables

5 months, 2 weeks

git:master:660a0192: xprint: return on mod init error case

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 660a019263b81d318700c205531bf4e042c912cf URL: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-26T19:50:40+02:00 xprint: return on mod init error case --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… Patch: https://github.com/kamailio/kamailio/commit/660a019263b81d318700c205531bf4e… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index b6fc5066556..fda12a82fc3 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1899,6 +1899,7 @@ int xl_mod_init() s = NULL; str_ipaddr.len = 0; PKG_MEM_ERROR_FMT("for str_ipaddr\n"); + return -1; } } else if(strncmp(str_ipaddr.s, s, str_ipaddr.len) != 0) {

5 months, 2 weeks

[kamailio/kamailio] Advertise in listen directive doesn't let to use hostname without port (Issue #3932)

by Evgenii Buchnev

Hey Team, Thank you for the awesome software ### Description Neither option work: `listen=... advertise some.custom.hostname.io` `listen=... advertise some.custom.hostname.io:0` to make Kamailio present only hostname(without port) in Record-Route headers, affects NAPTR/SRV. ### Troubleshooting ============ _Hostname without port - still gives port 5081 in Record-Route_ **kamailio.cfg** ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io name "provider_socket_tls"` ... **sngrep, 200 OK for INVITE** ... `Record-Route: <sip:some.custom.io:5081;transport=tls;r2=on;lr;did=494.6e51>` ... **kamcmd corex.list_sockets** ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:0 } ``` ... ======== _Hostname with port 0 - still gives port 5081 in Record-Route_ kamailio.cfg ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io:0 name "provider_socket_tls"` ... sngrep, 200 OK for INVITE ... `Record-Route: <sip:some.custom.io:5081;transport=tls;r2=on;lr;did=042.7721>` ... kamcmd corex.list_sockets ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:0 } ``` ... ============ _Hostname with explicit different port 8888 - gives that port 8888 in Record-Route (to confirm config works)_ kamailio.cfg ... `listen=tls:KAM_LOC_IP:5081 advertise some.custom.io:8888 name "provider_socket_tls"` ... sngrep, 200 OK for INVITE ... `Record-Route: <sip:some.custom.io:8888;transport=tls;r2=on;lr;did=dae.ac31>` ... kamcmd corex.list_sockets ... ``` { af: IPv4 proto: tls name: 172.17.57.164 addrlist: { addr: 172.17.57.164 } port: 5081 sockstr: tls:172.17.57.164:5081 mcast: no mhomed: no virtual: no sockname: provider_socket_tls advertise: tls:some.custom.io:8888 } ``` ... #### Reproduction Please see Troubleshooting section #### Debugging Data Please see Troubleshooting section #### Log Messages N/A #### SIP Traffic Please see Troubleshooting section ### Possible Solutions N/A ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) dbe51d 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: dbe51d compiled on 07:13:22 Jul 17 2024 with gcc 12.2.0) ``` * **Operating System**: ``` [dev]root@[voiceproxy]:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm [dev]root@[voiceproxy]:~# uname -a Linux i-0875d7720d6152612 6.1.0-23-cloud-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.99-1 (2024-07-15) x86_64 GNU/Linux [dev]root@[voiceproxy]:~# cat /etc/*relea* ID=ec2 VERSION="20240702-1796" PRETTY_NAME="Debian GNU/Linux 12 (bookworm)" NAME="Debian GNU/Linux" VERSION_ID="12" VERSION="12 (bookworm)" VERSION_CODENAME=bookworm ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" ``` * **Might be related** : https://github.com/kamailio/kamailio/issues/1884 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3932 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3932(a)github.com>

5 months, 3 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev