Skip to content

Commit 9c6abcf

Browse files
rsarwadrsarwad
committed
Addressed self comments
Signed-off-by: Rashmi <[email protected]>
1 parent 2ed0912 commit 9c6abcf

14 files changed

+67
-77
lines changed

‎lte/gateway/c/core/oai/include/s1ap_state.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ void put_s1ap_state(void);
4040
enb_description_t* s1ap_state_get_enb(s1ap_state_t* state,
4141
sctp_assoc_id_t assoc_id);
4242

43-
magma::lte::oai::UeDescription* s1ap_state_get_ue_enbid(
43+
oai::UeDescription* s1ap_state_get_ue_enbid(
4444
sctp_assoc_id_t sctp_assoc_id, enb_ue_s1ap_id_t enb_ue_s1ap_id);
4545

46-
magma::lte::oai::UeDescription* s1ap_state_get_ue_mmeid(
46+
oai::UeDescription* s1ap_state_get_ue_mmeid(
4747
mme_ue_s1ap_id_t mme_ue_s1ap_id);
4848

49-
magma::lte::oai::UeDescription* s1ap_state_get_ue_imsi(imsi64_t imsi64);
49+
oai::UeDescription* s1ap_state_get_ue_imsi(imsi64_t imsi64);
5050

5151
/**
5252
* Return unique composite id for S1AP UE context
@@ -71,22 +71,22 @@ map_uint64_ue_description_t* get_s1ap_ue_state(void);
7171

7272
int read_s1ap_ue_state_db(void);
7373

74-
void remove_ues_without_imsi_from_ue_id_coll(void);
75-
76-
void clean_stale_enb_state(s1ap_state_t* state,
77-
enb_description_t* new_enb_association);
78-
7974
void put_s1ap_ue_state(imsi64_t imsi64);
8075

8176
void delete_s1ap_ue_state(imsi64_t imsi64);
8277

8378
bool s1ap_ue_compare_by_mme_ue_id_cb(__attribute__((unused)) uint64_t keyP,
84-
magma::lte::oai::UeDescription* elementP,
79+
oai::UeDescription* elementP,
8580
void* parameterP, void** resultP);
8681

8782
bool s1ap_ue_compare_by_imsi(__attribute__((unused)) uint64_t keyP,
88-
magma::lte::oai::UeDescription* elementP,
83+
oai::UeDescription* elementP,
8984
void* parameterP, void** resultP);
9085

86+
void remove_ues_without_imsi_from_ue_id_coll(void);
87+
88+
void clean_stale_enb_state(s1ap_state_t* state,
89+
enb_description_t* new_enb_association);
90+
9191
} // namespace lte
9292
} // namespace magma

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ void s1ap_remove_ue(s1ap_state_t* state, oai::UeDescription* ue_ref) {
463463
ue_ref->enb_ue_s1ap_id(), ue_ref->mme_ue_s1ap_id(),
464464
enb_ref->enb_id);
465465

466-
ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_INVALID_STATE);
466+
ue_ref->set_s1ap_ue_state(oai::S1AP_UE_INVALID_STATE);
467467
if (ue_ref->s1ap_ue_context_rel_timer().id() != S1AP_TIMER_INACTIVE_ID) {
468468
s1ap_stop_timer(ue_ref->s1ap_ue_context_rel_timer().id());
469469
ue_ref->mutable_s1ap_ue_context_rel_timer()->set_id(S1AP_TIMER_INACTIVE_ID);

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme.hpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626

2727
#include "lte/protos/oai/s1ap_state.pb.h"
2828

29-
#include "lte/gateway/c/core/oai/include/s1ap_state.hpp"
30-
#include "lte/gateway/c/core/oai/include/s1ap_types.hpp"
31-
3229
#ifdef __cplusplus
3330
extern "C" {
3431
#endif
@@ -44,6 +41,10 @@ extern "C" {
4441
#ifdef __cplusplus
4542
}
4643
#endif
44+
45+
#include "lte/gateway/c/core/oai/include/s1ap_state.hpp"
46+
#include "lte/gateway/c/core/oai/include/s1ap_types.hpp"
47+
4748
extern bool hss_associated;
4849

4950
namespace magma {
@@ -59,15 +60,15 @@ enb_description_t* s1ap_new_enb(void);
5960
* \param enb_ue_s1ap_id ue ID over S1AP
6061
* @returns Reference to the new UE element in list
6162
**/
62-
magma::lte::oai::UeDescription* s1ap_new_ue(s1ap_state_t* state,
63+
oai::UeDescription* s1ap_new_ue(s1ap_state_t* state,
6364
sctp_assoc_id_t sctp_assoc_id,
6465
enb_ue_s1ap_id_t enb_ue_s1ap_id);
6566

6667
/** \brief Remove target UE from the list
6768
* \param ue_ref UE structure reference to remove
6869
**/
6970
void s1ap_remove_ue(s1ap_state_t* state,
70-
magma::lte::oai::UeDescription* ue_ref);
71+
oai::UeDescription* ue_ref);
7172

7273
/** \brief Remove target eNB from the list and remove any UE associated
7374
* \param enb_ref eNB structure reference to remove

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_handlers.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ status_code_e s1ap_mme_handle_initial_context_setup_response(
10151015
} else {
10161016
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
10171017
}
1018-
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
1018+
ue_ref_p->set_s1ap_ue_state(oai::S1AP_UE_CONNECTED);
10191019
message_p = DEPRECATEDitti_alloc_new_message_fatal(
10201020
TASK_S1AP, MME_APP_INITIAL_CONTEXT_SETUP_RSP);
10211021
MME_APP_INITIAL_CONTEXT_SETUP_RSP(message_p).ue_id =
@@ -1406,7 +1406,7 @@ status_code_e s1ap_mme_generate_ue_context_release_command(
14061406
}
14071407
if (rc == RETURNok) {
14081408
// Start timer to track UE context release complete from eNB
1409-
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_WAITING_CRR);
1409+
ue_ref_p->set_s1ap_ue_state(oai::S1AP_UE_WAITING_CRR);
14101410
ue_ref_p->mutable_s1ap_ue_context_rel_timer()->set_id(s1ap_start_timer(
14111411
ue_ref_p->s1ap_ue_context_rel_timer().msec(), TIMER_REPEAT_ONCE,
14121412
handle_ue_context_rel_timer_expiry, mme_ue_s1ap_id));
@@ -1653,7 +1653,7 @@ status_code_e s1ap_mme_handle_ue_context_release_complete(
16531653
s1ap_imsi_map_t* imsi_map = get_s1ap_imsi_map();
16541654
imsi_map->mme_ueid2imsi_map.get(mme_ue_s1ap_id, &imsi64);
16551655

1656-
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_WAITING_CRR);
1656+
ue_ref_p->set_s1ap_ue_state(oai::S1AP_UE_WAITING_CRR);
16571657
// We can safely remove UE context now and stop timer
16581658
s1ap_mme_release_ue_context(state, ue_ref_p, imsi64);
16591659

@@ -2184,12 +2184,12 @@ status_code_e s1ap_mme_handle_handover_request_ack(
21842184
// if and when we receive the HANDOVER NOTIFY later in the procedure, so we
21852185
// need to keep track of this.
21862186
if (e_rab_list.no_of_items) {
2187-
magma::lte::oai::S1apHandoverState* handover_state =
2187+
oai::S1apHandoverState* handover_state =
21882188
ue_ref_p->mutable_s1ap_handover_state();
21892189
handover_state->mutable_e_rab_admitted_list()->set_no_of_items(
21902190
e_rab_list.no_of_items);
21912191
for (int idx = 0; idx < e_rab_list.no_of_items; idx++) {
2192-
magma::lte::oai::ERabAdmittedItem* e_rab_admitted_item =
2192+
oai::ERabAdmittedItem* e_rab_admitted_item =
21932193
handover_state->mutable_e_rab_admitted_list()->add_item();
21942194
e_rab_admitted_item->set_e_rab_id(e_rab_list.item[idx].e_rab_id);
21952195
e_rab_admitted_item->set_transport_layer_address(
@@ -2268,11 +2268,11 @@ status_code_e s1ap_mme_handle_handover_failure(s1ap_state_t* state,
22682268
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
22692269
}
22702270

2271-
if (ue_ref_p->s1ap_ue_state() == magma::lte::oai::S1AP_UE_HANDOVER) {
2271+
if (ue_ref_p->s1ap_ue_state() == oai::S1AP_UE_HANDOVER) {
22722272
// this effectively cancels the HandoverPreparation proecedure as we
22732273
// only send a HandoverCommand if the UE is in the S1AP_UE_HANDOVER
22742274
// state.
2275-
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
2275+
ue_ref_p->set_s1ap_ue_state(oai::S1AP_UE_CONNECTED);
22762276
ue_ref_p->mutable_s1ap_handover_state()->Clear();
22772277
} else {
22782278
// Not a failure, but nothing for us to do.
@@ -2422,11 +2422,11 @@ status_code_e s1ap_mme_handle_handover_cancel(s1ap_state_t* state,
24222422
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
24232423
}
24242424

2425-
if (ue_ref_p->s1ap_ue_state() == magma::lte::oai::S1AP_UE_HANDOVER) {
2425+
if (ue_ref_p->s1ap_ue_state() == oai::S1AP_UE_HANDOVER) {
24262426
// this effectively cancels the HandoverPreparation proecedure as we
24272427
// only send a HandoverCommand if the UE is in the S1AP_UE_HANDOVER
24282428
// state.
2429-
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
2429+
ue_ref_p->set_s1ap_ue_state(oai::S1AP_UE_CONNECTED);
24302430
/* Free all the transport layer address pointers in ERAB admitted list
24312431
* before actually resetting the S1AP handover state
24322432
*/
@@ -2979,7 +2979,7 @@ status_code_e s1ap_mme_handle_handover_command(
29792979
}
29802980

29812981
// we're doing handover, update the ue state
2982-
ue_ref_p->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_HANDOVER);
2982+
ue_ref_p->set_s1ap_ue_state(oai::S1AP_UE_HANDOVER);
29832983
ue_ref_p->mutable_s1ap_handover_state()->set_mme_ue_s1ap_id(
29842984
ho_command_p->mme_ue_s1ap_id);
29852985
ue_ref_p->mutable_s1ap_handover_state()->set_source_enb_id(
@@ -3170,7 +3170,7 @@ status_code_e s1ap_mme_handle_handover_notify(s1ap_state_t* state,
31703170
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
31713171
}
31723172
new_ue_ref_p->set_s1ap_ue_state(
3173-
magma::lte::oai::S1AP_UE_CONNECTED); // handover has completed
3173+
oai::S1AP_UE_CONNECTED); // handover has completed
31743174
new_ue_ref_p->set_enb_ue_s1ap_id(tgt_enb_ue_s1ap_id);
31753175
// Will be allocated by NAS
31763176
new_ue_ref_p->set_mme_ue_s1ap_id(mme_ue_s1ap_id);
@@ -3842,7 +3842,7 @@ void s1ap_mme_release_ue_context(s1ap_state_t* state,
38423842
message_p->ittiMsgHeader.imsi = imsi64;
38433843
send_msg_to_task(&s1ap_task_zmq_ctx, TASK_MME_APP, message_p);
38443844

3845-
if (!(ue_ref_p->s1ap_ue_state() == magma::lte::oai::S1AP_UE_WAITING_CRR)) {
3845+
if (!(ue_ref_p->s1ap_ue_state() == oai::S1AP_UE_WAITING_CRR)) {
38463846
OAILOG_ERROR(LOG_S1AP, "Incorrect S1AP UE state\n");
38473847
}
38483848
OAILOG_DEBUG_UE(LOG_S1AP, imsi64, "Removed S1AP UE " MME_UE_S1AP_ID_FMT "\n",

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_handlers.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ status_code_e s1ap_mme_handle_erab_setup_failure(s1ap_state_t* state,
158158
S1ap_S1AP_PDU_t* message);
159159

160160
void s1ap_mme_release_ue_context(s1ap_state_t* state,
161-
magma::lte::oai::UeDescription* ue_ref_p,
161+
oai::UeDescription* ue_ref_p,
162162
imsi64_t imsi64);
163163

164164
status_code_e s1ap_mme_handle_error_ind_message(s1ap_state_t* state,
@@ -213,20 +213,20 @@ void s1ap_mme_generate_erab_modification_confirm(
213213
s1ap_state_t* state, const itti_s1ap_e_rab_modification_cnf_t* const conf);
214214

215215
status_code_e s1ap_mme_generate_ue_context_release_command(
216-
s1ap_state_t* state, magma::lte::oai::UeDescription* ue_ref_p, enum s1cause,
216+
s1ap_state_t* state, oai::UeDescription* ue_ref_p, enum s1cause,
217217
imsi64_t imsi64, sctp_assoc_id_t assoc_id, sctp_stream_id_t stream,
218218
mme_ue_s1ap_id_t mme_ue_s1ap_id, enb_ue_s1ap_id_t enb_ue_s1ap_id);
219219

220220
status_code_e s1ap_mme_generate_ue_context_modification(
221-
magma::lte::oai::UeDescription* ue_ref_p,
221+
oai::UeDescription* ue_ref_p,
222222
const itti_s1ap_ue_context_mod_req_t* const ue_context_mod_req_pP,
223223
imsi64_t imsi64);
224224

225225
status_code_e s1ap_mme_remove_stale_ue_context(enb_ue_s1ap_id_t enb_ue_s1ap_id,
226226
uint32_t enb_id);
227227

228228
status_code_e s1ap_send_mme_ue_context_release(
229-
s1ap_state_t* state, magma::lte::oai::UeDescription* ue_ref_p,
229+
s1ap_state_t* state, oai::UeDescription* ue_ref_p,
230230
enum s1cause s1_release_cause, S1ap_Cause_t ie_cause, imsi64_t imsi64);
231231

232232
} // namespace lte

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_itti_messaging.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ status_code_e s1ap_mme_itti_s1ap_handover_request_ack(
371371

372372
status_code_e s1ap_mme_itti_s1ap_handover_notify(
373373
const mme_ue_s1ap_id_t mme_ue_s1ap_id,
374-
const magma::lte::oai::S1apHandoverState handover_state,
374+
const oai::S1apHandoverState handover_state,
375375
const enb_ue_s1ap_id_t target_enb_ue_s1ap_id,
376376
const sctp_assoc_id_t target_sctp_assoc_id, const ecgi_t ecgi,
377377
imsi64_t imsi64) {
@@ -393,7 +393,7 @@ status_code_e s1ap_mme_itti_s1ap_handover_notify(
393393
e_rab_admitted_list->no_of_items =
394394
handover_state.e_rab_admitted_list().no_of_items();
395395
for (int idx = 0; idx < e_rab_admitted_list->no_of_items; idx++) {
396-
const magma::lte ::oai ::ERabAdmittedItem& proto_e_rab_item =
396+
const oai::ERabAdmittedItem& proto_e_rab_item =
397397
handover_state.e_rab_admitted_list().item(idx);
398398
e_rab_admitted_list->item[idx].e_rab_id = proto_e_rab_item.e_rab_id();
399399
e_rab_admitted_list->item[idx].transport_layer_address =

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_itti_messaging.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ status_code_e s1ap_mme_itti_s1ap_handover_request_ack(
102102

103103
status_code_e s1ap_mme_itti_s1ap_handover_notify(
104104
const mme_ue_s1ap_id_t mme_ue_s1ap_id,
105-
const magma::lte::oai::S1apHandoverState handover_state,
105+
const oai::S1apHandoverState handover_state,
106106
const enb_ue_s1ap_id_t target_ue_s1ap_id,
107107
const sctp_assoc_id_t target_sctp_assoc_id, const ecgi_t ecgi,
108108
imsi64_t imsi64);

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_nas_procedures.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ status_code_e s1ap_mme_handle_initial_ue_message(s1ap_state_t* state,
162162

163163
OAILOG_DEBUG(LOG_S1AP, "Creating new UE Ref on S1ap");
164164

165-
ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_WAITING_CSR);
165+
ue_ref->set_s1ap_ue_state(oai::S1AP_UE_WAITING_CSR);
166166

167167
ue_ref->set_enb_ue_s1ap_id(enb_ue_s1ap_id);
168168
// Will be allocated by NAS
@@ -349,7 +349,7 @@ status_code_e s1ap_mme_handle_uplink_nas_transport(
349349
}
350350
}
351351

352-
if (ue_ref->s1ap_ue_state() != magma::lte::oai::S1AP_UE_CONNECTED) {
352+
if (ue_ref->s1ap_ue_state() != oai::S1AP_UE_CONNECTED) {
353353
OAILOG_WARNING(LOG_S1AP,
354354
"Received S1AP UPLINK_NAS_TRANSPORT while UE in state != "
355355
"S1AP_UE_CONNECTED\n");
@@ -458,7 +458,7 @@ status_code_e s1ap_mme_handle_nas_non_delivery(s1ap_state_t* state,
458458
s1ap_imsi_map_t* imsi_map = get_s1ap_imsi_map();
459459
imsi_map->mme_ueid2imsi_map.get(mme_ue_s1ap_id, &imsi64);
460460

461-
if (ue_ref->s1ap_ue_state() != magma::lte::oai::S1AP_UE_CONNECTED) {
461+
if (ue_ref->s1ap_ue_state() != oai::S1AP_UE_CONNECTED) {
462462
OAILOG_DEBUG_UE(
463463
LOG_S1AP, imsi64,
464464
"Received S1AP NAS_NON_DELIVERY_INDICATION while UE in state != "
@@ -538,14 +538,14 @@ status_code_e s1ap_generate_downlink_nas_transport(
538538

539539
out = &pdu.choice.initiatingMessage.value.choice.DownlinkNASTransport;
540540

541-
if (ue_ref->s1ap_ue_state() == magma::lte::oai::S1AP_UE_WAITING_CRR) {
541+
if (ue_ref->s1ap_ue_state() == oai::S1AP_UE_WAITING_CRR) {
542542
OAILOG_ERROR_UE(
543543
LOG_S1AP, imsi64,
544544
"Already triggered UE Context Release Command and UE is"
545545
"in S1AP_UE_WAITING_CRR, so dropping the DownlinkNASTransport \n");
546546
OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
547547
} else {
548-
ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
548+
ue_ref->set_s1ap_ue_state(oai::S1AP_UE_CONNECTED);
549549
}
550550
/*
551551
* Setting UE informations with the ones found in ue_ref
@@ -652,7 +652,7 @@ status_code_e s1ap_generate_s1ap_e_rab_setup_req(
652652
pdu.choice.initiatingMessage.value.present =
653653
S1ap_InitiatingMessage__value_PR_E_RABSetupRequest;
654654
out = &pdu.choice.initiatingMessage.value.choice.E_RABSetupRequest;
655-
ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
655+
ue_ref->set_s1ap_ue_state(oai::S1AP_UE_CONNECTED);
656656
/*
657657
* Setting UE information with the ones found in ue_ref
658658
*/
@@ -1299,7 +1299,7 @@ status_code_e s1ap_generate_s1ap_e_rab_rel_cmd(
12991299
ie->value.present = S1ap_E_RABReleaseCommandIEs__value_PR_ENB_UE_S1AP_ID;
13001300
ie->value.choice.ENB_UE_S1AP_ID = ue_ref->enb_ue_s1ap_id();
13011301
ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
1302-
ue_ref->set_s1ap_ue_state(magma::lte::oai::S1AP_UE_CONNECTED);
1302+
ue_ref->set_s1ap_ue_state(oai::S1AP_UE_CONNECTED);
13031303

13041304
ie = (S1ap_E_RABReleaseCommandIEs_t*)calloc(
13051305
1, sizeof(S1ap_E_RABReleaseCommandIEs_t));

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_state.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ s1ap_imsi_map_t* get_s1ap_imsi_map() {
114114
}
115115

116116
bool s1ap_ue_compare_by_mme_ue_id_cb(__attribute__((unused)) uint64_t keyP,
117-
magma::lte::oai::UeDescription* elementP,
117+
oai::UeDescription* elementP,
118118
void* parameterP, void** resultP) {
119119
mme_ue_s1ap_id_t* mme_ue_s1ap_id_p = (mme_ue_s1ap_id_t*)parameterP;
120120
oai::UeDescription* ue_ref = (oai::UeDescription*)elementP;
@@ -129,8 +129,8 @@ bool s1ap_ue_compare_by_mme_ue_id_cb(__attribute__((unused)) uint64_t keyP,
129129
}
130130

131131
bool s1ap_ue_compare_by_imsi(__attribute__((unused)) uint64_t keyP,
132-
magma::lte::oai::UeDescription* elementP,
133-
void* parameterP, void** resultP) {
132+
oai::UeDescription* elementP, void* parameterP,
133+
void** resultP) {
134134
imsi64_t imsi64 = INVALID_IMSI64;
135135
imsi64_t* target_imsi64 = (imsi64_t*)parameterP;
136136
oai::UeDescription* ue_ref = (oai::UeDescription*)elementP;

‎lte/gateway/c/core/oai/tasks/s1ap/s1ap_state_converter.cpp‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,20 @@
1717
*/
1818
#include "lte/gateway/c/core/oai/tasks/s1ap/s1ap_state_converter.hpp"
1919

20-
using magma::lte::oai::EnbDescription;
21-
using magma::lte::oai::S1apState;
22-
using magma::lte::oai::UeDescription;
23-
2420
namespace magma {
2521
namespace lte {
2622

2723
S1apStateConverter::~S1apStateConverter() = default;
2824
S1apStateConverter::S1apStateConverter() = default;
2925

30-
void S1apStateConverter::state_to_proto(s1ap_state_t* state, S1apState* proto) {
26+
void S1apStateConverter::state_to_proto(s1ap_state_t* state,
27+
oai::S1apState* proto) {
3128
proto->Clear();
3229

3330
// copy over enbs
3431
state_map_to_proto<map_uint32_enb_description_t, enb_description_t,
35-
EnbDescription>(state->enbs, proto->mutable_enbs(),
36-
enb_to_proto, LOG_S1AP);
32+
oai::EnbDescription>(state->enbs, proto->mutable_enbs(),
33+
enb_to_proto, LOG_S1AP);
3734

3835
// copy over mmeid2associd
3936
mme_ue_s1ap_id_t mmeid;
@@ -56,9 +53,9 @@ void S1apStateConverter::state_to_proto(s1ap_state_t* state, S1apState* proto) {
5653
proto->set_num_enbs(state->num_enbs);
5754
}
5855

59-
void S1apStateConverter::proto_to_state(const S1apState& proto,
56+
void S1apStateConverter::proto_to_state(const oai::S1apState& proto,
6057
s1ap_state_t* state) {
61-
proto_to_state_map<map_uint32_enb_description_t, EnbDescription,
58+
proto_to_state_map<map_uint32_enb_description_t, oai::EnbDescription,
6259
enb_description_t>(proto.enbs(), state->enbs, proto_to_enb,
6360
LOG_S1AP);
6461

0 commit comments

Comments
 (0)