sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
286 discussions

git:5.5:03339e97: Makefile.defs: version set to 5.5.0

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 03339e971ed3c9a9d79812d346805db6eeb2c98a URL: https://github.com/kamailio/kamailio/commit/03339e971ed3c9a9d79812d346805db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:29:41+02:00 Makefile.defs: version set to 5.5.0 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/03339e971ed3c9a9d79812d346805db… Patch: https://github.com/kamailio/kamailio/commit/03339e971ed3c9a9d79812d346805db… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 86476f4d97..6b24118a9c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

2 years, 11 months

git:5.5:cbdf8d8c: pkg: version set to 5.5.0 for rpm and alpine specs

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: cbdf8d8c4c142dba78fd767986f54620a306e077 URL: https://github.com/kamailio/kamailio/commit/cbdf8d8c4c142dba78fd767986f5462… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:23:47+02:00 pkg: version set to 5.5.0 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cbdf8d8c4c142dba78fd767986f5462… Patch: https://github.com/kamailio/kamailio/commit/cbdf8d8c4c142dba78fd767986f5462… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f23ad03308..e5f39653d1 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.1.0 +pkgver=5.5.0 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 4f5a833a57..3928c1c596 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.0 +%define ver 5.5.0 %define rel dev1.0%{dist} %if 0%{?fedora}

2 years, 11 months

git:5.5:b2d6fefe: ndb_cassandra: update include paths as expected by thrift lib package

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b2d6fefef14d20fc9291bfff5f959860895a7bff URL: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f95986… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:13:34+02:00 ndb_cassandra: update include paths as expected by thrift lib package (cherry picked from commit 3511e0a975395a14f48fe5b6d60435315f7638dc) --- Modified: src/modules/ndb_cassandra/Cassandra.h Modified: src/modules/ndb_cassandra/cassandra_types.h Modified: src/modules/ndb_cassandra/thrift_wrapper.cpp --- Diff: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f95986… Patch: https://github.com/kamailio/kamailio/commit/b2d6fefef14d20fc9291bfff5f95986… --- diff --git a/src/modules/ndb_cassandra/Cassandra.h b/src/modules/ndb_cassandra/Cassandra.h index 6e453d742e..210d7a9234 100644 --- a/src/modules/ndb_cassandra/Cassandra.h +++ b/src/modules/ndb_cassandra/Cassandra.h @@ -6,7 +6,7 @@ #ifndef Cassandra_H #define Cassandra_H -#include <TProcessor.h> +#include <thrift/TProcessor.h> #include "cassandra_types.h" namespace org { namespace apache { namespace cassandra { diff --git a/src/modules/ndb_cassandra/cassandra_types.h b/src/modules/ndb_cassandra/cassandra_types.h index 9150a5c0dd..1aaa871a4b 100644 --- a/src/modules/ndb_cassandra/cassandra_types.h +++ b/src/modules/ndb_cassandra/cassandra_types.h @@ -6,10 +6,10 @@ #ifndef cassandra_TYPES_H #define cassandra_TYPES_H -#include <Thrift.h> -#include <TApplicationException.h> -#include <protocol/TProtocol.h> -#include <transport/TTransport.h> +#include <thrift/Thrift.h> +#include <thrift/TApplicationException.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/transport/TTransport.h> diff --git a/src/modules/ndb_cassandra/thrift_wrapper.cpp b/src/modules/ndb_cassandra/thrift_wrapper.cpp index 6f40241a59..0c6c4e4aa3 100644 --- a/src/modules/ndb_cassandra/thrift_wrapper.cpp +++ b/src/modules/ndb_cassandra/thrift_wrapper.cpp @@ -1,11 +1,11 @@ -#include "Thrift.h" -#include "transport/TSocket.h" -#include "transport/TTransport.h" -#include "transport/TBufferTransports.h" -#include "protocol/TProtocol.h" -#include "protocol/TBinaryProtocol.h" -#include "Cassandra.h" +#include <thrift/Thrift.h> +#include <thrift/transport/TSocket.h> +#include <thrift/transport/TTransport.h> +#include <thrift/transport/TBufferTransports.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/protocol/TBinaryProtocol.h> +#include "Cassandra.h" #include "thrift_wrapper.h" using namespace std;

2 years, 11 months

git:5.5:06921b71: ndb_cassandra: Makefile - use pkg-config if available

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 06921b71ee42a8c88229595a619d3390d0090b75 URL: https://github.com/kamailio/kamailio/commit/06921b71ee42a8c88229595a619d339… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:13:23+02:00 ndb_cassandra: Makefile - use pkg-config if available (cherry picked from commit 4b9fe7b72f8d9b53dbae24eb7bd269d527642f71) --- Modified: src/modules/ndb_cassandra/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/06921b71ee42a8c88229595a619d339… Patch: https://github.com/kamailio/kamailio/commit/06921b71ee42a8c88229595a619d339… --- diff --git a/src/modules/ndb_cassandra/Makefile b/src/modules/ndb_cassandra/Makefile index 6046eaf186..97e08542c4 100644 --- a/src/modules/ndb_cassandra/Makefile +++ b/src/modules/ndb_cassandra/Makefile @@ -9,11 +9,25 @@ LD=g++ auto_gen= NAME=ndb_cassandra.so -THRIFT_DIR = /usr/local/include/thrift -LIB_DIR = /usr/local/lib - -DEFS += -I${THRIFT_DIR} -LIBS += -L${LIB_DIR} thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBTHRIFT = $(shell $(BUILDER) --exists thrift > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBTHRIFT),0) + BUILDER = +endif +endif +endif + +ifneq ($(BUILDER),) + THRIFT_INC = $(shell $(BUILDER) --cflags thrift) + DEFS += $(THRIFT_INC) + LIBS += $(shell $(BUILDER) --libs thrift) +else + THRIFT_INC = -I/usr/local/include + DEFS += $(THRIFT_INC) + LIBS += -L/usr/local/lib thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +endif CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing @@ -22,18 +36,18 @@ include ../../Makefile.modules cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ cassandra_types.o: cassandra_types.cpp cassandra_types.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ Cassandra.o: Cassandra.cpp Cassandra.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ thrift_wrapper.o: thrift_wrapper.cpp thrift_wrapper.h @echo "Compiling $<" $(CXX) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ -ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o +ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o

2 years, 11 months

git:5.5:ff2ff19a: siptrace: debug messages on net data callbacks

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: ff2ff19af7087e188d3b7c100f80db2c8c534ca9 URL: https://github.com/kamailio/kamailio/commit/ff2ff19af7087e188d3b7c100f80db2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:13:06+02:00 siptrace: debug messages on net data callbacks (cherry picked from commit 95f3b4dea5d3f0d57ba79c8e8cd34d2ab30c7193) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ff2ff19af7087e188d3b7c100f80db2… Patch: https://github.com/kamailio/kamailio/commit/ff2ff19af7087e188d3b7c100f80db2… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 4648340d73..012644bfa0 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2141,9 +2141,12 @@ int siptrace_net_data_recv(sr_event_param_t *evp) if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { /* drop() used in event_route - all done */ + LM_DBG("skipping processing message due to drop\n"); return 0; } + LM_DBG("processing message mode %d\n", _siptrace_mode); + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); } @@ -2269,9 +2272,12 @@ int siptrace_net_data_sent(sr_event_param_t *evp) if(siptrace_exec_evcb_msg(&sto) == DROP_R_F) { /* drop() used in event_route - all done */ + LM_DBG("skipping processing message due to drop\n"); return 0; } + LM_DBG("processing message mode %d\n", _siptrace_mode); + if(_siptrace_mode & SIPTRACE_MODE_HEP) { trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); }

2 years, 11 months

git:5.5:2d259465: tcpops: use fixup function from core, remove internal wrapper

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 2d259465de5224dae4afe533d6ed7b104c59762e URL: https://github.com/kamailio/kamailio/commit/2d259465de5224dae4afe533d6ed7b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T10:12:55+02:00 tcpops: use fixup function from core, remove internal wrapper - set also fixup free function in cmd exports (cherry picked from commit 12fca1c369b6698cace66de171dcb166be8ae831) --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2d259465de5224dae4afe533d6ed7b1… Patch: https://github.com/kamailio/kamailio/commit/2d259465de5224dae4afe533d6ed7b1… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 82d9889355..b2d2fbe7dd 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -61,7 +61,6 @@ static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2); static int w_tcp_conid_state(sip_msg_t* msg, char* con, char *p2); static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); -static int fixup_numpv(void** param, int param_no); static int w_tcp_set_otcpid(sip_msg_t* msg, char* conid, char *p2); static int w_tcp_set_otcpid_flag(sip_msg_t* msg, char* mode, char *p2); @@ -79,27 +78,27 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, - fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime2, 2, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime1, 1, - fixup_numpv, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event1, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_conid_state", (cmd_function)w_tcp_conid_state, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_get_conid", (cmd_function)w_tcp_get_conid, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, - fixup_numpv, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"tcp_set_otcpid", (cmd_function)w_tcp_set_otcpid, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1, @@ -522,14 +521,6 @@ static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2) return ki_tcpops_enable_closed_event(msg); } -/** - * - */ -static int fixup_numpv(void** param, int param_no) -{ - return fixup_igp_null(param, 1); -} - /** * */

2 years, 11 months

git:master:3511e0a9: ndb_cassandra: update include paths as expected by thrift lib package

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3511e0a975395a14f48fe5b6d60435315f7638dc URL: https://github.com/kamailio/kamailio/commit/3511e0a975395a14f48fe5b6d604353… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T09:23:15+02:00 ndb_cassandra: update include paths as expected by thrift lib package --- Modified: src/modules/ndb_cassandra/Cassandra.h Modified: src/modules/ndb_cassandra/cassandra_types.h Modified: src/modules/ndb_cassandra/thrift_wrapper.cpp --- Diff: https://github.com/kamailio/kamailio/commit/3511e0a975395a14f48fe5b6d604353… Patch: https://github.com/kamailio/kamailio/commit/3511e0a975395a14f48fe5b6d604353… --- diff --git a/src/modules/ndb_cassandra/Cassandra.h b/src/modules/ndb_cassandra/Cassandra.h index 6e453d742e..210d7a9234 100644 --- a/src/modules/ndb_cassandra/Cassandra.h +++ b/src/modules/ndb_cassandra/Cassandra.h @@ -6,7 +6,7 @@ #ifndef Cassandra_H #define Cassandra_H -#include <TProcessor.h> +#include <thrift/TProcessor.h> #include "cassandra_types.h" namespace org { namespace apache { namespace cassandra { diff --git a/src/modules/ndb_cassandra/cassandra_types.h b/src/modules/ndb_cassandra/cassandra_types.h index 9150a5c0dd..1aaa871a4b 100644 --- a/src/modules/ndb_cassandra/cassandra_types.h +++ b/src/modules/ndb_cassandra/cassandra_types.h @@ -6,10 +6,10 @@ #ifndef cassandra_TYPES_H #define cassandra_TYPES_H -#include <Thrift.h> -#include <TApplicationException.h> -#include <protocol/TProtocol.h> -#include <transport/TTransport.h> +#include <thrift/Thrift.h> +#include <thrift/TApplicationException.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/transport/TTransport.h> diff --git a/src/modules/ndb_cassandra/thrift_wrapper.cpp b/src/modules/ndb_cassandra/thrift_wrapper.cpp index 6f40241a59..0c6c4e4aa3 100644 --- a/src/modules/ndb_cassandra/thrift_wrapper.cpp +++ b/src/modules/ndb_cassandra/thrift_wrapper.cpp @@ -1,11 +1,11 @@ -#include "Thrift.h" -#include "transport/TSocket.h" -#include "transport/TTransport.h" -#include "transport/TBufferTransports.h" -#include "protocol/TProtocol.h" -#include "protocol/TBinaryProtocol.h" -#include "Cassandra.h" +#include <thrift/Thrift.h> +#include <thrift/transport/TSocket.h> +#include <thrift/transport/TTransport.h> +#include <thrift/transport/TBufferTransports.h> +#include <thrift/protocol/TProtocol.h> +#include <thrift/protocol/TBinaryProtocol.h> +#include "Cassandra.h" #include "thrift_wrapper.h" using namespace std;

2 years, 11 months

git:master:4b9fe7b7: ndb_cassandra: Makefile - use pkg-config if available

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4b9fe7b72f8d9b53dbae24eb7bd269d527642f71 URL: https://github.com/kamailio/kamailio/commit/4b9fe7b72f8d9b53dbae24eb7bd269d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-05T09:12:25+02:00 ndb_cassandra: Makefile - use pkg-config if available --- Modified: src/modules/ndb_cassandra/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/4b9fe7b72f8d9b53dbae24eb7bd269d… Patch: https://github.com/kamailio/kamailio/commit/4b9fe7b72f8d9b53dbae24eb7bd269d… --- diff --git a/src/modules/ndb_cassandra/Makefile b/src/modules/ndb_cassandra/Makefile index 6046eaf186..97e08542c4 100644 --- a/src/modules/ndb_cassandra/Makefile +++ b/src/modules/ndb_cassandra/Makefile @@ -9,11 +9,25 @@ LD=g++ auto_gen= NAME=ndb_cassandra.so -THRIFT_DIR = /usr/local/include/thrift -LIB_DIR = /usr/local/lib - -DEFS += -I${THRIFT_DIR} -LIBS += -L${LIB_DIR} thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBTHRIFT = $(shell $(BUILDER) --exists thrift > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBTHRIFT),0) + BUILDER = +endif +endif +endif + +ifneq ($(BUILDER),) + THRIFT_INC = $(shell $(BUILDER) --cflags thrift) + DEFS += $(THRIFT_INC) + LIBS += $(shell $(BUILDER) --libs thrift) +else + THRIFT_INC = -I/usr/local/include + DEFS += $(THRIFT_INC) + LIBS += -L/usr/local/lib thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift +endif CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) CXXFLAGS+=-Wno-write-strings -Wno-deprecated -Wno-unused-function -Wno-sign-compare -Wno-strict-aliasing @@ -22,18 +36,18 @@ include ../../Makefile.modules cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ cassandra_types.o: cassandra_types.cpp cassandra_types.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ Cassandra.o: Cassandra.cpp Cassandra.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) $(THRIFT_INC) -c $< -o $@ thrift_wrapper.o: thrift_wrapper.cpp thrift_wrapper.h @echo "Compiling $<" $(CXX) $(CXXFLAGS) $(CFLAGS) $(C_DEFS) $(DEFS) -c $< -o $@ -ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o +ndb_cassandra.so: thrift_wrapper.o cassandra_constants.o cassandra_types.o Cassandra.o

2 years, 11 months

The plan for releasing Kamailio v5.5.0

by Daniel-Constantin Mierla

Hello, after almost 4 weeks since development was frozen, it is time to plan releasing the next major stable version, respectively 5.5.0, therefore I propose to do it on Wednesday, May 5, 2021. The branch 5.5 was already created about one week ago, several doc resources were published (core/variables/transformations/rpcs/stats cookbooks, alphabetic indexes, ...). If anyone is testing an upgrade from branch 5.4 to 5.5 and encounters changes that should be done in Kamailio config, add notes about at: * https://www.kamailio.org/wiki/install/upgrade/5.4.x-to-5.5.0 Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

2 years, 11 months

git:master:fe6923cd: lost: change in the method for parsing the From header in lost_get_from_header() related to #2723

by Wolfgang Kampichler

Module: kamailio Branch: master Commit: fe6923cd8e995c400fc1838304c95142cc00273e URL: https://github.com/kamailio/kamailio/commit/fe6923cd8e995c400fc1838304c9514… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-04T23:24:53+02:00 lost: change in the method for parsing the From header in lost_get_from_header() related to #2723 --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/fe6923cd8e995c400fc1838304c9514… Patch: https://github.com/kamailio/kamailio/commit/fe6923cd8e995c400fc1838304c9514… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index bcb045f451..beb1d2e932 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -442,9 +442,10 @@ p_lost_geolist_t lost_get_geolocation_header(struct sip_msg *msg, int *items) str hdr = STR_NULL; p_lost_geolist_t list = NULL; + *items = 0; + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { LM_ERR("failed to parse SIP headers\n"); - *items = 0; return list; } @@ -481,8 +482,8 @@ char *lost_get_pai_header(struct sip_msg *msg, int *lgth) *lgth = 0; - if(parse_headers(msg, HDR_PAI_F, 0) == -1) { - LM_ERR("could not parse P-A-I header\n"); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse SIP headers\n"); return res; } @@ -640,34 +641,53 @@ int lost_get_nameinfo(char *ip, str *name, int flag) */ char *lost_get_from_header(struct sip_msg *msg, int *lgth) { - to_body_t *f_body; + struct hdr_field *hf; + to_body_t *from_body; char *res = NULL; *lgth = 0; - if(parse_headers(msg, HDR_FROM_F, 0) == -1) { - LM_ERR("failed to parse From header\n"); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse SIP headers\n"); return res; } - if(msg->from == NULL || get_from(msg) == NULL) { - LM_ERR("From header not found\n"); - return res; - } - f_body = get_from(msg); + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type == HDR_FROM_T) { - LM_DBG("From body: [%.*s]\n", f_body->body.len, f_body->body.s); + LM_DBG("From body: [%.*s]\n", hf->body.len, hf->body.s); - res = (char *)pkg_malloc((f_body->uri.len + 1) * sizeof(char)); - if(res == NULL) { - PKG_MEM_ERROR; - return res; - } else { - memset(res, 0, f_body->uri.len + 1); - memcpy(res, f_body->uri.s, f_body->uri.len + 1); - res[f_body->uri.len] = '\0'; + /* first, get some memory */ + from_body = pkg_malloc(sizeof(to_body_t)); + if(from_body == NULL) { + PKG_MEM_ERROR; + return res; + } + /* parse From body */ + memset(from_body, 0, sizeof(to_body_t)); + parse_to(hf->body.s, hf->body.s + hf->body.len + 1, from_body); + if(from_body->error == PARSE_ERROR) { + LM_ERR("bad From header\n"); + pkg_free(from_body); + return res; + } + if(from_body->error == PARSE_OK) { + res = (char *)pkg_malloc( + (from_body->uri.len + 1) * sizeof(char)); + if(res == NULL) { + PKG_MEM_ERROR; + pkg_free(from_body); + return res; + } else { + memset(res, 0, from_body->uri.len + 1); + memcpy(res, from_body->uri.s, from_body->uri.len + 1); + res[from_body->uri.len] = '\0'; + pkg_free(from_body); - *lgth = strlen(res); + *lgth = strlen(res); + } + } + } } return res;

2 years, 11 months

← Newer
1
...
21
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021