sr-dev February 2016

sr-dev@lists.kamailio.org

28 participants
302 discussions

[kamailio] pua_dialoginfo: support for sending "Trying" state for callee (#514)

by Phil Lavin

- pua_dialoginfo: Implement callee_trying parameter in pua_dialoginfo which causes a "Trying" state to be sent for both the caller and callee when a new dialog is created. - presentity: Implement table locking for all routes through update_presentity in order to avoid a number of different race conditions which resulted in extraneous data being put into the presentity table. The latter change fixes a race condition which triggers more frequently due to the first... however I'm sure there are instances when it would trigger regardless of the first change. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/514 -- Commit Summary -- * pua_dialoginfo: support for sending "Trying" state for callee * presence: Fully implement table locking for updating the presentity table -- File Changes -- M modules/presence/presentity.c (50) M modules/pua_dialoginfo/doc/pua_dialoginfo.xml (7) M modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml (18) M modules/pua_dialoginfo/pua_dialoginfo.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/514.patch https://github.com/kamailio/kamailio/pull/514.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/514

8 years, 2 months

git:master:fedde6e9: Merge pull request #517 from mslehto/openbsd

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fedde6e9b4916080399ff7a8a587815aab622c7e URL: https://github.com/kamailio/kamailio/commit/fedde6e9b4916080399ff7a8a587815… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-22T23:17:47+01:00 Merge pull request #517 from mslehto/openbsd OpenBSD fixes --- Modified: Makefile.defs Modified: sr_module.c Modified: tcp_options.h --- Diff: https://github.com/kamailio/kamailio/commit/fedde6e9b4916080399ff7a8a587815… Patch: https://github.com/kamailio/kamailio/commit/fedde6e9b4916080399ff7a8a587815… --- diff --git a/Makefile.defs b/Makefile.defs index 226b68a..5495343 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1844,7 +1844,8 @@ ifeq ($(OS), openbsd) C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \ -DHAVE_UNION_SEMUN -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ - -DHAVE_NETINET_IN_SYSTM -DUSE_SIGWAIT + -DHAVE_NETINET_IN_SYSTM -DUSE_SIGWAIT \ + -DHAVE_SCHED_YIELD ifneq ($(found_lock_method), yes) C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems found_lock_method=yes @@ -1860,25 +1861,8 @@ ifeq ($(OS), openbsd) endif # (symbols on openbsd are prefixed by "_") YACC=yacc - # no sched_yield on openbsd unless linking with c_r (not recommended) # unfortunately pthread is needed for sigwait LIBS= -lpthread - OPENBSD_IS_AOUT:= $(shell echo "$(OSREL)" | \ - sed -e 's/^3\.[0-3][^0-9]*$$/yes/' |sed -e 's/^[0-2]\..*/yes/') -# exception: on sparc openbsd 3.2 is elf and not aout -ifeq ($(OSREL), 3.2) -ifeq ($(ARCH), sparc) - OPENBSD_IS_AOUT:=no -endif -ifeq ($(ARCH), sparc64) - OPENBSD_IS_AOUT:=no -endif -endif - -ifeq ($(OPENBSD_IS_AOUT), yes) - C_DEFS+=-DDLSYM_PREFIX='"_"' - LDFLAGS= # openbsd ld doesn't like -O2 or -E -endif endif # if opensd ifeq ($(OS), netbsd) diff --git a/sr_module.c b/sr_module.c index 057bf02..6ddbd00 100644 --- a/sr_module.c +++ b/sr_module.c @@ -381,23 +381,18 @@ static int register_module(unsigned ver, union module_exports_u* e, return ret; } -#ifndef DLSYM_PREFIX -/* define it to null */ -#define DLSYM_PREFIX -#endif - static inline int version_control(void *handle, char *path) { char **m_ver; char **m_flags; char* error; - m_ver=(char **)dlsym(handle, DLSYM_PREFIX "module_version"); + m_ver=(char **)dlsym(handle, "module_version"); if ((error=(char *)dlerror())!=0) { LM_ERR("no version info in module <%s>: %s\n", path, error); return 0; } - m_flags=(char **)dlsym(handle, DLSYM_PREFIX "module_flags"); + m_flags=(char **)dlsym(handle, "module_flags"); if ((error=(char *)dlerror())!=0) { LM_ERR("no compile flags info in module <%s>: %s\n", path, error); return 0; @@ -587,14 +582,13 @@ int load_module(char* mod_path) if (!version_control(handle, path)) { exit(-1); } - mod_if_ver = (unsigned *)dlsym(handle, - DLSYM_PREFIX "module_interface_ver"); + mod_if_ver = (unsigned *)dlsym(handle, "module_interface_ver"); if ( (error =(char*)dlerror())!=0 ){ LM_ERR("no module interface version in module <%s>\n", path ); goto error1; } /* launch register */ - mr = (mod_register_function)dlsym(handle, DLSYM_PREFIX "mod_register"); + mr = (mod_register_function)dlsym(handle, "mod_register"); if (((error =(char*)dlerror())==0) && mr) { /* no error call it */ new_dlflags=dlflags; @@ -612,7 +606,7 @@ int load_module(char* mod_path) goto error; } } - exp = (union module_exports_u*)dlsym(handle, DLSYM_PREFIX "exports"); + exp = (union module_exports_u*)dlsym(handle, "exports"); if(exp==NULL) { /* 'exports' structure not found, look up for '_modulename_exports' */ mdir = strrchr(mod_path, '/'); @@ -624,7 +618,7 @@ int load_module(char* mod_path) expref.len = strlen(expref.s); if(expref.len>3 && strcmp(expref.s+expref.len-3, ".so")==0) expref.len -= 3; - snprintf(exbuf, 62, DLSYM_PREFIX "_%.*s_exports", expref.len, expref.s); + snprintf(exbuf, 62, "_%.*s_exports", expref.len, expref.s); exp = (union module_exports_u*)dlsym(handle, exbuf); LM_DBG("looking up exports with name: %s\n", exbuf); if ( (error =(char*)dlerror())!=0 ){ diff --git a/tcp_options.h b/tcp_options.h index d8da5f3..2509f87 100644 --- a/tcp_options.h +++ b/tcp_options.h @@ -23,6 +23,7 @@ #ifdef USE_TCP +#include <netinet/in.h> #include <netinet/tcp.h> #ifndef NO_TCP_ASYNC #define TCP_ASYNC /* enabled async mode */

8 years, 2 months

git:master:5e826dd1: Makefile.defs: remove outdated OpenBSD logic

by Mikko Lehto

Module: kamailio Branch: master Commit: 5e826dd14f0f7035aaec534351d1634f65f2be36 URL: https://github.com/kamailio/kamailio/commit/5e826dd14f0f7035aaec534351d1634… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-02-22T23:45:38+02:00 Makefile.defs: remove outdated OpenBSD logic --- Modified: Makefile.defs Modified: sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/5e826dd14f0f7035aaec534351d1634… Patch: https://github.com/kamailio/kamailio/commit/5e826dd14f0f7035aaec534351d1634… --- diff --git a/Makefile.defs b/Makefile.defs index 5400195..5495343 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1863,22 +1863,6 @@ ifeq ($(OS), openbsd) YACC=yacc # unfortunately pthread is needed for sigwait LIBS= -lpthread - OPENBSD_IS_AOUT:= $(shell echo "$(OSREL)" | \ - sed -e 's/^3\.[0-3][^0-9]*$$/yes/' |sed -e 's/^[0-2]\..*/yes/') -# exception: on sparc openbsd 3.2 is elf and not aout -ifeq ($(OSREL), 3.2) -ifeq ($(ARCH), sparc) - OPENBSD_IS_AOUT:=no -endif -ifeq ($(ARCH), sparc64) - OPENBSD_IS_AOUT:=no -endif -endif - -ifeq ($(OPENBSD_IS_AOUT), yes) - C_DEFS+=-DDLSYM_PREFIX='"_"' - LDFLAGS= # openbsd ld doesn't like -O2 or -E -endif endif # if opensd ifeq ($(OS), netbsd) diff --git a/sr_module.c b/sr_module.c index 057bf02..6ddbd00 100644 --- a/sr_module.c +++ b/sr_module.c @@ -381,23 +381,18 @@ static int register_module(unsigned ver, union module_exports_u* e, return ret; } -#ifndef DLSYM_PREFIX -/* define it to null */ -#define DLSYM_PREFIX -#endif - static inline int version_control(void *handle, char *path) { char **m_ver; char **m_flags; char* error; - m_ver=(char **)dlsym(handle, DLSYM_PREFIX "module_version"); + m_ver=(char **)dlsym(handle, "module_version"); if ((error=(char *)dlerror())!=0) { LM_ERR("no version info in module <%s>: %s\n", path, error); return 0; } - m_flags=(char **)dlsym(handle, DLSYM_PREFIX "module_flags"); + m_flags=(char **)dlsym(handle, "module_flags"); if ((error=(char *)dlerror())!=0) { LM_ERR("no compile flags info in module <%s>: %s\n", path, error); return 0; @@ -587,14 +582,13 @@ int load_module(char* mod_path) if (!version_control(handle, path)) { exit(-1); } - mod_if_ver = (unsigned *)dlsym(handle, - DLSYM_PREFIX "module_interface_ver"); + mod_if_ver = (unsigned *)dlsym(handle, "module_interface_ver"); if ( (error =(char*)dlerror())!=0 ){ LM_ERR("no module interface version in module <%s>\n", path ); goto error1; } /* launch register */ - mr = (mod_register_function)dlsym(handle, DLSYM_PREFIX "mod_register"); + mr = (mod_register_function)dlsym(handle, "mod_register"); if (((error =(char*)dlerror())==0) && mr) { /* no error call it */ new_dlflags=dlflags; @@ -612,7 +606,7 @@ int load_module(char* mod_path) goto error; } } - exp = (union module_exports_u*)dlsym(handle, DLSYM_PREFIX "exports"); + exp = (union module_exports_u*)dlsym(handle, "exports"); if(exp==NULL) { /* 'exports' structure not found, look up for '_modulename_exports' */ mdir = strrchr(mod_path, '/'); @@ -624,7 +618,7 @@ int load_module(char* mod_path) expref.len = strlen(expref.s); if(expref.len>3 && strcmp(expref.s+expref.len-3, ".so")==0) expref.len -= 3; - snprintf(exbuf, 62, DLSYM_PREFIX "_%.*s_exports", expref.len, expref.s); + snprintf(exbuf, 62, "_%.*s_exports", expref.len, expref.s); exp = (union module_exports_u*)dlsym(handle, exbuf); LM_DBG("looking up exports with name: %s\n", exbuf); if ( (error =(char*)dlerror())!=0 ){

8 years, 2 months

git:master:996c1a58: Makefile.defs: add -DHAVE_SCHED_YIELD to OpenBSD options

by Mikko Lehto

Module: kamailio Branch: master Commit: 996c1a58353d6c0ac5e30daf5d7e8e854bd45419 URL: https://github.com/kamailio/kamailio/commit/996c1a58353d6c0ac5e30daf5d7e8e8… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-02-22T23:45:32+02:00 Makefile.defs: add -DHAVE_SCHED_YIELD to OpenBSD options According to manual, sched_yield(2) was introduced in OpenBSD 4.2 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/996c1a58353d6c0ac5e30daf5d7e8e8… Patch: https://github.com/kamailio/kamailio/commit/996c1a58353d6c0ac5e30daf5d7e8e8… --- diff --git a/Makefile.defs b/Makefile.defs index 226b68a..5400195 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1844,7 +1844,8 @@ ifeq ($(OS), openbsd) C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \ -DHAVE_UNION_SEMUN -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ - -DHAVE_NETINET_IN_SYSTM -DUSE_SIGWAIT + -DHAVE_NETINET_IN_SYSTM -DUSE_SIGWAIT \ + -DHAVE_SCHED_YIELD ifneq ($(found_lock_method), yes) C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems found_lock_method=yes @@ -1860,7 +1861,6 @@ ifeq ($(OS), openbsd) endif # (symbols on openbsd are prefixed by "_") YACC=yacc - # no sched_yield on openbsd unless linking with c_r (not recommended) # unfortunately pthread is needed for sigwait LIBS= -lpthread OPENBSD_IS_AOUT:= $(shell echo "$(OSREL)" | \

8 years, 2 months

git:master:46862c7b: tcp: fix tcp_options.o compilation

by Mikko Lehto

Module: kamailio Branch: master Commit: 46862c7b9a095fb8137e0ef358e0e97599bd444b URL: https://github.com/kamailio/kamailio/commit/46862c7b9a095fb8137e0ef358e0e97… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-02-22T23:45:27+02:00 tcp: fix tcp_options.o compilation Commit 6627098eb4adad706d20f6b73d1b7e75cc08a21f broke building on OpenBSD --- Modified: tcp_options.h --- Diff: https://github.com/kamailio/kamailio/commit/46862c7b9a095fb8137e0ef358e0e97… Patch: https://github.com/kamailio/kamailio/commit/46862c7b9a095fb8137e0ef358e0e97… --- diff --git a/tcp_options.h b/tcp_options.h index d8da5f3..2509f87 100644 --- a/tcp_options.h +++ b/tcp_options.h @@ -23,6 +23,7 @@ #ifdef USE_TCP +#include <netinet/in.h> #include <netinet/tcp.h> #ifndef NO_TCP_ASYNC #define TCP_ASYNC /* enabled async mode */

8 years, 2 months

[kamailio] OpenBSD fixes (#517)

by Mikko Lehto

Found out that I broke compilation and decided to fix other minor things also. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/517 -- Commit Summary -- * tcp: fix tcp_options.o compilation * Makefile.defs: add -DHAVE_SCHED_YIELD to OpenBSD options * Makefile.defs: remove outdated OpenBSD logic -- File Changes -- M Makefile.defs (20) M sr_module.c (18) M tcp_options.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/517.patch https://github.com/kamailio/kamailio/pull/517.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/517

8 years, 2 months

git:master:de77b78a: modules/sipt: add ability to check charging indicator

by Torrey Searle

Module: kamailio Branch: master Commit: de77b78a7d26a78a4a7a884c6f1ec2c18e664867 URL: https://github.com/kamailio/kamailio/commit/de77b78a7d26a78a4a7a884c6f1ec2c… Author: Torrey Searle <torrey(a)voxbone.com> Committer: Torrey Searle <torrey(a)voxbone.com> Date: 2016-02-22T17:53:03+01:00 modules/sipt: add ability to check charging indicator --- Added: modules/sipt/doc/sipt.txt --- Diff: https://github.com/kamailio/kamailio/commit/de77b78a7d26a78a4a7a884c6f1ec2c… Patch: https://github.com/kamailio/kamailio/commit/de77b78a7d26a78a4a7a884c6f1ec2c…

8 years, 2 months

git:4.3:9165e852: srutils: change names colliding with libcrypto

by Camille Oudot

Module: kamailio Branch: 4.3 Commit: 9165e8522ea03dda4968e1853216eb508ffd7a1f URL: https://github.com/kamailio/kamailio/commit/9165e8522ea03dda4968e1853216eb5… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-19T11:18:24+01:00 srutils: change names colliding with libcrypto (cherry picked from commit 4b5da2d909ea3fcd531eecff2f3e02adad26fa27) --- Modified: lib/srutils/sha256.c Modified: lib/srutils/sha256.h Modified: lib/srutils/shautils.c --- Diff: https://github.com/kamailio/kamailio/commit/9165e8522ea03dda4968e1853216eb5… Patch: https://github.com/kamailio/kamailio/commit/9165e8522ea03dda4968e1853216eb5…

8 years, 3 months

git:4.2:7242132a: srutils: change names colliding with libcrypto

by Camille Oudot

Module: kamailio Branch: 4.2 Commit: 7242132a5521c97517b4e87989413f48592c86d7 URL: https://github.com/kamailio/kamailio/commit/7242132a5521c97517b4e87989413f4… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-02-19T11:17:13+01:00 srutils: change names colliding with libcrypto (cherry picked from commit 4b5da2d909ea3fcd531eecff2f3e02adad26fa27) --- Modified: lib/srutils/sha256.c Modified: lib/srutils/sha256.h Modified: lib/srutils/shautils.c --- Diff: https://github.com/kamailio/kamailio/commit/7242132a5521c97517b4e87989413f4… Patch: https://github.com/kamailio/kamailio/commit/7242132a5521c97517b4e87989413f4…

8 years, 3 months

[kamailio] srutils: change names colliding with libcrypto (#513)

by Camille Oudot

Kamailio's **srutils** SHA functions have names that collide with OpenSSL's **libcrypto** SHA functions. In practice, OpenSSL fails to validate a server cert if **srutils** is loaded before **libcrypto**, because their SHA functions are not 100% equivalent. On my Debian, **http_async_client** was unable to issue any HTTPS request unless server certificate verification was disabled. This patch solves the issue by renaming the SHA functions in **srutils** to non-colliding names. I think this has no side effect because they are only used internally. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/513 -- Commit Summary -- * srutils: change names colliding with libcrypto -- File Changes -- M lib/srutils/sha256.c (56) M lib/srutils/sha256.h (98) M lib/srutils/shautils.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/513.patch https://github.com/kamailio/kamailio/pull/513.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/513

8 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2016