maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6062 818b1a75-f10b-46b9-bf7c-635c3b92a50f

Browse Source
This commit is contained in:
Lionel Gauthier
2014-11-20 15:42:30 +00:00
parent 6488a055e9
commit b005d788dd
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair-cn/GTPV1-U/gtpv1u_task.c
+10 -6
View File
@@ -433,6 +433,7 @@ static void *gtpv1u_thread(void *args)
itti_receive_msg(TASK_GTPV1_U, &received_message_p); itti_receive_msg(TASK_GTPV1_U, &received_message_p);
DevAssert(received_message_p != NULL); DevAssert(received_message_p != NULL);
#if !defined(ENABLE_USE_GTPU_IN_KERNEL)
switch (ITTI_MSG_ID(received_message_p)) switch (ITTI_MSG_ID(received_message_p))
{ {
case GTPV1U_CREATE_TUNNEL_REQ: { case GTPV1U_CREATE_TUNNEL_REQ: {
@@ -540,6 +541,7 @@ static void *gtpv1u_thread(void *args)
} }
break; break;
} }
#endif
itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), received_message_p); itti_free(ITTI_MSG_ORIGIN_ID(received_message_p), received_message_p);
received_message_p = NULL; received_message_p = NULL;
} }
@@ -548,8 +550,8 @@ static void *gtpv1u_thread(void *args)
int gtpv1u_init(const mme_config_t *mme_config_p) int gtpv1u_init(const mme_config_t *mme_config_p)
{ {
int ret; int ret = 0;
NwGtpv1uRcT rc; NwGtpv1uRcT rc = 0;
NwGtpv1uUlpEntityT ulp; NwGtpv1uUlpEntityT ulp;
NwGtpv1uUdpEntityT udp; NwGtpv1uUdpEntityT udp;
NwGtpv1uLogMgrEntityT log; NwGtpv1uLogMgrEntityT log;
@@ -559,6 +561,9 @@ int gtpv1u_init(const mme_config_t *mme_config_p)
memset(&gtpv1u_sgw_data, 0, sizeof(gtpv1u_sgw_data)); memset(&gtpv1u_sgw_data, 0, sizeof(gtpv1u_sgw_data));
gtpv1u_sgw_data.sgw_ip_address_for_S1u_S12_S4_up = mme_config_p->ipv4.sgw_ip_address_for_S1u_S12_S4_up;
#if !defined(ENABLE_USE_GTPU_IN_KERNEL)
gtpv1u_sgw_data.S1U_mapping = hashtable_create (8192, NULL, NULL); gtpv1u_sgw_data.S1U_mapping = hashtable_create (8192, NULL, NULL);
if (gtpv1u_sgw_data.S1U_mapping == NULL) { if (gtpv1u_sgw_data.S1U_mapping == NULL) {
perror("hashtable_create"); perror("hashtable_create");
@@ -566,8 +571,6 @@ int gtpv1u_init(const mme_config_t *mme_config_p)
return -1; return -1;
} }
gtpv1u_sgw_data.sgw_ip_address_for_S1u_S12_S4_up = mme_config_p->ipv4.sgw_ip_address_for_S1u_S12_S4_up;
/* Initializing GTPv1-U stack */ /* Initializing GTPv1-U stack */
if ((rc = nwGtpv1uInitialize(&gtpv1u_sgw_data.gtpv1u_stack)) != NW_GTPV1U_OK) { if ((rc = nwGtpv1uInitialize(&gtpv1u_sgw_data.gtpv1u_stack)) != NW_GTPV1U_OK) {
GTPU_ERROR("Failed to setup nwGtpv1u stack %x\n", rc); GTPU_ERROR("Failed to setup nwGtpv1u stack %x\n", rc);
@@ -618,17 +621,18 @@ int gtpv1u_init(const mme_config_t *mme_config_p)
GTPU_ERROR("nwGtpv1uSetTimerMgrEntity: %x", rc); GTPU_ERROR("nwGtpv1uSetTimerMgrEntity: %x", rc);
return -1; return -1;
} }
#endif
if (itti_create_task(TASK_GTPV1_U, &gtpv1u_thread, NULL) < 0) { if (itti_create_task(TASK_GTPV1_U, &gtpv1u_thread, NULL) < 0) {
GTPU_ERROR("gtpv1u phtread_create: %s", strerror(errno)); GTPU_ERROR("gtpv1u phtread_create: %s", strerror(errno));
return -1; return -1;
} }
#if !defined(ENABLE_USE_GTPU_IN_KERNEL)
ret = gtpv1u_send_init_udp(mme_config_p->gtpv1u_config.port_number); ret = gtpv1u_send_init_udp(mme_config_p->gtpv1u_config.port_number);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
#endif
GTPU_DEBUG("Initializing GTPV1U interface: DONE\n"); GTPU_DEBUG("Initializing GTPV1U interface: DONE\n");
return ret; return ret;