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

UE: create a user and move user_fd into the nas_user_t struct

Browse Source
This commit is contained in:
Frédéric Leroy
2017-01-25 13:06:13 +01:00
parent 7c8dbbdb25
commit 2ee6ae11df
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/NAS/UE/nas_ue_task.c
+13 -10
View File
@@ -25,20 +25,20 @@
# include "nas_ue_task.h" # include "nas_ue_task.h"
# include "UTIL/LOG/log.h" # include "UTIL/LOG/log.h"
# include "nas_user.h" # include "user_defs.h"
# include "user_api.h" # include "user_api.h"
# include "nas_parser.h" # include "nas_parser.h"
# include "nas_proc.h" # include "nas_proc.h"
# include "msc.h" # include "msc.h"
#include "nas_user.h"
# define NAS_UE_AUTOSTART 1 # define NAS_UE_AUTOSTART 1
extern unsigned char NB_eNB_INST; extern unsigned char NB_eNB_INST;
extern unsigned char NB_UE_INST; extern unsigned char NB_UE_INST;
static int user_fd; static int nas_ue_process_events(nas_user_t *user, struct epoll_event *events, int nb_events)
static int nas_ue_process_events(struct epoll_event *events, int nb_events)
{ {
int event; int event;
int exit_loop = FALSE; int exit_loop = FALSE;
@@ -48,8 +48,8 @@ static int nas_ue_process_events(struct epoll_event *events, int nb_events)
for (event = 0; event < nb_events; event++) { for (event = 0; event < nb_events; event++) {
if (events[event].events != 0) { if (events[event].events != 0) {
/* If the event has not been yet been processed (not an itti message) */ /* If the event has not been yet been processed (not an itti message) */
if (events[event].data.fd == user_fd) { if (events[event].data.fd == user->fd) {
exit_loop = nas_user_receive_and_process(&user_fd, NULL); exit_loop = nas_user_receive_and_process(&user->fd, NULL);
} else { } else {
LOG_E(NAS, "[UE] Received an event from an unknown fd %d!\n", events[event].data.fd); LOG_E(NAS, "[UE] Received an event from an unknown fd %d!\n", events[event].data.fd);
} }
@@ -68,6 +68,9 @@ void *nas_ue_task(void *args_p)
instance_t instance; instance_t instance;
unsigned int Mod_id; unsigned int Mod_id;
int result; int result;
nas_user_t user_value = {};
nas_user_t *user = &user_value;
itti_mark_task_ready (TASK_NAS_UE); itti_mark_task_ready (TASK_NAS_UE);
MSC_START_USE(); MSC_START_USE();
@@ -81,8 +84,8 @@ void *nas_ue_task(void *args_p)
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
user_fd = user_api_get_fd (); user->fd = user_api_get_fd ();
itti_subscribe_event_fd (TASK_NAS_UE, user_fd); itti_subscribe_event_fd (TASK_NAS_UE, user->fd);
} }
/* Initialize NAS user */ /* Initialize NAS user */
@@ -114,7 +117,7 @@ void *nas_ue_task(void *args_p)
/* Send an activate modem command to NAS like UserProcess should do it */ /* Send an activate modem command to NAS like UserProcess should do it */
char *user_data = "at+cfun=1\r"; char *user_data = "at+cfun=1\r";
nas_user_receive_and_process (&user_fd, user_data); nas_user_receive_and_process (&user->fd, user_data);
} }
#endif #endif
break; break;
@@ -215,7 +218,7 @@ void *nas_ue_task(void *args_p)
nb_events = itti_get_events(TASK_NAS_UE, &events); nb_events = itti_get_events(TASK_NAS_UE, &events);
if ((nb_events > 0) && (events != NULL)) { if ((nb_events > 0) && (events != NULL)) {
if (nas_ue_process_events(events, nb_events) == TRUE) { if (nas_ue_process_events(user, events, nb_events) == TRUE) {
LOG_E(NAS, "[UE] Received exit loop\n"); LOG_E(NAS, "[UE] Received exit loop\n");
} }
} }