Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-AMF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-AMF
Commits
ece642c2
Commit
ece642c2
authored
Aug 26, 2022
by
Tien Thinh NGUYEN
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code cleanup
parent
82ec6526
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
79 deletions
+36
-79
src/ngap/ngapIEs/ResetType.cpp
src/ngap/ngapIEs/ResetType.cpp
+3
-3
src/ngap/ngapIEs/UEAssociateLogicalNGConnectionList.cpp
src/ngap/ngapIEs/UEAssociateLogicalNGConnectionList.cpp
+20
-49
src/ngap/ngapIEs/UEAssociatedLogicalNGConnectionItem.cpp
src/ngap/ngapIEs/UEAssociatedLogicalNGConnectionItem.cpp
+1
-1
src/ngap/ngapIEs/UEAssociatedLogicalNGConnectionItem.hpp
src/ngap/ngapIEs/UEAssociatedLogicalNGConnectionItem.hpp
+3
-5
src/ngap/ngapIEs/UEAssociatedLogicalNGConnectionList.hpp
src/ngap/ngapIEs/UEAssociatedLogicalNGConnectionList.hpp
+7
-17
src/ngap/ngapMsgs/NGResetAck.cpp
src/ngap/ngapMsgs/NGResetAck.cpp
+2
-4
No files found.
src/ngap/ngapIEs/ResetType.cpp
View file @
ece642c2
...
@@ -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
->
set
UEAssociatedLogicalNGConnectionItem
(
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
->
set
UEAssociatedLogicalNGConnectionItem
(
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
->
get
UEAssociatedLogicalNGConnectionItem
(
list
);
partOfNG_Interface
->
get
(
list
);
}
}
}
}
...
...
src/ngap/ngapIEs/UEAssociateLogicalNGConnectionList.cpp
View file @
ece642c2
...
@@ -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
)
{
list
=
list_
;
number_of_items
=
list
.
size
();
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
;
}
}
...
...
src/ngap/ngapIEs/UEAssociatedLogicalNGConnectionItem.cpp
View file @
ece642c2
...
@@ -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
=
...
...
src/ngap/ngapIEs/UEAssociatedLogicalNGConnectionItem.hpp
View file @
ece642c2
...
@@ -19,8 +19,8 @@
...
@@ -19,8 +19,8 @@
* contact@openairinterface.org
* contact@openairinterface.org
*/
*/
#ifndef _UE_ASSOCIAT
ION
_LOGICAL_NG_CONNECTION_ITEM_H_
#ifndef _UE_ASSOCIAT
ED
_LOGICAL_NG_CONNECTION_ITEM_H_
#define _UE_ASSOCIAT
ION
_LOGICAL_NG_CONNECTION_ITEM_H_
#define _UE_ASSOCIAT
ED
_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
...
...
src/ngap/ngapIEs/UEAssociatedLogicalNGConnectionList.hpp
View file @
ece642c2
...
@@ -19,8 +19,8 @@
...
@@ -19,8 +19,8 @@
* contact@openairinterface.org
* contact@openairinterface.org
*/
*/
#ifndef _UE_ASSOCIAT
ION
_LOGICAL_NG_CONNECTION_LIST_H_
#ifndef _UE_ASSOCIAT
ED
_LOGICAL_NG_CONNECTION_LIST_H_
#define _UE_ASSOCIAT
ION
_LOGICAL_NG_CONNECTION_LIST_H_
#define _UE_ASSOCIAT
ED
_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
...
...
src/ngap/ngapMsgs/NGResetAck.cpp
View file @
ece642c2
...
@@ -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
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment