sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
381 discussions

git:master:f7ea8830: core: new command line parameter --loadmodule=name
by Daniel-Constantin Mierla 22 Nov '19

22 Nov '19

Module: kamailio Branch: master Commit: f7ea88305ae5a74b7db248dd7e6e75b812950e20 URL: https://github.com/kamailio/kamailio/commit/f7ea88305ae5a74b7db248dd7e6e75b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-22T12:38:27+01:00 core: new command line parameter --loadmodule=name - enable the option to load a module from command line - example: --loadmodule=systemdops.so --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/f7ea88305ae5a74b7db248dd7e6e75b… Patch: https://github.com/kamailio/kamailio/commit/f7ea88305ae5a74b7db248dd7e6e75b… --- diff --git a/src/main.c b/src/main.c index a5a0070537..31af3d2cef 100644 --- a/src/main.c +++ b/src/main.c @@ -193,6 +193,7 @@ Options:\n\ -l udp:127.0.0.1:5080/1.2.3.4:5060,\n\ -l \"sctp:(eth0)\", -l \"(eth0, eth1, 127.0.0.1):5065\".\n\ The default behaviour is to listen on all the interfaces.\n\ + --loadmodule=name load the module specified by name\n\ -L path Modules search path (default: " MODS_DIR ")\n\ -m nr Size of shared memory allocated in Megabytes\n\ -M nr Size of private memory allocated, in Megabytes\n\ @@ -1922,6 +1923,7 @@ int main(int argc, char** argv) {"substdef", required_argument, 0, KARGOPTVAL + 2}, {"substdefs", required_argument, 0, KARGOPTVAL + 3}, {"server-id", required_argument, 0, KARGOPTVAL + 4}, + {"loadmodule", required_argument, 0, KARGOPTVAL + 5}, {0, 0, 0, 0 } }; @@ -2137,6 +2139,7 @@ int main(int argc, char** argv) case 'a': case 's': case 'Y': + case KARGOPTVAL+5: break; /* long options */ @@ -2224,6 +2227,23 @@ int main(int argc, char** argv) /* Fix the value of cfg_file variable.*/ if (fix_cfg_file() < 0) goto error; + /* process command line parameters that require initialized basic environment */ + optind = 1; /* reset getopt index */ + option_index = 0; + /* switches required before config parsing and processing */ + while((c=getopt_long(argc, argv, options, long_options, &option_index))!=-1) { + switch(c) { + case KARGOPTVAL+5: + if (load_module(optarg)!=0) { + LM_ERR("failed to load the module: %s\n", optarg); + goto error; + } + break; + default: + break; + } + } + /* load config file or die */ if (cfg_file[0] == '-' && strlen(cfg_file)==1) { cfg_stream=stdin;

1 0

git:master:582688ad: pkg/kamailio/obs: packaged log_systemd and systemdops modules
by Sergey Safarov 22 Nov '19

22 Nov '19

Module: kamailio Branch: master Commit: 582688ad625f41520328b6057d2b92ee5b6c08ee URL: https://github.com/kamailio/kamailio/commit/582688ad625f41520328b6057d2b92e… Author: root <root(a)safarov-dell.home> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-11-22T11:48:54+03:00 pkg/kamailio/obs: packaged log_systemd and systemdops modules GH #799 GH #2139 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/582688ad625f41520328b6057d2b92e… Patch: https://github.com/kamailio/kamailio/commit/582688ad625f41520328b6057d2b92e… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 04b39713d0..f5c8bd5e41 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -389,9 +389,13 @@ Conflicts: kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver Conflicts: kamailio-uuid < %ver BuildRequires: bison, flex +%if 0%{?rhel} != 6 +Requires: systemd +BuildRequires: systemd-devel +%endif %if 0%{?suse_version} == 1315 || 0%{?suse_version} == 1330 Requires: filesystem -BuildRequires: systemd, shadow +BuildRequires: shadow %endif @@ -1294,7 +1298,11 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with sctp} ksctp \ %endif - ksnmpstats ksqlite ktls kunixodbc kutils \ + ksnmpstats ksqlite \ +%if "%{?_unitdir}" != "" + ksystemd \ +%endif + ktls kunixodbc kutils \ %if %{with websocket} kwebsocket \ %endif @@ -1378,7 +1386,11 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with sctp} ksctp \ %endif - ksnmpstats ksqlite ktls kunixodbc kutils \ + ksnmpstats ksqlite \ +%if "%{?_unitdir}" != "" + ksystemd \ +%endif + ktls kunixodbc kutils \ %if %{with websocket} kwebsocket \ %endif @@ -1598,6 +1610,10 @@ fi %doc %{_docdir}/kamailio/modules/README.statsc %doc %{_docdir}/kamailio/modules/README.topos %doc %{_docdir}/kamailio/modules/README.cfgt +%if "%{?_unitdir}" != "" +%doc %{_docdir}/kamailio/modules/README.log_systemd +%doc %{_docdir}/kamailio/modules/README.systemdops +%endif %dir %attr(-,kamailio,kamailio) %{_sysconfdir}/kamailio %config(noreplace) %{_sysconfdir}/kamailio/dictionary.kamailio @@ -1751,6 +1767,10 @@ fi %{_libdir}/kamailio/modules/statsc.so %{_libdir}/kamailio/modules/topos.so %{_libdir}/kamailio/modules/cfgt.so +%if "%{?_unitdir}" != "" +%{_libdir}/kamailio/modules/log_systemd.so +%{_libdir}/kamailio/modules/systemdops.so +%endif %{_sbindir}/kamailio %{_sbindir}/kamctl

1 0

git:master:fffd892b: systemdops: proper check for null value
by Daniel-Constantin Mierla 22 Nov '19

22 Nov '19

Module: kamailio Branch: master Commit: fffd892b7d18734c8f60d2eebec5d4a15a0fdc26 URL: https://github.com/kamailio/kamailio/commit/fffd892b7d18734c8f60d2eebec5d4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-22T09:42:31+01:00 systemdops: proper check for null value --- Modified: src/modules/systemdops/systemdops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fffd892b7d18734c8f60d2eebec5d4a… Patch: https://github.com/kamailio/kamailio/commit/fffd892b7d18734c8f60d2eebec5d4a… --- diff --git a/src/modules/systemdops/systemdops_mod.c b/src/modules/systemdops/systemdops_mod.c index 0ac15426d1..8c24ac1869 100644 --- a/src/modules/systemdops/systemdops_mod.c +++ b/src/modules/systemdops/systemdops_mod.c @@ -69,7 +69,7 @@ void ksr_sd_app_shutdown(void) int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_corecb_t *cbp = sr_corecb_get(); - if(cbp) { + if(cbp==NULL) { return -1; } cbp->app_ready = ksr_sd_app_ready;

1 0

git:master:13349290: src/Makefile.groups: remove non existent mod_list_systemdops reference
by Victor Seva 22 Nov '19

22 Nov '19

Module: kamailio Branch: master Commit: 133492903d96d7666aa36a1da7de618345c3bd09 URL: https://github.com/kamailio/kamailio/commit/133492903d96d7666aa36a1da7de618… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-22T09:38:44+01:00 src/Makefile.groups: remove non existent mod_list_systemdops reference mod_list_systemd is already there --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/133492903d96d7666aa36a1da7de618… Patch: https://github.com/kamailio/kamailio/commit/133492903d96d7666aa36a1da7de618… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 7276337bbc..1e58898459 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -247,7 +247,6 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_rabbitmq) $(mod_list_jsdt)) \ $(mod_list_phonenum) \ $(mod_list_kafka) \ - $(mod_list_systemdops) \ $(mod_list_rtp_media_server)

1 0

git:master:d4fc8b01: systemdops: set core callbacks in mod_register()
by Daniel-Constantin Mierla 22 Nov '19

22 Nov '19

Module: kamailio Branch: master Commit: d4fc8b0168ba3de78e29deb7c7d7ed9b3fd29a36 URL: https://github.com/kamailio/kamailio/commit/d4fc8b0168ba3de78e29deb7c7d7ed9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-22T09:14:32+01:00 systemdops: set core callbacks in mod_register() --- Modified: src/modules/systemdops/systemdops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d4fc8b0168ba3de78e29deb7c7d7ed9… Patch: https://github.com/kamailio/kamailio/commit/d4fc8b0168ba3de78e29deb7c7d7ed9… --- diff --git a/src/modules/systemdops/systemdops_mod.c b/src/modules/systemdops/systemdops_mod.c index 58d7a2b241..0ac15426d1 100644 --- a/src/modules/systemdops/systemdops_mod.c +++ b/src/modules/systemdops/systemdops_mod.c @@ -68,5 +68,11 @@ void ksr_sd_app_shutdown(void) */ int mod_register(char *path, int *dlflags, void *p1, void *p2) { + sr_corecb_t *cbp = sr_corecb_get(); + if(cbp) { + return -1; + } + cbp->app_ready = ksr_sd_app_ready; + cbp->app_shutdown = ksr_sd_app_shutdown; return 0; }

1 0

git:master:9d3b3467: pkg/kamailio/deb: version set 5.4.0~dev2
by Victor Seva 22 Nov '19

22 Nov '19

Module: kamailio Branch: master Commit: 9d3b3467da0d2724fad3e1db030076c8f4627620 URL: https://github.com/kamailio/kamailio/commit/9d3b3467da0d2724fad3e1db030076c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-22T08:32:54+01:00 pkg/kamailio/deb: version set 5.4.0~dev2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/9d3b3467da0d2724fad3e1db030076c… Patch: https://github.com/kamailio/kamailio/commit/9d3b3467da0d2724fad3e1db030076c…

1 0

[kamailio/kamailio] Unexpected log_systemd behavior when daemon is forked (#799)
by Anthony Messina 22 Nov '19

22 Nov '19

Starting Kamailio (4.4 with branch updates through e43d82d applied) with the following systemd unit file, native systemd/journald logging doesn't work as expected. I *do* get core logging when I use ``` log_engine_type="systemd" loadmodule "log_systemd.so" ``` but `xlog` and `sd_journal_print` *don't* send anything to the journal. When I comment out `log_engine_type`, keeping the log_systemd.so module loaded, `sd_journal_print` *does* log the messages properly to the systemd journal, `xlog` and core startup messages are sent to syslog. If I change the service to `Type=simple` and add the `-D` option to `ExecStart` to disable forking, then logging to systemd via `xlog` and `sd_journal_print` works, but TCP/TLS listeners aren't created. ``` [Unit] Description=Kamailio SIP Server Documentation=man:kamailio(8) http://www.kamailio.org/ After=syslog.target network-online.target Wants=network-online.target [Service] Type=forking User=kamailio Environment=SHM_SIZE=64 Environment=PKG_SIZE=8 ExecStartPre=/usr/sbin/kamailio -c ExecStart=/usr/sbin/kamailio -m $SHM_SIZE -M $PKG_SIZE -P /run/kamailio/kamailio.pid PIDFile=/run/kamailio/kamailio.pid Restart=on-failure RestartSec=30 RuntimeDirectory=kamailio RuntimeDirectoryMode=0750 [Install] WantedBy=multi-user.target ``` -- 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/799

3 16

git:master:3bc5379a: pkg/docker: updated submodule
by Sergey Safarov 21 Nov '19

21 Nov '19

Module: kamailio Branch: master Commit: 3bc5379aef4e37343b54660dace4774b9aceb6e3 URL: https://github.com/kamailio/kamailio/commit/3bc5379aef4e37343b54660dace4774… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-11-21T17:26:06+03:00 pkg/docker: updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/3bc5379aef4e37343b54660dace4774… Patch: https://github.com/kamailio/kamailio/commit/3bc5379aef4e37343b54660dace4774… --- diff --git a/pkg/docker b/pkg/docker index b92a1c899b..0a9a2f2633 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 +Subproject commit 0a9a2f26337a98d5a349cfb4fc16d588df9912c7

1 0

git:5.3:2b4a6265: pkg/kamailio/obs: fixed rpm requirment for python23
by Sergey Safarov 21 Nov '19

21 Nov '19

Module: kamailio Branch: 5.3 Commit: 2b4a62658176a72b99f0f5a1f8ea88fb6baad30c URL: https://github.com/kamailio/kamailio/commit/2b4a62658176a72b99f0f5a1f8ea88f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-11-21T17:18:17+03:00 pkg/kamailio/obs: fixed rpm requirment for python23 (cherry picked from commit 6677dfdba3534a0f50c15fe5b43b8220444b18ad) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2b4a62658176a72b99f0f5a1f8ea88f… Patch: https://github.com/kamailio/kamailio/commit/2b4a62658176a72b99f0f5a1f8ea88f… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 0efd766c54..2c2f26349c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1212,10 +1212,6 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} -%if "%{__python2}" != "" - sed -i -e 's:#!/usr/bin/python:#!%{__python2}:' utils/kamctl/dbtextdb/dbtextdb.py -%endif - %build ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8

1 0

git:master:6677dfdb: pkg/kamailio/obs: fixed rpm requirment for python23
by Sergey Safarov 21 Nov '19

21 Nov '19

Module: kamailio Branch: master Commit: 6677dfdba3534a0f50c15fe5b43b8220444b18ad URL: https://github.com/kamailio/kamailio/commit/6677dfdba3534a0f50c15fe5b43b822… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-11-21T17:12:37+03:00 pkg/kamailio/obs: fixed rpm requirment for python23 --- Modified: pkg/docker Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/6677dfdba3534a0f50c15fe5b43b822… Patch: https://github.com/kamailio/kamailio/commit/6677dfdba3534a0f50c15fe5b43b822… --- diff --git a/pkg/docker b/pkg/docker index 0a9a2f2633..b92a1c899b 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 0a9a2f26337a98d5a349cfb4fc16d588df9912c7 +Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466 diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6ddcdcf194..04b39713d0 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1212,10 +1212,6 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} -%if "%{__python2}" != "" - sed -i -e 's:#!/usr/bin/python:#!%{__python2}:' utils/kamctl/dbtextdb/dbtextdb.py -%endif - %build ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
39
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 2019