From b50f17c377f5f0b7b22c46f5675d12d653c1945e Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Tue, 21 Nov 2023 15:32:53 +0100
Subject: [PATCH] MT#58722 don't execute timers on shutdown phase

Change-Id: I5fe19a1e664df9aa8f17117950636a741244d382
---
 debian/patches/series                         |  2 +
 ...don-t-execute-timers-on-destroy_modu.patch | 80 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 debian/patches/upstream/core-timer_proc-don-t-execute-timers-on-destroy_modu.patch

diff --git a/debian/patches/series b/debian/patches/series
index 6be0c8e71..b88171174 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,6 +38,7 @@ sipwise/pv_headers-rework-pvh_remove_header_param-take-two.patch
 upstream/pv_headers-compare-result-of-pvh_set_xavi-with-NULL-.patch
 sipwise/pua_dialoginfo-fix-dlg_var-store-and-retrieval.patch
 upstream/http_client-Add-parameter-timeout_mode-timeout-in-se.patch
+upstream/core-timer_proc-don-t-execute-timers-on-destroy_modu.patch
 ### relevant for upstream
 sipwise/dialplan-don-t-stop-loading-rules-on-error.patch
 sipwise/cfgt-skip_unknown.patch
@@ -56,6 +57,7 @@ sipwise/rtpengine-set-mime-content-length.patch
 sipwise/presence_vqr.patch
 sipwise/dialog-dlg_get_ttag.patch
 ### active development
+#
 ### Don't just put stuff in any order
 ### use gbp pq import/export tooling to help maintain patches
 ###
diff --git a/debian/patches/upstream/core-timer_proc-don-t-execute-timers-on-destroy_modu.patch b/debian/patches/upstream/core-timer_proc-don-t-execute-timers-on-destroy_modu.patch
new file mode 100644
index 000000000..80275661b
--- /dev/null
+++ b/debian/patches/upstream/core-timer_proc-don-t-execute-timers-on-destroy_modu.patch
@@ -0,0 +1,80 @@
+From: Victor Seva <linuxmaniac@torreviejawireless.org>
+Date: Tue, 21 Nov 2023 15:30:03 +0100
+Subject: core: timer_proc don't execute timers on shutdown phase
+
+---
+ src/core/timer_proc.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/src/core/timer_proc.c b/src/core/timer_proc.c
+index 0b04cf6..55bd98d 100644
+--- a/src/core/timer_proc.c
++++ b/src/core/timer_proc.c
+@@ -29,6 +29,7 @@
+ #include "pt.h"
+ #include "ut.h"
+ #include "mem/shm_mem.h"
++#include "sr_module.h"
+ 
+ #include <unistd.h>
+ 
+@@ -76,6 +77,9 @@ int fork_basic_timer(int child_id, char *desc, int make_sock, timer_function *f,
+ 		if(cfg_child_init())
+ 			return -1;
+ 		for(;;) {
++			if(unlikely(ksr_shutdown_phase() != 0)) {
++				return 0;
++			}
+ 			sleep(interval);
+ 			cfg_update();
+ 			f(get_ticks(), param); /* ticks in s for compatibility with old
+@@ -99,6 +103,9 @@ int fork_basic_timer_w(int child_id, char *desc, int make_sock,
+ 		if(cfg_child_init())
+ 			return -1;
+ 		for(;;) {
++			if(unlikely(ksr_shutdown_phase() != 0)) {
++				return 0;
++			}
+ 			sleep(interval);
+ 			cfg_update();
+ 			f(get_ticks(), worker,
+@@ -141,6 +148,9 @@ int fork_basic_utimer(int child_id, char *desc, int make_sock,
+ 		if(cfg_child_init())
+ 			return -1;
+ 		for(;;) {
++			if(unlikely(ksr_shutdown_phase() != 0)) {
++				return 0;
++			}
+ 			sleep_us(uinterval);
+ 			cfg_update();
+ 			ts = get_ticks_raw();
+@@ -165,6 +175,9 @@ int fork_basic_utimer_w(int child_id, char *desc, int make_sock,
+ 		if(cfg_child_init())
+ 			return -1;
+ 		for(;;) {
++			if(unlikely(ksr_shutdown_phase() != 0)) {
++				return 0;
++			}
+ 			sleep_us(uinterval);
+ 			cfg_update();
+ 			ts = get_ticks_raw();
+@@ -273,6 +286,9 @@ int fork_sync_timer(int child_id, char *desc, int make_sock, timer_function *f,
+ 		if(cfg_child_init())
+ 			return -1;
+ 		for(;;) {
++			if(unlikely(ksr_shutdown_phase() != 0)) {
++				return 0;
++			}
+ 			if(ts2 > interval)
+ 				sleep_us(1000); /* 1 millisecond sleep to catch up */
+ 			else
+@@ -324,6 +340,9 @@ int fork_sync_utimer(int child_id, char *desc, int make_sock,
+ 		if(cfg_child_init())
+ 			return -1;
+ 		for(;;) {
++			if(unlikely(ksr_shutdown_phase() != 0)) {
++				return 0;
++			}
+ 			if(ts2 > uinterval)
+ 				sleep_us(1);
+ 			else