UE: move _nas_proc_data to nas_user_t struct

This commit is contained in:
Frédéric Leroy
2017-01-25 13:06:35 +01:00
parent 2ee6ae11df
commit ee82aed182
10 changed files with 127 additions and 109 deletions
+6 -3
View File
@@ -46,6 +46,7 @@
#include "nas_user.h"
#include "nas_network.h"
#include "nas_parser.h"
#include "user_defs.h"
#include <stdlib.h> // exit
#include <poll.h> // poll
@@ -72,6 +73,8 @@ static void _nas_signal_handler(int signal);
static void _nas_clean(int usr_fd, int net_fd);
uint8_t usim_test = 0;
// FIXME user must be set up with right itti message instance
nas_user_t *user = NULL;
/****************************************************************************/
/****************** E X P O R T E D F U N C T I O N S ******************/
@@ -129,7 +132,7 @@ int main(int argc, const char *argv[])
/*
* Initialize the NAS contexts
*/
nas_user_initialize (&user_api_emm_callback, &user_api_esm_callback,
nas_user_initialize (user, &user_api_emm_callback, &user_api_esm_callback,
FIRMWARE_VERSION);
nas_network_initialize ();
@@ -226,7 +229,7 @@ static void *_nas_user_mngr(void *args)
/* User receiving loop */
while (!exit_loop) {
exit_loop = nas_user_receive_and_process(fd, NULL);
exit_loop = nas_user_receive_and_process(user, NULL);
}
/* Close the connection to the user application layer */
@@ -291,7 +294,7 @@ static void *_nas_network_mngr(void *args)
}
/* Process the network data message */
ret_code = nas_network_process_data (network_message_id,
ret_code = nas_network_process_data (user, network_message_id,
network_api_get_data ());
if (ret_code != RETURNok) {