Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
U
UERANSIM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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
Libraries
UERANSIM
Commits
6e675f65
Commit
6e675f65
authored
May 23, 2021
by
aligungr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
L3 RRC/NAS developments
parent
8a273192
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
23 deletions
+8
-23
src/ue/app/cmd_handler.cpp
src/ue/app/cmd_handler.cpp
+7
-5
src/ue/app/task.cpp
src/ue/app/task.cpp
+0
-16
src/ue/app/task.hpp
src/ue/app/task.hpp
+0
-1
src/ue/nas/sm/release.cpp
src/ue/nas/sm/release.cpp
+1
-1
No files found.
src/ue/app/cmd_handler.cpp
View file @
6e675f65
...
...
@@ -19,6 +19,7 @@
#define PAUSE_CONFIRM_TIMEOUT 3000
#define PAUSE_POLLING 10
// todo add coverage again to cli
static
std
::
string
SignalDescription
(
int
dbm
)
{
if
(
dbm
>
-
90
)
...
...
@@ -104,10 +105,11 @@ void UeCmdHandler::handleCmdImpl(NwUeCliCommand &msg)
switch
(
msg
.
cmd
->
present
)
{
case
app
:
:
UeCliCommand
::
STATUS
:
{
std
::
vector
<
Json
>
pduSessions
{};
for
(
auto
&
pduSession
:
m_base
->
appTask
->
m_pduSessions
)
if
(
pduSession
.
has_value
())
pduSessions
.
push_back
(
ToJson
(
*
pduSession
));
// TODO
//std::vector<Json> pduSessions{};
//for (auto &pduSession : m_base->appTask->m_pduSessions)
// if (pduSession.has_value())
// pduSessions.push_back(ToJson(*pduSession));
Json
json
=
Json
::
Obj
({
{
"cm-state"
,
ToJson
(
m_base
->
nasTask
->
mm
->
m_cmState
)},
...
...
@@ -118,7 +120,7 @@ void UeCmdHandler::handleCmdImpl(NwUeCliCommand &msg)
{
"stored-suci"
,
ToJson
(
m_base
->
nasTask
->
mm
->
m_storage
->
storedSuci
->
get
())},
{
"stored-guti"
,
ToJson
(
m_base
->
nasTask
->
mm
->
m_storage
->
storedGuti
->
get
())},
{
"has-emergency"
,
::
ToJson
(
m_base
->
nasTask
->
mm
->
hasEmergency
())},
{
"pdu-sessions"
,
Json
::
Arr
(
std
::
move
(
pduSessions
))},
//TODO
{"pdu-sessions", Json::Arr(std::move(pduSessions))},
});
sendResult
(
msg
.
address
,
json
.
dumpYaml
());
break
;
...
...
src/ue/app/task.cpp
View file @
6e675f65
...
...
@@ -129,17 +129,6 @@ void UeAppTask::receiveStatusUpdate(NwUeStatusUpdate &msg)
if
(
msg
.
what
==
NwUeStatusUpdate
::
SESSION_ESTABLISHMENT
)
{
auto
*
session
=
msg
.
pduSession
;
UePduSessionInfo
sessionInfo
{};
sessionInfo
.
psi
=
session
->
psi
;
sessionInfo
.
type
=
nas
::
utils
::
EnumToString
(
session
->
sessionType
);
if
(
session
->
pduAddress
.
has_value
())
sessionInfo
.
address
=
utils
::
OctetStringToIp
(
session
->
pduAddress
->
pduAddressInformation
);
sessionInfo
.
isEmergency
=
session
->
isEmergency
;
sessionInfo
.
uplinkPending
=
false
;
m_pduSessions
[
session
->
psi
]
=
std
::
move
(
sessionInfo
);
setupTunInterface
(
session
);
return
;
}
...
...
@@ -153,11 +142,6 @@ void UeAppTask::receiveStatusUpdate(NwUeStatusUpdate &msg)
m_tunTasks
[
msg
.
psi
]
=
nullptr
;
}
if
(
m_pduSessions
[
msg
.
psi
].
has_value
())
{
m_logger
->
info
(
"PDU session[%d] released"
,
msg
.
psi
);
m_pduSessions
[
msg
.
psi
]
=
{};
}
return
;
}
...
...
src/ue/app/task.hpp
View file @
6e675f65
...
...
@@ -27,7 +27,6 @@ class UeAppTask : public NtsTask
TaskBase
*
m_base
;
std
::
unique_ptr
<
Logger
>
m_logger
;
std
::
array
<
std
::
optional
<
UePduSessionInfo
>
,
16
>
m_pduSessions
{};
std
::
array
<
TunTask
*
,
16
>
m_tunTasks
{};
ECmState
m_cmState
{};
...
...
src/ue/nas/sm/release.cpp
View file @
6e675f65
...
...
@@ -150,7 +150,7 @@ void NasSm::receiveReleaseCommand(const nas::PduSessionReleaseCommand &msg)
}
/* Construct Release Complete message */
nas
::
PduSessionReleaseComplete
resp
{}
;
nas
::
PduSessionReleaseComplete
resp
;
resp
.
pduSessionId
=
psi
;
resp
.
pti
=
pti
;
...
...
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