Update New OGSLib commit

lib/ogslib

@@ -1 +1 @@
-Subproject commit 0bd29cd2dfc6d718097f6fd6b52a3e122721ee21
+Subproject commit d5357a3b6bc6ec8e099a6f531de708198c8592f0

src/mme/Makefile.am

@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libmme.la
 
 libmme_la_SOURCES = \
 	mme-kdf.h kasumi.h snow-3g.h zuc.h \
-    mme-event.h mme-context.h \
+    mme-event.h mme-timer.h mme-context.h \
 	ogs-sctp.h \
 	s1ap-build.h s1ap-handler.h s1ap-conv.h s1ap-path.h \
 	sgsap-build.h sgsap-handler.h sgsap-conv.h sgsap-path.h \
@@ -15,7 +15,7 @@ libmme_la_SOURCES = \
 	mme-gtp-path.h mme-s11-build.h mme-s11-handler.h \
 	mme-sm.h mme-path.h \
 	mme-kdf.c kasumi.c snow-3g.c zuc.c \
-    mme-init.c mme-event.c mme-context.c \
+    mme-init.c mme-event.c mme-timer.c mme-context.c \
 	ogs-sctp.c \
 	s1ap-sm.c s1ap-build.c s1ap-handler.c s1ap-conv.c s1ap-path.c \
 	sgsap-sm.c sgsap-build.c sgsap-handler.c sgsap-conv.c sgsap-path.c \

src/mme/mme-context.c

@@ -32,6 +32,7 @@
 #include "nas-conv.h"
 #include "mme-context.h"
 #include "mme-event.h"
+#include "mme-timer.h"
 #include "s1ap-path.h"
 #include "s1ap-handler.h"
 #include "mme-sm.h"
@@ -104,11 +105,6 @@ void mme_context_init()
 
     ogs_list_init(&self.mme_ue_list);
 
-    /* Paging retry timer: 2 secs */
-    self.t3413_value = ogs_time_from_sec(2); 
-    /* Client timer to connect to server: 3 secs */
-    self.t_conn_value = ogs_time_from_sec(3);
-
     context_initialized = 1;
 }
 

src/mme/mme-init.c

@@ -25,6 +25,7 @@
 #include "mme-context.h"
 #include "mme-sm.h"
 #include "mme-event.h"
+#include "mme-timer.h"
 
 #include "mme-fd-path.h"
 
@@ -39,6 +40,7 @@ int mme_initialize()
 
     mme_context_init();
     mme_event_init();
+    mme_timer_init();
 
     rv = gtp_xact_init(mme_self()->timer_mgr);
     if (rv != OGS_OK) return rv;
@@ -77,6 +79,7 @@ void mme_terminate(void)
 
     gtp_xact_final();
 
+    mme_timer_final();
     mme_event_final();
 }
 

src/mme/mme-timer.c

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "mme-timer.h"
+#include "mme-context.h"
+
+void mme_timer_init(void)
+{
+    /* Paging retry timer: 2 secs */
+    mme_self()->t3413_value = ogs_time_from_sec(2); 
+    /* Client timer to connect to server: 3 secs */
+    mme_self()->t_conn_value = ogs_time_from_sec(3);
+}
+
+void mme_timer_final(void)
+{
+}
+
+const char *mme_timer_get_name(mme_timer_e id)
+{
+    switch (id) {
+    case MME_TIMER_CLI_CONN_TO_SRV:
+        return "MME_TIMER_CLI_CONN_TO_SRV";
+    case MME_TIMER_T3413:
+        return "MME_TIMER_T3413";
+    default: 
+       break;
+    }
+
+    return "UNKNOWN_TIMER";
+}

src/mme/mme-timer.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef MME_TIMER_H
+#define MME_TIMER_H
+
+#include "ogs-core.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    MME_TIMER_BASE = 0,
+
+    MME_TIMER_CLI_CONN_TO_SRV,
+    MME_TIMER_T3413,
+
+    MME_TIMER_TOP,
+
+} mme_timer_e;
+
+void mme_timer_init(void);
+void mme_timer_final(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MME_TIMER_H */