From 7afb914b9a6d80b6658c745a02a233ec70144dcb Mon Sep 17 00:00:00 2001
From: Sukchan Lee <acetcom@gmail.com>
Date: Mon, 27 Jul 2020 21:05:11 -0400
Subject: [PATCH] Add more log for 5GC

---
 src/amf/amf-sm.c   | 4 ----
 src/amf/nf-sm.c    | 1 +
 src/ausf/ausf-sm.c | 4 ----
 src/ausf/nf-sm.c   | 1 +
 src/nrf/sbi-path.c | 2 +-
 src/smf/nf-sm.c    | 1 +
 src/smf/smf-sm.c   | 4 ----
 src/udm/nf-sm.c    | 1 +
 src/udm/udm-sm.c   | 4 ----
 src/udr/nf-sm.c    | 1 +
 src/udr/udr-sm.c   | 4 ----
 11 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/amf/amf-sm.c b/src/amf/amf-sm.c
index c5bb6ecc99..5e232e9c9f 100644
--- a/src/amf/amf-sm.c
+++ b/src/amf/amf-sm.c
@@ -297,10 +297,6 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e)
 
                 e->sbi.message = &sbi_message;
                 ogs_fsm_dispatch(&nf_instance->sm, e);
-
-                if (OGS_FSM_CHECK(&nf_instance->sm, amf_nf_state_exception)) {
-                    ogs_warn("[%s] State machine exception", nf_instance->id);
-                }
                 break;
 
             CASE(OGS_SBI_RESOURCE_NAME_SUBSCRIPTIONS)
diff --git a/src/amf/nf-sm.c b/src/amf/nf-sm.c
index 5e9f48e384..c857066f9b 100644
--- a/src/amf/nf-sm.c
+++ b/src/amf/nf-sm.c
@@ -279,6 +279,7 @@ void amf_nf_state_registered(ogs_fsm_t *s, amf_event_t *e)
             break;
 
         case AMF_TIMER_NF_INSTANCE_NO_HEARTBEAT:
+            ogs_error("[%s] No heartbeat", nf_instance->id);
             OGS_FSM_TRAN(s, &amf_nf_state_will_register);
             break;
 
diff --git a/src/ausf/ausf-sm.c b/src/ausf/ausf-sm.c
index c37387054f..eb51c0f977 100644
--- a/src/ausf/ausf-sm.c
+++ b/src/ausf/ausf-sm.c
@@ -205,10 +205,6 @@ void ausf_state_operational(ogs_fsm_t *s, ausf_event_t *e)
 
                 e->sbi.message = &message;
                 ogs_fsm_dispatch(&nf_instance->sm, e);
-
-                if (OGS_FSM_CHECK(&nf_instance->sm, ausf_nf_state_exception)) {
-                    ogs_warn("[%s] State machine exception", nf_instance->id);
-                }
                 break;
 
             CASE(OGS_SBI_RESOURCE_NAME_SUBSCRIPTIONS)
diff --git a/src/ausf/nf-sm.c b/src/ausf/nf-sm.c
index fabca4a2d2..88429fb2d9 100644
--- a/src/ausf/nf-sm.c
+++ b/src/ausf/nf-sm.c
@@ -279,6 +279,7 @@ void ausf_nf_state_registered(ogs_fsm_t *s, ausf_event_t *e)
             break;
 
         case AUSF_TIMER_NF_INSTANCE_NO_HEARTBEAT:
+            ogs_error("[%s] No heartbeat", nf_instance->id);
             OGS_FSM_TRAN(s, &ausf_nf_state_will_register);
             break;
 
diff --git a/src/nrf/sbi-path.c b/src/nrf/sbi-path.c
index a09ffae258..aa6b4fa69f 100644
--- a/src/nrf/sbi-path.c
+++ b/src/nrf/sbi-path.c
@@ -62,7 +62,7 @@ static int client_notify_cb(ogs_sbi_response_t *response, void *data)
     }
 
     if (message.res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT)
-        ogs_error("Subscription notification failed [%d]", message.res_status);
+        ogs_warn("Subscription notification failed [%d]", message.res_status);
 
     ogs_sbi_message_free(&message);
     ogs_sbi_response_free(response);
diff --git a/src/smf/nf-sm.c b/src/smf/nf-sm.c
index b7f9688d4f..3d36a9f840 100644
--- a/src/smf/nf-sm.c
+++ b/src/smf/nf-sm.c
@@ -280,6 +280,7 @@ void smf_nf_state_registered(ogs_fsm_t *s, smf_event_t *e)
             break;
 
         case SMF_TIMER_NF_INSTANCE_NO_HEARTBEAT:
+            ogs_error("[%s] No heartbeat", nf_instance->id);
             OGS_FSM_TRAN(s, &smf_nf_state_will_register);
             break;
 
diff --git a/src/smf/smf-sm.c b/src/smf/smf-sm.c
index a824c83b06..1889488852 100644
--- a/src/smf/smf-sm.c
+++ b/src/smf/smf-sm.c
@@ -440,10 +440,6 @@ void smf_state_operational(ogs_fsm_t *s, smf_event_t *e)
 
                 e->sbi.message = &sbi_message;
                 ogs_fsm_dispatch(&nf_instance->sm, e);
-
-                if (OGS_FSM_CHECK(&nf_instance->sm, smf_nf_state_exception)) {
-                    ogs_warn("State machine exception");
-                }
                 break;
 
             CASE(OGS_SBI_RESOURCE_NAME_SUBSCRIPTIONS)
diff --git a/src/udm/nf-sm.c b/src/udm/nf-sm.c
index a71a6a5f38..6874f92015 100644
--- a/src/udm/nf-sm.c
+++ b/src/udm/nf-sm.c
@@ -279,6 +279,7 @@ void udm_nf_state_registered(ogs_fsm_t *s, udm_event_t *e)
             break;
 
         case UDM_TIMER_NF_INSTANCE_NO_HEARTBEAT:
+            ogs_error("[%s] No heartbeat", nf_instance->id);
             OGS_FSM_TRAN(s, &udm_nf_state_will_register);
             break;
 
diff --git a/src/udm/udm-sm.c b/src/udm/udm-sm.c
index 2e1985e2f6..7767332939 100644
--- a/src/udm/udm-sm.c
+++ b/src/udm/udm-sm.c
@@ -232,10 +232,6 @@ void udm_state_operational(ogs_fsm_t *s, udm_event_t *e)
 
                 e->sbi.message = &message;
                 ogs_fsm_dispatch(&nf_instance->sm, e);
-
-                if (OGS_FSM_CHECK(&nf_instance->sm, udm_nf_state_exception)) {
-                    ogs_warn("[%s] State machine exception", nf_instance->id);
-                }
                 break;
 
             CASE(OGS_SBI_RESOURCE_NAME_SUBSCRIPTIONS)
diff --git a/src/udr/nf-sm.c b/src/udr/nf-sm.c
index 767a73c699..78fca01944 100644
--- a/src/udr/nf-sm.c
+++ b/src/udr/nf-sm.c
@@ -279,6 +279,7 @@ void udr_nf_state_registered(ogs_fsm_t *s, udr_event_t *e)
             break;
 
         case UDR_TIMER_NF_INSTANCE_NO_HEARTBEAT:
+            ogs_error("[%s] No heartbeat", nf_instance->id);
             OGS_FSM_TRAN(s, &udr_nf_state_will_register);
             break;
 
diff --git a/src/udr/udr-sm.c b/src/udr/udr-sm.c
index 2bb91f0934..6690ed652e 100644
--- a/src/udr/udr-sm.c
+++ b/src/udr/udr-sm.c
@@ -210,10 +210,6 @@ void udr_state_operational(ogs_fsm_t *s, udr_event_t *e)
 
                 e->sbi.message = &message;
                 ogs_fsm_dispatch(&nf_instance->sm, e);
-
-                if (OGS_FSM_CHECK(&nf_instance->sm, udr_nf_state_exception)) {
-                    ogs_warn("[%s] State machine exception", nf_instance->id);
-                }
                 break;
 
             CASE(OGS_SBI_RESOURCE_NAME_SUBSCRIPTIONS)