update it

lib/s6a/Makefile.am

@@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libs6a.la
 
 libs6a_la_SOURCES = \
 	milenage.h kasme.h \
-	s6a_app.h
+	s6a_lib.h
 
 nodist_libs6a_la_SOURCES = \
 	milenage.c kasme.c \

lib/s6a/s6a_config.c

@@ -4,7 +4,7 @@
 #include "core_lib.h"
 #include "core_file.h"
 
-#include "s6a_app.h"
+#include "s6a_lib.h"
 
 static struct s6a_config_t g_conf;
 struct s6a_config_t *s6a_config;

lib/s6a/s6a_dict.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "s6a_app.h"
+#include "s6a_lib.h"
 
 struct dict_object *s6a_vendor = NULL;
 struct dict_object *s6a_appli = NULL;

lib/s6a/s6a_fd.c

@@ -5,11 +5,13 @@
 #include "core_signal.h"
 #include "core_semaphore.h"
 
-#include "s6a_app.h"
+#include "s6a_lib.h"
 
 static void s6a_gnutls_log_func(int level, const char *str);
 static void s6a_fd_logger(int printlevel, const char *format, va_list ap);
 
+status_t s6a_config_apply();
+
 int s6a_fd_init(const char *conffile)
 {
     int ret;

lib/s6a/s6a_init.c

@@ -2,10 +2,18 @@
 
 #include "core_debug.h"
 
-#include "s6a_app.h"
+#include "s6a_lib.h"
 
 static pthread_t s6a_stats_th = (pthread_t)NULL;
 
+int s6a_fd_init(const char *conffile);
+void s6a_fd_final();
+
+char *s6a_hss_config();
+char *s6a_mme_config();
+
+int s6a_dict_init(void);
+
 static void s6a_config_dump(void)
 {
 	d_trace(1, "------- s6a configuration dump: ---------\n");

lib/s6a/s6a_lib.h

@@ -1,5 +1,5 @@
-#ifndef __S6A_APP_H__
-#define __S6A_APP_H__
+#ifndef __S6A_LIB_H__
+#define __S6A_LIB_H__
 
 #include "core_errno.h"
 
@@ -126,17 +126,8 @@ extern struct dict_object *s6a_served_party_ip_addr;
 CORE_DECLARE(int) s6a_init(int mode);
 CORE_DECLARE(void) s6a_final(void);
 
-CORE_DECLARE(int) s6a_fd_init(const char *conffile);
-CORE_DECLARE(void) s6a_fd_final();
-
-CORE_DECLARE(char *) s6a_hss_config();
-CORE_DECLARE(char *) s6a_mme_config();
-CORE_DECLARE(status_t) s6a_config_apply();
-
-CORE_DECLARE(int) s6a_dict_init(void);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* ! __S6A_APP_H__ */
+#endif /* ! __S6A_LIB_H__ */

src/hss/init.c

@@ -7,7 +7,7 @@
 #include "milenage.h"
 
 #include "hss_ctx.h"
-#include "s6a_app.h"
+#include "s6a_lib.h"
 
 #define MAX_SQN_LEN 6
 #define MAX_AK_LEN 6

src/mme/s6a_auth_info.c

@@ -3,7 +3,7 @@
 #include "core_debug.h"
 
 #include "s6a_message.h"
-#include "s6a_app.h"
+#include "s6a_lib.h"
 
 struct sess_state {
     c_int32_t randval; /* a random value to store in Test-AVP */

src/mme/s6a_init.c

@@ -2,7 +2,7 @@
 
 #include "core_debug.h"
 
-#include "s6a_app.h"
+#include "s6a_lib.h"
 
 struct session_handler *s6a_mme_reg = NULL;