diff --git a/debian/patches/series b/debian/patches/series index f8102b08a..affc7cfe2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,8 +4,6 @@ # # upsream fixes from master upstream/pv-new-function-pv_evalx-dst-fmt.patch -upstream/tm-execut-cfg_update-inside-t_continue.patch -upstream/janssonrpc-c-init-cfg-framework-for-additional-proce.patch # ## no_lib64_on_64_bits.patch diff --git a/debian/patches/upstream/janssonrpc-c-init-cfg-framework-for-additional-proce.patch b/debian/patches/upstream/janssonrpc-c-init-cfg-framework-for-additional-proce.patch deleted file mode 100644 index 3d1d89774..000000000 --- a/debian/patches/upstream/janssonrpc-c-init-cfg-framework-for-additional-proce.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 5d8d565331111b80d72a20d19f2bcb14ea6301a4 Mon Sep 17 00:00:00 2001 -From: Daniel-Constantin Mierla -Date: Wed, 13 Jul 2016 16:03:32 +0200 -Subject: [PATCH] janssonrpc-c: init cfg framework for additional process - -- revealed by GH #708 ---- - modules/janssonrpc-c/janssonrpc_io.c | 8 +++++++- - modules/janssonrpc-c/janssonrpc_mod.c | 2 ++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/modules/janssonrpc-c/janssonrpc_io.c b/modules/janssonrpc-c/janssonrpc_io.c -index 1e1a82b..ed0be6c 100644 ---- a/modules/janssonrpc-c/janssonrpc_io.c -+++ b/modules/janssonrpc-c/janssonrpc_io.c -@@ -39,6 +39,7 @@ - #include "../../action.h" - #include "../../route_struct.h" - #include "../../lvalue.h" -+#include "../../cfg/cfg_struct.h" - #include "../../rand/fastrand.h" - #include "../tm/tm_load.h" - #include "../jansson/jansson_utils.h" -@@ -57,11 +58,15 @@ void io_shutdown(int sig); - - int jsonrpc_io_child_process(int cmd_pipe) - { -+ struct event* pipe_ev = NULL; -+ - global_ev_base = event_base_new(); - global_evdns_base = evdns_base_new(global_ev_base, 1); - - set_non_blocking(cmd_pipe); -- struct event* pipe_ev = event_new(global_ev_base, cmd_pipe, EV_READ | EV_PERSIST, cmd_pipe_cb, NULL); -+ pipe_ev = event_new(global_ev_base, cmd_pipe, -+ EV_READ | EV_PERSIST, cmd_pipe_cb, NULL); -+ - if(!pipe_ev) { - ERR("Failed to create pipe event\n"); - return -1; -@@ -449,6 +454,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) - return; - } - -+ cfg_update(); - - switch(cmd->type) { - case CMD_CLOSE: -diff --git a/modules/janssonrpc-c/janssonrpc_mod.c b/modules/janssonrpc-c/janssonrpc_mod.c -index 7db22cc..c69b843 100644 ---- a/modules/janssonrpc-c/janssonrpc_mod.c -+++ b/modules/janssonrpc-c/janssonrpc_mod.c -@@ -29,6 +29,7 @@ - #include "../../trim.h" - #include "../../sr_module.h" - #include "../../timer_proc.h" -+#include "../../cfg/cfg_struct.h" - #include "../tm/tm_load.h" - #include "../jansson/jansson_utils.h" - -@@ -194,6 +195,7 @@ static int child_init(int rank) - return -1; /* error */ - if(pid==0){ - /* child */ -+ if (cfg_child_init()) return -1; - close(pipe_fds[1]); - return jsonrpc_io_child_process(pipe_fds[0]); - } --- -2.8.1 - diff --git a/debian/patches/upstream/tm-execut-cfg_update-inside-t_continue.patch b/debian/patches/upstream/tm-execut-cfg_update-inside-t_continue.patch deleted file mode 100644 index 9da923c22..000000000 --- a/debian/patches/upstream/tm-execut-cfg_update-inside-t_continue.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c7bec3320f6907c4edd8416a5e5cfa89b071a411 Mon Sep 17 00:00:00 2001 -From: Daniel-Constantin Mierla -Date: Wed, 13 Jul 2016 15:36:09 +0200 -Subject: [PATCH] tm: execut cfg_update() inside t_continue() - -- refresh the values changed inside cfg framework -- reported by Victor Seva, GH #708 ---- - modules/tm/t_suspend.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c -index e8096bb..6bb2547 100644 ---- a/modules/tm/t_suspend.c -+++ b/modules/tm/t_suspend.c -@@ -22,6 +22,7 @@ - #include "../../action.h" - #include "../../script_cb.h" - #include "../../dset.h" -+#include "../../cfg/cfg_struct.h" - - #include "config.h" - #include "sip_msg.h" -@@ -178,6 +179,8 @@ int t_continue(unsigned int hash_index, unsigned int label, - struct hdr_field *hdr, *prev = 0, *tmp = 0; - int route_type_bk; - -+ cfg_update(); -+ - if (t_lookup_ident(&t, hash_index, label) < 0) { - LM_ERR("transaction not found\n"); - return -1; --- -2.8.1 -