sm: update test

src/api-server/impl/SMContextsCollectionApiImpl.cpp

@@ -19,7 +19,7 @@ extern "C" {
 #include <ctype.h>
 #include "nas_message.h"
 #include "mmData.h"
-//#include "NasMain.h"
+#include "nas_sm_encode_to_json.h"
 }
 
 namespace oai {
@@ -45,7 +45,9 @@ void SMContextsCollectionApiImpl::post_sm_contexts(const SmContextMessage &smCon
 
 	SmContextCreateData smContextCreateData = smContextMessage.getJsonData();
 	std::string n1_sm_msg = smContextMessage.getBinaryDataN1SmMessage();
-        //FOR DEBUG ONLY!!, GENERATE A PDU SESSION ESTABLISHMENT MESSAGE HERE!!
+	
+    //FOR DEBUG ONLY!!, GENERATE A PDU SESSION ESTABLISHMENT MESSAGE HERE!!
+	//sm_encode_establishment_request();
 	//m_smf_app->create_n1_sm_container(PDU_SESSION_ESTABLISHMENT_REQUEST, n1_sm_msg);
 
 	Logger::smf_api_server().debug("smContextMessage, n1 sm msg %s",n1_sm_msg.c_str());

src/nas/ies/GPRSTimer3.h

@@ -7,14 +7,14 @@
 #define GPRS_TIMER3_MINIMUM_LENGTH 3
 #define GPRS_TIMER3_MAXIMUM_LENGTH 3
 
-#define VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_10_MINUTES 0b000
-#define VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_1_HOUR 	0b001
-#define VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_10_HOURS 	0b010
-#define VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_2_SECONDS 	0b011
-#define VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_30_SECONDS 0b100
-#define VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_1_MINUTE 	0b101
-#define VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_320_HOURS 	0b110
-#define VALUE_INDICATES_THAT_THE_TIMER_IS_DEACTIVATED 	0b111
+#define GPRSTIMER3_VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_10_MINUTES  0b000
+#define GPRSTIMER3_VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_1_HOUR 		0b001
+#define GPRSTIMER3_VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_10_HOURS 	0b010
+#define GPRSTIMER3_VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_2_SECONDS 	0b011
+#define GPRSTIMER3_VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_30_SECONDS 	0b100
+#define GPRSTIMER3_VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_1_MINUTE 	0b101
+#define GPRSTIMER3_VALUE_IS_INCREMENTED_IN_MULTIPLES_OF_320_HOURS 	0b110
+#define GPRSTIMER3_VALUE_INDICATES_THAT_THE_TIMER_IS_DEACTIVATED 	0b111
 
 typedef struct{
   uint8_t unit:3;

src/oai_smf/CMakeLists.txt

@@ -362,6 +362,7 @@ add_executable(smf
   ${SRC_TOP_DIR}/oai_smf/options.cpp
   ${SRC_TOP_DIR}/itti/itti.cpp
   ${SRC_TOP_DIR}/itti/itti_msg.cpp
+  #  ${SRC_TOP_DIR}/oai_smf/nas_sm_encode_to_json.c
   )
 
 IF(STATIC_LINKING)