Move curl, ausf_config to ausf_app

etc/ausf.conf

@@ -4,22 +4,8 @@ AUSF =
   INSTANCE_ID = 10; #10
   PID_DIRECTORY = "/var/run";
 ######################################################################## NG SETUP RESPONSE IEs ############################################################
-  AUSF_NAME = "bupt-ausf";
-#   GUAMI:{MCC = "110"; MNC = "11"; RegionID = "128"; AMFSetID = "4"; AMFPointer = "1"}
-#   SERVED_GUAMI_LIST = (
-#    {MCC = "110"; MNC = "11"; RegionID = "10"; AMFSetID = "1"; AMFPointer = "0"}, #48bits <MCC><MNC><RegionID><AMFSetID><AMFPointer>
-#    {MCC = "110"; MNC = "11"; RegionID = "10"; AMFSetID = "1"; AMFPointer = "1"} #48bits <MCC><MNC><RegionID><AMFSetID><AMFPointer>
-#   );
-#   RELATIVE_CAPACITY = 30;
+  AUSF_NAME = "OAI-AUSF";
 
-#   PLMN_SUPPORT_LIST = (
-#     {MCC = "110"; MNC = "11"; TAC = 100; 
-#      SLICE_SUPPORT_LIST = (
-#       {SST = "1"; SD = "none"}, 
-#       {SST = "1"; SD = "12"}
-#      )
-#     }
-#   );
 ##################################################################### clause 9.2.6.2, 3gpp ts38.413 ####################################################
   #STATISTICS_TIMER_INTERVAL = 20; #second
 
@@ -41,27 +27,8 @@ AUSF =
         IPV4_ADDRESS   = "192.168.1.23/24";   #amf address (cidr)
         PORT           = 8383;                  #amf port
     };
-    # NUDR:{
-    #     INTERFACE_NAME = "ens33";               #interface for request for udr service
-    #     IPV4_ADDRESS   = "192.168.21.133/24";  #udr address (cidr)
-    #     PORT           = 8080;                  #udr port
-    #     VERSION        = "v2"; 
-    # };
   };
 
-#   CORE_CONFIGURATION:{
-#     EMERGENCY_SUPPORT = "false";
-#   };
-
-#   AUTHENTICATION:{
-#     MYSQL_server = "127.0.0.1";
-#     MYSQL_user   = "bupt";  # Database server login
-#     MYSQL_pass   = "linux";  # Database server password
-#     MYSQL_db     = "OAI_DB";
-#     OPERATOR_key = "1006020f0a478bf6b699f15c062e42b3"; # op
-#     RANDOM = "true";
-#   };
-
 };
 
 

src/ausf_app/CMakeLists.txt

@@ -30,6 +30,8 @@ include_directories(${SRC_TOP_DIR}/common/utils)
 add_library (AUSF STATIC
   ausf_app.cpp
   ausf_client.cpp 
+  ausf_config.cpp 
+  curl.cpp 
 )
 
 

src/common/utils/CMakeLists.txt

@@ -30,18 +30,15 @@ set(CN_UTILS_SRC STATIC
  ${CMAKE_CURRENT_SOURCE_DIR}/bstrlib.c
  ${CMAKE_CURRENT_SOURCE_DIR}/backtrace.c
  ${CMAKE_CURRENT_SOURCE_DIR}/conversions.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/dynamic_memory_check.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/dynamic_memory_check.c
  ${CMAKE_CURRENT_SOURCE_DIR}/hex_string_convert.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/http_multi_parser.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/if.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/pid_file.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/pid_file.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/thread_sched.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/mime_parser.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/ausf_config.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/curl.cpp
-    )
-
+ )
 
 add_library(CN_UTILS ${CN_UTILS_SRC})