sr-dev February 2021

sr-dev@lists.kamailio.org

20 participants
249 discussions

git:master:3e345291: secsipid_proc: link always against -lpthread

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3e345291c0e9474ed0196b0ab0528e0f6744fbe0 URL: https://github.com/kamailio/kamailio/commit/3e345291c0e9474ed0196b0ab0528e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T10:31:48+01:00 secsipid_proc: link always against -lpthread - being loaded on child init may not benefit of core -lphtread in some OSes --- Modified: src/modules/secsipid_proc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3e345291c0e9474ed0196b0ab0528e0… Patch: https://github.com/kamailio/kamailio/commit/3e345291c0e9474ed0196b0ab0528e0… --- diff --git a/src/modules/secsipid_proc/Makefile b/src/modules/secsipid_proc/Makefile index 766ce4a190..259766b151 100644 --- a/src/modules/secsipid_proc/Makefile +++ b/src/modules/secsipid_proc/Makefile @@ -19,14 +19,14 @@ endif ifeq ($(BUILDER),) DEFS+= -I. - LIBS = -L. -lsecsipid + LIBS = -L. -lsecsipid -lpthread else DEFS+= $(shell pkg-config --cflags secsipid-1) - LIBS = $(shell pkg-config --libs secsipid-1) + LIBS = $(shell pkg-config --libs secsipid-1) -lpthread endif ifeq ($(OS), darwin) -LIBS+= -framework CoreFoundation -framework Security -lpthread +LIBS+= -framework CoreFoundation -framework Security endif include ../../Makefile.modules

3 years, 4 months

git:5.4:9cf3a799: pkg/kamailio/deb: version set 5.4.4

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 9cf3a7991919a27410aec6658ec8e77d4e381e01 URL: https://github.com/kamailio/kamailio/commit/9cf3a7991919a27410aec6658ec8e77… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-02-15T09:32:05+01:00 pkg/kamailio/deb: version set 5.4.4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/precise/control 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/wheezy/control Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/9cf3a7991919a27410aec6658ec8e77… Patch: https://github.com/kamailio/kamailio/commit/9cf3a7991919a27410aec6658ec8e77…

3 years, 4 months

git:5.4:864238f6: pkg/kamailio/deb: restore python3 dependency of kamailio package

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 864238f68588923ca60758251bd5f5ab3ac838fd URL: https://github.com/kamailio/kamailio/commit/864238f68588923ca60758251bd5f5a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-02-15T09:30:52+01:00 pkg/kamailio/deb: restore python3 dependency of kamailio package (cherry picked from commit ab8e680e0dd3a8078d40b72c50d41db55d442240) --- Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/wheezy --- Diff: https://github.com/kamailio/kamailio/commit/864238f68588923ca60758251bd5f5a… Patch: https://github.com/kamailio/kamailio/commit/864238f68588923ca60758251bd5f5a… --- diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index 13743a3f2b..78e0d2cfdf 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -90,7 +90,12 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ ruby/' ${DIST}/rules # no python3 for app_python3 sed -i -e '/python3-dev/d' -e '/^Package: kamailio-python3-modules/,/^$/d' \ - -e '/python3/d' ${DIST}/control + ${DIST}/control +# this removes python3 from Package: kamalio +sed -i -e '/python3/d' ${DIST}/control +# add that again +sed -i '/lsb-base,/a \ python3,' ${DIST}/control + sed -i -e 's/ python3[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ python3/' ${DIST}/rules diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index e8052665bb..87f95168a3 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -90,7 +90,12 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ ruby/' ${DIST}/rules # no python3 for app_python3 sed -i -e '/python3-dev/d' -e '/^Package: kamailio-python3-modules/,/^$/d' \ - -e '/python3/d' ${DIST}/control + ${DIST}/control +# this removes python3 from Package: kamalio +sed -i -e '/python3/d' ${DIST}/control +# add that again +sed -i '/lsb-base,/a \ python3,' ${DIST}/control + sed -i -e 's/ python3[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ python3/' ${DIST}/rules

3 years, 4 months

git:5.4:0f093556: pkg/kamailio: version set to 5.4.4 for rpm specs and alpine

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 0f093556d0ad9e8bcf92222ac0cc7c1887ea0527 URL: https://github.com/kamailio/kamailio/commit/0f093556d0ad9e8bcf92222ac0cc7c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T09:24:57+01:00 pkg/kamailio: version set to 5.4.4 for rpm specs and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0f093556d0ad9e8bcf92222ac0cc7c1… Patch: https://github.com/kamailio/kamailio/commit/0f093556d0ad9e8bcf92222ac0cc7c1… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index c443804535..913168c652 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.3 +pkgver=5.4.4 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 950dd4b0e4..dc76d321f6 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.3 +%define ver 5.4.4 %define rel dev1.0%{dist} %if 0%{?fedora}

3 years, 4 months

git:5.4:e8595172: pv: proper transfomation name in the log message

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: e8595172d317b03a335bfd7c29fdf09d2e6da8b5 URL: https://github.com/kamailio/kamailio/commit/e8595172d317b03a335bfd7c29fdf09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T08:46:45+01:00 pv: proper transfomation name in the log message (cherry picked from commit b4d1def5d8a5ffaddbd87708d8dc99f0f5f8853c) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/e8595172d317b03a335bfd7c29fdf09… Patch: https://github.com/kamailio/kamailio/commit/e8595172d317b03a335bfd7c29fdf09… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index cdfcd3ddf3..3c547305a6 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2688,7 +2688,7 @@ char* tr_parse_string(str* in, trans_t *t) while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; if(*p!=TR_RBRACKET) { - LM_ERR("invalid ftime transformation: %.*s!!\n", + LM_ERR("invalid rm transformation: %.*s!!\n", in->len, in->s); goto error; }

3 years, 4 months

git:master:2664a51c: Fixed typo.

by Juha Heinanen

Module: kamailio Branch: master Commit: 2664a51c35a1e8b5adc4c7e6cedde60bc01f0b28 URL: https://github.com/kamailio/kamailio/commit/2664a51c35a1e8b5adc4c7e6cedde60… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2021-02-11T17:27:44+02:00 Fixed typo. --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2664a51c35a1e8b5adc4c7e6cedde60… Patch: https://github.com/kamailio/kamailio/commit/2664a51c35a1e8b5adc4c7e6cedde60… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index a925014715..7dc08b7b5c 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -560,7 +560,7 @@ remove_record_route(); scheme (sip: or sips:), one is added based on routing requirements. Thus the value has to be like "address:port;parameters", the port and parameters are optional. If the second parameter is provided, do not - forget to add the parameter "r2=0" so the proxy processes both + forget to add the parameter "r2=on" so the proxy processes both corresponding Route headers at once.</para> <para>When the <quote>outbound</quote> module was loaded before this

3 years, 4 months

git:master:5064ffc6: modules: readme files regenerated - secsipid ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 5064ffc6490ed9db3f92a171e6b950fd0e8056e6 URL: https://github.com/kamailio/kamailio/commit/5064ffc6490ed9db3f92a171e6b950f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-02-15T08:46:22+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/5064ffc6490ed9db3f92a171e6b950f… Patch: https://github.com/kamailio/kamailio/commit/5064ffc6490ed9db3f92a171e6b950f… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index c125b689d6..87ed1f9287 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -30,6 +30,7 @@ Daniel-Constantin Mierla 3.2. timeout (int) 3.3. cache_dir (str) 3.4. cache_expire (int) + 3.5. modproc (str) 4. Functions @@ -47,11 +48,12 @@ Daniel-Constantin Mierla 1.2. Set timeout parameter 1.3. Set cache_dir parameter 1.4. Set cache_expire parameter - 1.5. secsipid_check_identity usage - 1.6. secsipid_check_identity_pubkey usage - 1.7. secsipid_get_url usage - 1.8. secsipid_add_identity usage - 1.9. Libsecsipid usage + 1.5. Set modproc parameter + 1.6. secsipid_check_identity usage + 1.7. secsipid_check_identity_pubkey usage + 1.8. secsipid_get_url usage + 1.9. secsipid_add_identity usage + 1.10. Libsecsipid usage Chapter 1. Admin Guide @@ -69,6 +71,7 @@ Chapter 1. Admin Guide 3.2. timeout (int) 3.3. cache_dir (str) 3.4. cache_expire (int) + 3.5. modproc (str) 4. Functions @@ -89,6 +92,11 @@ Chapter 1. Admin Guide It exports the functions to check and generate SIP Identity header. + Note that this module needs "secsipid_proc.so" module to be installed, + but without loading the "secsipid_proc.so" via "loadmodule". This + module loads "secsipid_proc.so" in child init callback in order to + initialize the "libsecsipid" per child process. + 2. Dependencies 2.1. Kamailio Modules @@ -96,14 +104,15 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules - The following modules must be loaded before this module: - * No dependencies on other Kamailio modules. + The following modules must be installed (but not loaded) to use this + module: + * secsipid_proc. 2.2. External Libraries or Applications The following libraries or applications must be installed before running Kamailio with this module loaded: - * libsecsipid - https://github.com/asipto/secsipidx/. + * none. 3. Parameters @@ -111,6 +120,7 @@ Chapter 1. Admin Guide 3.2. timeout (int) 3.3. cache_dir (str) 3.4. cache_expire (int) + 3.5. modproc (str) 3.1. expire (int) @@ -160,6 +170,17 @@ modparam("secsipid", "cache_dir", "/tmp/kamailio/secsipid") modparam("secsipid", "cache_expire", 7200) ... +3.5. modproc (str) + + The name of or the path to the required per-process API module. + + Default value is "secsipid_proc.so". + + Example 1.5. Set modproc parameter +... +modparam("secsipid", "modproc", "secsipid_proc2.so") +... + 4. Functions 4.1. secsipid_check_identity(keyPath) @@ -181,7 +202,7 @@ modparam("secsipid", "cache_expire", 7200) This function can be used from ANY_ROUTE. - Example 1.5. secsipid_check_identity usage + Example 1.6. secsipid_check_identity usage ... request_route { ... @@ -205,7 +226,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.6. secsipid_check_identity_pubkey usage + Example 1.7. secsipid_check_identity_pubkey usage ... request_route { ... @@ -226,7 +247,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.7. secsipid_get_url usage + Example 1.8. secsipid_get_url usage ... request_route { ... @@ -250,7 +271,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.8. secsipid_add_identity usage + Example 1.9. secsipid_add_identity usage ... request_route { ... @@ -274,7 +295,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.9. Libsecsipid usage + Example 1.10. Libsecsipid usage ... go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/

3 years, 4 months

git:master:bd432651: secsipid_proc: per-process API functions needed by secsipid module

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bd432651a0343b41811e379a03fa582fa95cd366 URL: https://github.com/kamailio/kamailio/commit/bd432651a0343b41811e379a03fa582… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T08:37:55+01:00 secsipid_proc: per-process API functions needed by secsipid module --- Added: src/modules/secsipid_proc/Makefile Added: src/modules/secsipid_proc/README Added: src/modules/secsipid_proc/doc/Makefile Added: src/modules/secsipid_proc/doc/secsipid_proc.xml Added: src/modules/secsipid_proc/doc/secsipid_proc_admin.xml Added: src/modules/secsipid_proc/libsecsipid.h Added: src/modules/secsipid_proc/secsipid.h Added: src/modules/secsipid_proc/secsipid_proc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bd432651a0343b41811e379a03fa582… Patch: https://github.com/kamailio/kamailio/commit/bd432651a0343b41811e379a03fa582…

3 years, 4 months

git:master:09c61a1f: secsipid: redesign to use per-process API functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 09c61a1fe5c551b021a5c2a6997203f80a7c6f18 URL: https://github.com/kamailio/kamailio/commit/09c61a1fe5c551b021a5c2a6997203f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T08:34:05+01:00 secsipid: redesign to use per-process API functions - needed to initialize the multi-threaded libsecsipid library per child process - per-process API functions to be offered by secsipid_proc module --- Added: src/modules/secsipid/secsipid_papi.h Modified: src/modules/secsipid/Makefile Modified: src/modules/secsipid/doc/secsipid_admin.xml Modified: src/modules/secsipid/secsipid_mod.c Removed: src/modules/secsipid/libsecsipid.h Removed: src/modules/secsipid/secsipid.h --- Diff: https://github.com/kamailio/kamailio/commit/09c61a1fe5c551b021a5c2a6997203f… Patch: https://github.com/kamailio/kamailio/commit/09c61a1fe5c551b021a5c2a6997203f…

3 years, 4 months

git:master:25b1a518: core: split function that locates a module file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 25b1a51806dfa661f987958c8e84a16e60e37a4f URL: https://github.com/kamailio/kamailio/commit/25b1a51806dfa661f987958c8e84a16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-15T08:33:07+01:00 core: split function that locates a module file --- Modified: src/core/sr_module.c Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/25b1a51806dfa661f987958c8e84a16… Patch: https://github.com/kamailio/kamailio/commit/25b1a51806dfa661f987958c8e84a16… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index a021cb92c3..0a7ba37848 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -376,44 +376,24 @@ static inline int version_control(void *handle, char *path) } /** - * \brief load a sr module + * \brief lookup a module and fill the new path * - * tries to load the module specified by mod_path. - * If mod_path is 'modname' or 'modname.so' then - * \<MODS_DIR\>/\<modname\>.so will be tried and if this fails - * \<MODS_DIR\>/\<modname\>/\<modname\>.so - * If mod_path contain a '/' it is assumed to be the - * path to the module and tried first. If fails and mod_path is not - * absolute path (not starting with '/') then will try: - * \<MODS_DIR\>/mod_path * @param mod_path path or module name + * @param new_path resolved path to the module, must be pkg_free() if != mod_path * @return 0 on success , <0 on error */ -int load_module(char* mod_path) +int ksr_locate_module(char *mod_path, char **new_path) { - void* handle; - char* error; - mod_register_function mr; - module_exports_t* exp; - struct sr_module* t; struct stat stat_buf; str modname; char* mdir; char* nxt_mdir; char* path; int mdir_len; - int len; - int dlflags; - int new_dlflags; - int retries; int path_type; - str expref; - char exbuf[64]; + int len; -#ifndef RTLD_NOW -/* for openbsd */ -#define RTLD_NOW DL_LAZY -#endif + *new_path = NULL; path=mod_path; path_type = 0; modname.s = path; @@ -523,6 +503,57 @@ int load_module(char* mod_path) goto error; } } + + LM_DBG("found module to load <%s>\n", path); + *new_path = path; + return 0; + +error: + if(path!=mod_path) { + pkg_free(path); + } + + return -1; +} + +/** + * \brief load a sr module + * + * tries to load the module specified by mod_path. + * If mod_path is 'modname' or 'modname.so' then + * \<MODS_DIR\>/\<modname\>.so will be tried and if this fails + * \<MODS_DIR\>/\<modname\>/\<modname\>.so + * If mod_path contain a '/' it is assumed to be the + * path to the module and tried first. If fails and mod_path is not + * absolute path (not starting with '/') then will try: + * \<MODS_DIR\>/mod_path + * @param mod_path path or module name + * @return 0 on success , <0 on error + */ +int load_module(char* mod_path) +{ + void* handle; + char* error; + mod_register_function mr; + module_exports_t* exp; + struct sr_module* t; + int dlflags; + int new_dlflags; + int retries; + char* path = NULL; + str expref; + char exbuf[64]; + char* mdir; + +#ifndef RTLD_NOW +/* for openbsd */ +#define RTLD_NOW DL_LAZY +#endif + + if(ksr_locate_module(mod_path, &path)<0) { + return -1; + } + LM_DBG("trying to load <%s>\n", path); retries=2; diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 1d3150b326..8de9026c2a 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -549,4 +549,6 @@ int destroy_modules_phase(void); int ksr_shutdown_phase_init(void); int ksr_shutdown_phase(void); +int ksr_locate_module(char *mod_path, char **new_path); + #endif /* sr_module_h */

3 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2021