Commit ece642c2 authored by Tien Thinh NGUYEN's avatar Tien Thinh NGUYEN

Code cleanup

parent 82ec6526
...@@ -55,7 +55,7 @@ void ResetType::setResetType( ...@@ -55,7 +55,7 @@ void ResetType::setResetType(
partOfNG_Interface = (UEAssociatedLogicalNGConnectionList*) calloc( partOfNG_Interface = (UEAssociatedLogicalNGConnectionList*) calloc(
1, sizeof(UEAssociatedLogicalNGConnectionList)); 1, sizeof(UEAssociatedLogicalNGConnectionList));
} }
partOfNG_Interface->setUEAssociatedLogicalNGConnectionItem(list); partOfNG_Interface->set(list);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
...@@ -108,14 +108,14 @@ void ResetType::setUE_associatedLogicalNG_connectionList( ...@@ -108,14 +108,14 @@ void ResetType::setUE_associatedLogicalNG_connectionList(
if (!partOfNG_Interface) { if (!partOfNG_Interface) {
partOfNG_Interface = new UEAssociatedLogicalNGConnectionList(); partOfNG_Interface = new UEAssociatedLogicalNGConnectionList();
} }
partOfNG_Interface->setUEAssociatedLogicalNGConnectionItem(list); partOfNG_Interface->set(list);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void ResetType::getUE_associatedLogicalNG_connectionList( void ResetType::getUE_associatedLogicalNG_connectionList(
std::vector<UEAssociatedLogicalNGConnectionItem>& list) { std::vector<UEAssociatedLogicalNGConnectionItem>& list) {
if (partOfNG_Interface) { if (partOfNG_Interface) {
partOfNG_Interface->getUEAssociatedLogicalNGConnectionItem(list); partOfNG_Interface->get(list);
} }
} }
......
...@@ -30,67 +30,39 @@ using namespace std; ...@@ -30,67 +30,39 @@ using namespace std;
namespace ngap { namespace ngap {
UEAssociatedLogicalNGConnectionList::UEAssociatedLogicalNGConnectionList() { UEAssociatedLogicalNGConnectionList::UEAssociatedLogicalNGConnectionList() {}
ueAssociatedLogicalNGConnectionItem = nullptr;
number_of_items = 0;
}
UEAssociatedLogicalNGConnectionList::~UEAssociatedLogicalNGConnectionList() {
if (ueAssociatedLogicalNGConnectionItem)
delete[] ueAssociatedLogicalNGConnectionItem;
}
//------------------------------------------------------------------------------
void UEAssociatedLogicalNGConnectionList::
setUEAssociatedLogicalNGConnectionItem(
UEAssociatedLogicalNGConnectionItem*
m_UEAssociatedLogicalNGConnectionItem,
int num) {
ueAssociatedLogicalNGConnectionItem = m_UEAssociatedLogicalNGConnectionItem;
number_of_items = num;
}
UEAssociatedLogicalNGConnectionList::~UEAssociatedLogicalNGConnectionList() {}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void UEAssociatedLogicalNGConnectionList:: void UEAssociatedLogicalNGConnectionList::set(
getUEAssociatedLogicalNGConnectionItem( std::vector<UEAssociatedLogicalNGConnectionItem>& list) {
UEAssociatedLogicalNGConnectionItem*& list_ = list;
m_UEAssociatedLogicalNGConnectionItem, return;
int& num) {
m_UEAssociatedLogicalNGConnectionItem = ueAssociatedLogicalNGConnectionItem;
num = number_of_items;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void UEAssociatedLogicalNGConnectionList:: void UEAssociatedLogicalNGConnectionList::get(
setUEAssociatedLogicalNGConnectionItem(
std::vector<UEAssociatedLogicalNGConnectionItem>& list) { std::vector<UEAssociatedLogicalNGConnectionItem>& list) {
number_of_items = list.size(); list = list_;
ueAssociatedLogicalNGConnectionItem =
new UEAssociatedLogicalNGConnectionItem[number_of_items]();
for (int i = 0; i < number_of_items; i++) {
ueAssociatedLogicalNGConnectionItem[i].set(list[i]);
}
return;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void UEAssociatedLogicalNGConnectionList:: void UEAssociatedLogicalNGConnectionList::addItem(
getUEAssociatedLogicalNGConnectionItem( UEAssociatedLogicalNGConnectionItem& item) {
std::vector<UEAssociatedLogicalNGConnectionItem>& list) { list_.push_back(item);
for (int i = 0; i < number_of_items; i++) {
list.push_back(ueAssociatedLogicalNGConnectionItem[i]);
}
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
bool UEAssociatedLogicalNGConnectionList::encode( bool UEAssociatedLogicalNGConnectionList::encode(
Ngap_UE_associatedLogicalNG_connectionList_t* Ngap_UE_associatedLogicalNG_connectionList_t*
ue_associatedLogicalNG_connectionList) { ue_associatedLogicalNG_connectionList) {
for (int i = 0; i < number_of_items; i++) { for (auto l : list_) {
Ngap_UE_associatedLogicalNG_connectionItem_t* item = Ngap_UE_associatedLogicalNG_connectionItem_t* item =
(Ngap_UE_associatedLogicalNG_connectionItem_t*) calloc( (Ngap_UE_associatedLogicalNG_connectionItem_t*) calloc(
1, sizeof(Ngap_UE_associatedLogicalNG_connectionItem_t)); 1, sizeof(Ngap_UE_associatedLogicalNG_connectionItem_t));
if (!item) return false; if (!item) return false;
if (!ueAssociatedLogicalNGConnectionItem[i].encode(*item)) return false; if (!l.encode(*item)) return false;
// if (!ueAssociatedLogicalNGConnectionItem[i].encode(*item)) return false;
if (ASN_SEQUENCE_ADD(&ue_associatedLogicalNG_connectionList->list, item) != if (ASN_SEQUENCE_ADD(&ue_associatedLogicalNG_connectionList->list, item) !=
0) 0)
return false; return false;
...@@ -102,13 +74,12 @@ bool UEAssociatedLogicalNGConnectionList::encode( ...@@ -102,13 +74,12 @@ bool UEAssociatedLogicalNGConnectionList::encode(
bool UEAssociatedLogicalNGConnectionList::decode( bool UEAssociatedLogicalNGConnectionList::decode(
Ngap_UE_associatedLogicalNG_connectionList_t* Ngap_UE_associatedLogicalNG_connectionList_t*
ue_associatedLogicalNG_connectionList) { ue_associatedLogicalNG_connectionList) {
number_of_items = ue_associatedLogicalNG_connectionList->list.count; list_.clear();
ueAssociatedLogicalNGConnectionItem = for (int i = 0; i < ue_associatedLogicalNG_connectionList->list.count; i++) {
new UEAssociatedLogicalNGConnectionItem[number_of_items](); UEAssociatedLogicalNGConnectionItem item = {};
for (int i = 0; i < number_of_items; i++) { if (!item.decode(ue_associatedLogicalNG_connectionList->list.array[i]))
if (!ueAssociatedLogicalNGConnectionItem[i].decode(
ue_associatedLogicalNG_connectionList->list.array[i]))
return false; return false;
list_.push_back(item);
} }
return true; return true;
} }
......
...@@ -66,7 +66,7 @@ bool UEAssociatedLogicalNGConnectionItem::getAmfUeNgapId(uint64_t& id) { ...@@ -66,7 +66,7 @@ bool UEAssociatedLogicalNGConnectionItem::getAmfUeNgapId(uint64_t& id) {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void UEAssociatedLogicalNGConnectionItem::setRanUeNgapId( void UEAssociatedLogicalNGConnectionItem::setRanUeNgapId(
uint32_t ran_ue_ngap_id) { const uint32_t& ran_ue_ngap_id) {
ran_ue_ngap_id_ = std::make_optional<RAN_UE_NGAP_ID>(ran_ue_ngap_id); ran_ue_ngap_id_ = std::make_optional<RAN_UE_NGAP_ID>(ran_ue_ngap_id);
Ngap_DownlinkNASTransport_IEs_t* ie = Ngap_DownlinkNASTransport_IEs_t* ie =
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
#ifndef _UE_ASSOCIATION_LOGICAL_NG_CONNECTION_ITEM_H_ #ifndef _UE_ASSOCIATED_LOGICAL_NG_CONNECTION_ITEM_H_
#define _UE_ASSOCIATION_LOGICAL_NG_CONNECTION_ITEM_H_ #define _UE_ASSOCIATED_LOGICAL_NG_CONNECTION_ITEM_H_
#include "AMF-UE-NGAP-ID.hpp" #include "AMF-UE-NGAP-ID.hpp"
#include "RAN-UE-NGAP-ID.hpp" #include "RAN-UE-NGAP-ID.hpp"
...@@ -41,16 +41,14 @@ class UEAssociatedLogicalNGConnectionItem { ...@@ -41,16 +41,14 @@ class UEAssociatedLogicalNGConnectionItem {
bool setAmfUeNgapId(const uint64_t& id); bool setAmfUeNgapId(const uint64_t& id);
bool getAmfUeNgapId(uint64_t& id); bool getAmfUeNgapId(uint64_t& id);
void setRanUeNgapId(uint32_t id); void setRanUeNgapId(const uint32_t& id);
bool getRanUeNgapId(uint32_t& id); bool getRanUeNgapId(uint32_t& id);
void set(UEAssociatedLogicalNGConnectionItem& item); void set(UEAssociatedLogicalNGConnectionItem& item);
bool encode(Ngap_UE_associatedLogicalNG_connectionItem_t& item); bool encode(Ngap_UE_associatedLogicalNG_connectionItem_t& item);
bool encode(Ngap_UE_associatedLogicalNG_connectionItem_t* item); bool encode(Ngap_UE_associatedLogicalNG_connectionItem_t* item);
// bool encode(UEAssociatedLogicalNGConnectionItem& item);
bool decode(Ngap_UE_associatedLogicalNG_connectionItem_t* item); bool decode(Ngap_UE_associatedLogicalNG_connectionItem_t* item);
// bool decode(UEAssociatedLogicalNGConnectionItem& item);
private: private:
std::optional<AMF_UE_NGAP_ID> amf_ue_ngap_id_; // Optional std::optional<AMF_UE_NGAP_ID> amf_ue_ngap_id_; // Optional
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
#ifndef _UE_ASSOCIATION_LOGICAL_NG_CONNECTION_LIST_H_ #ifndef _UE_ASSOCIATED_LOGICAL_NG_CONNECTION_LIST_H_
#define _UE_ASSOCIATION_LOGICAL_NG_CONNECTION_LIST_H_ #define _UE_ASSOCIATED_LOGICAL_NG_CONNECTION_LIST_H_
#include "UEAssociatedLogicalNGConnectionItem.hpp" #include "UEAssociatedLogicalNGConnectionItem.hpp"
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
extern "C" { extern "C" {
#include "Ngap_ProtocolIE-Field.h" #include "Ngap_ProtocolIE-Field.h"
#include "Ngap_UE-associatedLogicalNG-connectionItem.h" //#include "Ngap_UE-associatedLogicalNG-connectionItem.h"
#include "Ngap_UE-associatedLogicalNG-connectionList.h" #include "Ngap_UE-associatedLogicalNG-connectionList.h"
} }
...@@ -39,19 +39,10 @@ class UEAssociatedLogicalNGConnectionList { ...@@ -39,19 +39,10 @@ class UEAssociatedLogicalNGConnectionList {
UEAssociatedLogicalNGConnectionList(); UEAssociatedLogicalNGConnectionList();
virtual ~UEAssociatedLogicalNGConnectionList(); virtual ~UEAssociatedLogicalNGConnectionList();
void setUEAssociatedLogicalNGConnectionItem( void set(std::vector<UEAssociatedLogicalNGConnectionItem>& list);
UEAssociatedLogicalNGConnectionItem* void get(std::vector<UEAssociatedLogicalNGConnectionItem>& list);
m_UEAssociatedLogicalNGConnectionItem,
int num);
void getUEAssociatedLogicalNGConnectionItem(
UEAssociatedLogicalNGConnectionItem*&
m_UEAssociatedLogicalNGConnectionItem,
int& num);
void setUEAssociatedLogicalNGConnectionItem( void addItem(UEAssociatedLogicalNGConnectionItem& item);
std::vector<UEAssociatedLogicalNGConnectionItem>& list);
void getUEAssociatedLogicalNGConnectionItem(
std::vector<UEAssociatedLogicalNGConnectionItem>& list);
bool encode(Ngap_UE_associatedLogicalNG_connectionList_t* bool encode(Ngap_UE_associatedLogicalNG_connectionList_t*
ue_associatedLogicalNG_connectionList); ue_associatedLogicalNG_connectionList);
...@@ -59,8 +50,7 @@ class UEAssociatedLogicalNGConnectionList { ...@@ -59,8 +50,7 @@ class UEAssociatedLogicalNGConnectionList {
ue_associatedLogicalNG_connectionList); ue_associatedLogicalNG_connectionList);
private: private:
UEAssociatedLogicalNGConnectionItem* ueAssociatedLogicalNGConnectionItem; std::vector<UEAssociatedLogicalNGConnectionItem> list_;
int number_of_items;
}; };
} // namespace ngap } // namespace ngap
......
...@@ -59,8 +59,7 @@ void NGResetAckMsg::setUE_associatedLogicalNG_connectionList( ...@@ -59,8 +59,7 @@ void NGResetAckMsg::setUE_associatedLogicalNG_connectionList(
(UEAssociatedLogicalNGConnectionList*) calloc( (UEAssociatedLogicalNGConnectionList*) calloc(
1, sizeof(UEAssociatedLogicalNGConnectionList)); 1, sizeof(UEAssociatedLogicalNGConnectionList));
} }
ueAssociatedLogicalNGConnectionList->setUEAssociatedLogicalNGConnectionItem( ueAssociatedLogicalNGConnectionList->set(list);
list);
addUE_associatedLogicalNG_connectionList(); addUE_associatedLogicalNG_connectionList();
} }
...@@ -68,8 +67,7 @@ void NGResetAckMsg::setUE_associatedLogicalNG_connectionList( ...@@ -68,8 +67,7 @@ void NGResetAckMsg::setUE_associatedLogicalNG_connectionList(
void NGResetAckMsg::getUE_associatedLogicalNG_connectionList( void NGResetAckMsg::getUE_associatedLogicalNG_connectionList(
std::vector<UEAssociatedLogicalNGConnectionItem>& list) { std::vector<UEAssociatedLogicalNGConnectionItem>& list) {
if (ueAssociatedLogicalNGConnectionList) { if (ueAssociatedLogicalNGConnectionList) {
ueAssociatedLogicalNGConnectionList->getUEAssociatedLogicalNGConnectionItem( ueAssociatedLogicalNGConnectionList->get(list);
list);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment