t Merge remote-tracking branch 'upstream/master' into rsarwad_handle_s8_contexts

Signed-off-by: rashmi <[email protected]>

Author: rsarwad

lte/gateway/c/oai/include/spgw_types.h

@@ -83,7 +83,7 @@ typedef struct mme_sgw_tunnel_s {
 // AGW-wide state for SGW task
 typedef struct sgw_state_s {
   teid_t tunnel_id;
-  uint32_t gtpv1u_teid;
+  teid_t gtpv1u_teid;
   struct in_addr sgw_ip_address_S1u_S12_S4_up;
   hash_table_ts_t* imsi_ue_context_htbl;
 } sgw_state_t;

lte/gateway/c/oai/oai_mme/CMakeLists.txt

@@ -56,8 +56,7 @@ if ( NOT EMBEDDED_SGW )
  target_link_libraries(mme
   LIB_GTPV2C TASK_UDP)
 else ( EMBEDDED_SGW )
-target_link_libraries(mme TASK_SGW)
-target_link_libraries(mme TASK_SGW_S8)
+target_link_libraries(mme TASK_SGW TASK_SGW_S8)
 endif ( NOT EMBEDDED_SGW )
 
 if ( NOT S6A_OVER_GRPC )

lte/gateway/c/oai/tasks/sgw_s8/CMakeLists.txt

@@ -23,7 +23,6 @@ set (SGW_S8_SRC
     )
 add_library(TASK_SGW_S8 ${SGW_S8_SRC})
 
-
 target_link_libraries(TASK_SGW_S8
     COMMON
     LIB_BSTR LIB_HASHTABLE

lte/gateway/c/oai/tasks/sgw_s8/sgw_s8_task.c

@@ -73,10 +73,6 @@ static int handle_message(zloop_t* loop, zsock_t* reader, void* arg) {
   imsi64_t imsi64 = itti_get_associated_imsi(received_message_p);
 
   switch (ITTI_MSG_ID(received_message_p)) {
-    case MESSAGE_TEST: {
-      OAI_FPRINTF_INFO("TASK_SGW_S8 received MESSAGE_TEST\n");
-    } break;
-
     case TERMINATE_MESSAGE: {
       itti_free_msg_content(received_message_p);
       zframe_destroy(&msg_frame);