From 73c3aa54c064267acf546b7a51cc72205e2b2792 Mon Sep 17 00:00:00 2001
From: Sukchan Lee <acetcom@gmail.com>
Date: Wed, 21 Apr 2021 17:46:03 +0900
Subject: [PATCH] [ALL] Fix the terminate sequence (#938)

---
 src/amf/init.c     | 6 +++---
 src/ausf/init.c    | 4 ++--
 src/mme/mme-init.c | 8 ++++----
 src/nrf/init.c     | 4 ++--
 src/nssf/init.c    | 4 ++--
 src/pcf/init.c     | 4 ++--
 src/sgwc/init.c    | 6 +++---
 src/sgwu/init.c    | 6 +++---
 src/smf/init.c     | 8 ++++----
 src/udm/init.c     | 4 ++--
 src/udr/init.c     | 4 ++--
 src/upf/init.c     | 6 +++---
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/amf/init.c b/src/amf/init.c
index ee0038b35..625f40551 100644
--- a/src/amf/init.c
+++ b/src/amf/init.c
@@ -84,14 +84,14 @@ void amf_terminate(void)
 {
     if (!initialized) return;
 
-    ngap_close();
-    amf_sbi_close();
-
     /* Daemon terminating */
     event_termination();
     ogs_thread_destroy(thread);
     ogs_timer_delete(t_termination_holding);
 
+    ngap_close();
+    amf_sbi_close();
+
     amf_context_final();
     ogs_sbi_context_final();
 
diff --git a/src/ausf/init.c b/src/ausf/init.c
index 94afad57f..df771cf32 100644
--- a/src/ausf/init.c
+++ b/src/ausf/init.c
@@ -77,13 +77,13 @@ void ausf_terminate(void)
 {
     if (!initialized) return;
 
-    ausf_sbi_close();
-
     /* Daemon terminating */
     event_termination();
     ogs_thread_destroy(thread);
     ogs_timer_delete(t_termination_holding);
 
+    ausf_sbi_close();
+
     ausf_context_final();
     ogs_sbi_context_final();
 
diff --git a/src/mme/mme-init.c b/src/mme/mme-init.c
index 8c67bde79..3b6aa2a92 100644
--- a/src/mme/mme-init.c
+++ b/src/mme/mme-init.c
@@ -82,14 +82,14 @@ void mme_terminate(void)
 {
     if (!initialized) return;
 
-    mme_gtp_close();
-    sgsap_close();
-    s1ap_close();
-
     mme_event_term();
 
     ogs_thread_destroy(thread);
 
+    mme_gtp_close();
+    sgsap_close();
+    s1ap_close();
+
     mme_fd_final();
 
     mme_context_final();
diff --git a/src/nrf/init.c b/src/nrf/init.c
index c2707bf97..9c0e1f9b4 100644
--- a/src/nrf/init.c
+++ b/src/nrf/init.c
@@ -75,13 +75,13 @@ void nrf_terminate(void)
 {
     if (!initialized) return;
 
-    nrf_sbi_close();
-
     /* Daemon terminating */
     event_termination();
     ogs_thread_destroy(thread);
     ogs_timer_delete(t_termination_holding);
 
+    nrf_sbi_close();
+
     nrf_context_final();
     ogs_sbi_context_final();
 
diff --git a/src/nssf/init.c b/src/nssf/init.c
index a24e09847..d5e21d853 100644
--- a/src/nssf/init.c
+++ b/src/nssf/init.c
@@ -77,13 +77,13 @@ void nssf_terminate(void)
 {
     if (!initialized) return;
 
-    nssf_sbi_close();
-
     /* Daemon terminating */
     event_termination();
     ogs_thread_destroy(thread);
     ogs_timer_delete(t_termination_holding);
 
+    nssf_sbi_close();
+
     nssf_context_final();
     ogs_sbi_context_final();
 
diff --git a/src/pcf/init.c b/src/pcf/init.c
index 55c085cdf..d2c6918e7 100644
--- a/src/pcf/init.c
+++ b/src/pcf/init.c
@@ -80,13 +80,13 @@ void pcf_terminate(void)
 {
     if (!initialized) return;
 
-    pcf_sbi_close();
-
     /* Daemon terminating */
     event_termination();
     ogs_thread_destroy(thread);
     ogs_timer_delete(t_termination_holding);
 
+    pcf_sbi_close();
+
     ogs_dbi_final();
 
     pcf_context_final();
diff --git a/src/sgwc/init.c b/src/sgwc/init.c
index 3cea42102..65c7971e7 100644
--- a/src/sgwc/init.c
+++ b/src/sgwc/init.c
@@ -74,13 +74,13 @@ void sgwc_terminate(void)
 {
     if (!initialized) return;
 
-    sgwc_gtp_close();
-    sgwc_pfcp_close();
-
     sgwc_event_term();
 
     ogs_thread_destroy(thread);
 
+    sgwc_gtp_close();
+    sgwc_pfcp_close();
+
     sgwc_context_final();
 
     ogs_pfcp_context_final();
diff --git a/src/sgwu/init.c b/src/sgwu/init.c
index 1dbfae3f7..ed3546ffa 100644
--- a/src/sgwu/init.c
+++ b/src/sgwu/init.c
@@ -71,13 +71,13 @@ void sgwu_terminate(void)
 {
     if (!initialized) return;
 
-    sgwu_pfcp_close();
-    sgwu_gtp_close();
-
     sgwu_event_term();
 
     ogs_thread_destroy(thread);
 
+    sgwu_pfcp_close();
+    sgwu_gtp_close();
+
     sgwu_context_final();
 
     ogs_pfcp_context_final();
diff --git a/src/smf/init.c b/src/smf/init.c
index b8820a4ab..170258466 100644
--- a/src/smf/init.c
+++ b/src/smf/init.c
@@ -109,15 +109,15 @@ void smf_terminate(void)
 {
     if (!initialized) return;
 
-    smf_gtp_close();
-    smf_pfcp_close();
-    smf_sbi_close();
-
     /* Daemon terminating */
     event_termination();
     ogs_thread_destroy(thread);
     ogs_timer_delete(t_termination_holding);
 
+    smf_gtp_close();
+    smf_pfcp_close();
+    smf_sbi_close();
+
     smf_fd_final();
 
     smf_context_final();
diff --git a/src/udm/init.c b/src/udm/init.c
index c29b8f1b6..7d6e54e06 100644
--- a/src/udm/init.c
+++ b/src/udm/init.c
@@ -77,13 +77,13 @@ void udm_terminate(void)
 {
     if (!initialized) return;
 
-    udm_sbi_close();
-
     /* Daemon terminating */
     event_termination();
     ogs_thread_destroy(thread);
     ogs_timer_delete(t_termination_holding);
 
+    udm_sbi_close();
+
     udm_context_final();
     ogs_sbi_context_final();
 
diff --git a/src/udr/init.c b/src/udr/init.c
index 2b7c27753..0cb72a266 100644
--- a/src/udr/init.c
+++ b/src/udr/init.c
@@ -80,13 +80,13 @@ void udr_terminate(void)
 {
     if (!initialized) return;
 
-    udr_sbi_close();
-
     /* Daemon terminating */
     event_termination();
     ogs_thread_destroy(thread);
     ogs_timer_delete(t_termination_holding);
 
+    udr_sbi_close();
+
     ogs_dbi_final();
 
     udr_context_final();
diff --git a/src/upf/init.c b/src/upf/init.c
index 992281e16..2a217867f 100644
--- a/src/upf/init.c
+++ b/src/upf/init.c
@@ -74,13 +74,13 @@ void upf_terminate(void)
 {
     if (!initialized) return;
 
-    upf_pfcp_close();
-    upf_gtp_close();
-
     upf_event_term();
 
     ogs_thread_destroy(thread);
 
+    upf_pfcp_close();
+    upf_gtp_close();
+
     upf_context_final();
 
     ogs_pfcp_context_final();