Robert Schmidt
465d7de5a9
Remove the --usim-test option: to my knowledge, it's not used by users, and is misleadingly placed in various places where there should not be a difference w.r.t. USIM configuration. When making the changes, I assumed that --usim-test would be 0 (the default), which is the case in all executables when not specified in options except for the nr_dlsim, nr_pbchsmi, nr_ulsim simulators. The only exception is the initialization of PDCP from the MAC, which is not correct (the PDCP is in the CU, so it does not make sense to call it from the MAC which is in the DU). Instead, always initialize from main, even in the NSA case (NSA was covered by the incorrect initialization from MAC). This in turn let to some more cleanup around function du_rlc_data_req(). After receiving GTP packets at the DU, they were given to the PDCP to enqueue the packet at RLC. This does not work anymore, since the PDCP is not initialized; it also does not seem necessary, as this enqueue functionality is necessary to decouple PDCP and RLC to avoid deadlocks in monolithic, but in split-mode, this cannot happen. Instead, call directly into the RLC when receiving GTP packets.
169 lines
6.0 KiB
C
169 lines
6.0 KiB
C
/*
|
|
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership.
|
|
* The OpenAirInterface Software Alliance licenses this file to You under
|
|
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.openairinterface.org/?page_id=698
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*-------------------------------------------------------------------------------
|
|
* For more information about the OpenAirInterface (OAI) Software Alliance:
|
|
* contact@openairinterface.org
|
|
*/
|
|
|
|
/*****************************************************************************
|
|
Source EmmDeregisteredNormalService.c
|
|
|
|
Version 0.1
|
|
|
|
Date 2012/10/03
|
|
|
|
Product NAS stack
|
|
|
|
Subsystem EPS Mobility Management
|
|
|
|
Author Frederic Maurel
|
|
|
|
Description Implements the EPS Mobility Management procedures executed
|
|
when the EMM-SAP is in EMM-DEREGISTERED.NORMAL-SERVICE state.
|
|
|
|
In EMM-DEREGISTERED.NORMAL-SERVICE state, the EPS update
|
|
status is EU1 or EU2, in the meantime a suitable cell has
|
|
been found and the PLMN or tracking area is not in the
|
|
forbidden list.
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
#include "emm_fsm.h"
|
|
#include "commonDef.h"
|
|
#include "networkDef.h"
|
|
#include "nas_log.h"
|
|
#include "executables/lte-softmodem.h"
|
|
#include "emm_proc.h"
|
|
|
|
#include <assert.h>
|
|
|
|
/****************************************************************************/
|
|
/**************** E X T E R N A L D E F I N I T I O N S ****************/
|
|
/****************************************************************************/
|
|
|
|
|
|
/****************************************************************************/
|
|
/******************* L O C A L D E F I N I T I O N S *******************/
|
|
/****************************************************************************/
|
|
|
|
/****************************************************************************/
|
|
/****************** E X P O R T E D F U N C T I O N S ******************/
|
|
/****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
** **
|
|
** Name: EmmDeregisteredNormalService() **
|
|
** **
|
|
** Description: Handles the behaviour of the UE while the EMM-SAP is in **
|
|
** EMM-DEREGISTERED.NORMAL-SERVICE state. **
|
|
** **
|
|
** 3GPP TS 24.301, section 5.2.2.3.1 **
|
|
** The UE shall initiate an attach or combined attach proce- **
|
|
** dure. **
|
|
** **
|
|
** Inputs: evt: The received EMM-SAP event **
|
|
** Others: emm_fsm_status **
|
|
** **
|
|
** Outputs: None **
|
|
** Return: RETURNok, RETURNerror **
|
|
** Others: emm_fsm_status **
|
|
** **
|
|
***************************************************************************/
|
|
int EmmDeregisteredNormalService(nas_user_t *user, const emm_reg_t *evt)
|
|
{
|
|
LOG_FUNC_IN;
|
|
|
|
int rc = RETURNerror;
|
|
|
|
assert(emm_fsm_get_status(user) == EMM_DEREGISTERED_NORMAL_SERVICE);
|
|
|
|
switch (evt->primitive) {
|
|
case _EMMREG_REGISTER_REQ:
|
|
/*
|
|
* The user manually re-selected a PLMN to register to
|
|
*/
|
|
rc = emm_fsm_set_status(user, EMM_DEREGISTERED_PLMN_SEARCH);
|
|
|
|
if (rc != RETURNerror) {
|
|
/* Process the network registration request */
|
|
rc = emm_fsm_process(user, evt);
|
|
}
|
|
|
|
break;
|
|
|
|
case _EMMREG_ATTACH_INIT:
|
|
/*
|
|
* Initiate the attach procedure for EPS services
|
|
*/
|
|
rc = emm_proc_attach(user, EMM_ATTACH_TYPE_EPS);
|
|
break;
|
|
|
|
case _EMMREG_ATTACH_REQ:
|
|
/*
|
|
* An EPS network attach has been requested (Attach Request
|
|
* message successfully delivered to the network);
|
|
* enter state EMM-REGISTERED-INITIATED
|
|
*/
|
|
rc = emm_fsm_set_status(user, EMM_REGISTERED_INITIATED);
|
|
break;
|
|
|
|
case _EMMREG_LOWERLAYER_SUCCESS:
|
|
/*
|
|
* Initial NAS message has been successfully delivered
|
|
* to the network
|
|
*/
|
|
rc = emm_proc_lowerlayer_success(user->lowerlayer_data);
|
|
break;
|
|
|
|
case _EMMREG_LOWERLAYER_FAILURE:
|
|
/*
|
|
* Initial NAS message failed to be delivered to the network
|
|
*/
|
|
rc = emm_proc_lowerlayer_failure(user->lowerlayer_data, true);
|
|
break;
|
|
|
|
case _EMMREG_LOWERLAYER_RELEASE:
|
|
/*
|
|
* NAS signalling connection has been released
|
|
*/
|
|
rc = emm_proc_lowerlayer_release(user->lowerlayer_data);
|
|
break;
|
|
|
|
case _EMMREG_ATTACH_CNF:
|
|
/*
|
|
* Attach procedure successful and default EPS bearer
|
|
* context activated;
|
|
* enter state EMM-REGISTERED.
|
|
*/
|
|
rc = emm_fsm_set_status(user, EMM_REGISTERED);
|
|
break;
|
|
|
|
default:
|
|
LOG_TRACE(ERROR, "EMM-FSM - Primitive is not valid (%d)",
|
|
evt->primitive);
|
|
break;
|
|
}
|
|
|
|
LOG_FUNC_RETURN (rc);
|
|
}
|
|
|
|
/****************************************************************************/
|
|
/********************* L O C A L F U N C T I O N S *********************/
|
|
/****************************************************************************/
|
|
|