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
30cbc8e7
Commit
30cbc8e7
authored
Feb 20, 2021
by
aligungr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UE executable refactor
parent
7dfe3b0c
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
94 additions
and
6 deletions
+94
-6
src/app/ue_ctl.cpp
src/app/ue_ctl.cpp
+9
-0
src/app/ue_ctl.hpp
src/app/ue_ctl.hpp
+20
-0
src/ue.cpp
src/ue.cpp
+15
-1
src/ue/app/cmd_handler.cpp
src/ue/app/cmd_handler.cpp
+4
-1
src/ue/app/task.cpp
src/ue/app/task.cpp
+23
-0
src/ue/mm/dereg.cpp
src/ue/mm/dereg.cpp
+4
-1
src/ue/nts.hpp
src/ue/nts.hpp
+12
-0
src/ue/types.hpp
src/ue/types.hpp
+2
-0
src/ue/ue.cpp
src/ue/ue.cpp
+2
-1
src/ue/ue.hpp
src/ue/ue.hpp
+1
-1
src/utils/nts.hpp
src/utils/nts.hpp
+2
-1
No files found.
src/app/ue_ctl.cpp
0 → 100644
View file @
30cbc8e7
//
// This file is a part of UERANSIM open source project.
// Copyright (c) 2021 ALİ GÜNGÖR.
//
// The software and all associated files are licensed under GPL-3.0
// and subject to the terms and conditions defined in LICENSE file.
//
#include "ue_ctl.hpp"
src/app/ue_ctl.hpp
0 → 100644
View file @
30cbc8e7
//
// This file is a part of UERANSIM open source project.
// Copyright (c) 2021 ALİ GÜNGÖR.
//
// The software and all associated files are licensed under GPL-3.0
// and subject to the terms and conditions defined in LICENSE file.
//
#pragma once
namespace
app
{
class
IUeController
{
public:
virtual
void
performSwitchOff
()
=
0
;
};
}
// namespace app
src/ue.cpp
View file @
30cbc8e7
...
...
@@ -10,6 +10,7 @@
#include <app/cli_base.hpp>
#include <app/cli_cmd.hpp>
#include <app/proc_table.hpp>
#include <app/ue_ctl.hpp>
#include <iostream>
#include <ue/ue.hpp>
#include <unistd.h>
...
...
@@ -324,6 +325,19 @@ static void Loop()
ReceiveCommand
(
msg
);
}
class
UeController
:
public
app
::
IUeController
{
public:
void
performSwitchOff
()
override
{
// todo ue' için ptr çek
// o ptru delete et
// mapten sil
// map boşaldıysa exit yap
// tabi bunları switc off olan appin kendi threadin yapıyoz o yüzden burası atomic değil dikkat!!
}
}
g_ueController
;
int
main
(
int
argc
,
char
**
argv
)
{
app
::
Initialize
();
...
...
@@ -346,7 +360,7 @@ int main(int argc, char **argv)
for
(
int
i
=
0
;
i
<
g_options
.
count
;
i
++
)
{
auto
*
config
=
GetConfigByUe
(
i
);
auto
*
ue
=
new
nr
::
ue
::
UserEquipment
(
config
,
nullptr
);
auto
*
ue
=
new
nr
::
ue
::
UserEquipment
(
config
,
&
g_ueController
,
nullptr
);
g_ueMap
[
config
->
getNodeName
()]
=
ue
;
}
...
...
src/ue/app/cmd_handler.cpp
View file @
30cbc8e7
...
...
@@ -119,7 +119,10 @@ void UeCmdHandler::HandleCmdImpl(TaskBase &base, NwUeCliCommand &msg)
base
.
nasTask
->
mm
->
sendDeregistration
(
msg
.
cmd
->
isSwitchOff
?
nas
::
ESwitchOff
::
SWITCH_OFF
:
nas
::
ESwitchOff
::
NORMAL_DE_REGISTRATION
,
msg
.
cmd
->
dueToDisable5g
);
msg
.
sendResult
(
"De-registration procedure triggered"
);
if
(
!
msg
.
cmd
->
isSwitchOff
)
msg
.
sendResult
(
"De-registration procedure triggered"
);
else
msg
.
sendResult
(
"De-registration procedure triggered. UE device will be switched off."
);
break
;
}
}
...
...
src/ue/app/task.cpp
View file @
30cbc8e7
...
...
@@ -14,6 +14,9 @@
#include <utils/common.hpp>
#include <utils/constants.hpp>
static
constexpr
const
int
SWITCH_OFF_TIMER_ID
=
1
;
static
constexpr
const
int
SWITCH_OFF_DELAY
=
500
;
namespace
nr
::
ue
{
...
...
@@ -83,6 +86,17 @@ void UeAppTask::onLoop()
}
break
;
}
case
NtsMessageType
:
:
UE_NAS_TO_APP
:
{
auto
*
w
=
dynamic_cast
<
NwUeNasToApp
*>
(
msg
);
switch
(
w
->
present
)
{
case
NwUeNasToApp
:
:
PERFORM_SWITCH_OFF
:
{
setTimer
(
SWITCH_OFF_TIMER_ID
,
SWITCH_OFF_DELAY
);
break
;
}
}
break
;
}
case
NtsMessageType
:
:
UE_STATUS_UPDATE
:
{
receiveStatusUpdate
(
*
dynamic_cast
<
NwUeStatusUpdate
*>
(
msg
));
break
;
...
...
@@ -92,6 +106,15 @@ void UeAppTask::onLoop()
UeCmdHandler
::
HandleCmd
(
*
m_base
,
*
w
);
break
;
}
case
NtsMessageType
:
:
TIMER_EXPIRED
:
{
auto
*
w
=
dynamic_cast
<
NwTimerExpired
*>
(
msg
);
if
(
w
->
timerId
==
SWITCH_OFF_TIMER_ID
)
{
m_logger
->
info
(
"UE device is switching off"
);
m_base
->
ueController
->
performSwitchOff
();
}
break
;
}
default:
m_logger
->
unhandledNts
(
msg
);
break
;
...
...
src/ue/mm/dereg.cpp
View file @
30cbc8e7
...
...
@@ -8,6 +8,7 @@
#include "mm.hpp"
#include <nas/utils.hpp>
#include <ue/app/task.hpp>
#include <ue/sm/sm.hpp>
namespace
nr
::
ue
...
...
@@ -56,7 +57,9 @@ void NasMm::sendDeregistration(nas::ESwitchOff switchOff, bool dueToDisable5g)
switchMmState
(
EMmState
::
MM_DEREGISTERED_INITIATED
,
EMmSubState
::
MM_DEREGISTERED_INITIATED_NA
);
// TODO local release of all PDU sessions
// TODO: switch off the UE if it's switch off
if
(
switchOff
==
nas
::
ESwitchOff
::
SWITCH_OFF
)
m_base
->
appTask
->
push
(
new
NwUeNasToApp
(
NwUeNasToApp
::
PERFORM_SWITCH_OFF
));
}
void
NasMm
::
receiveDeregistrationAccept
(
const
nas
::
DeRegistrationAcceptUeOriginating
&
msg
)
...
...
src/ue/nts.hpp
View file @
30cbc8e7
...
...
@@ -224,6 +224,18 @@ struct NwUeNasToNas : NtsMessage
}
};
struct
NwUeNasToApp
:
NtsMessage
{
enum
PR
{
PERFORM_SWITCH_OFF
,
}
present
;
explicit
NwUeNasToApp
(
PR
present
)
:
NtsMessage
(
NtsMessageType
::
UE_NAS_TO_APP
),
present
(
present
)
{
}
};
struct
NwUeStatusUpdate
:
NtsMessage
{
static
constexpr
const
int
SESSION_ESTABLISHMENT
=
5
;
...
...
src/ue/types.hpp
View file @
30cbc8e7
...
...
@@ -9,6 +9,7 @@
#pragma once
#include <app/monitor.hpp>
#include <app/ue_ctl.hpp>
#include <nas/nas.hpp>
#include <nas/timer.hpp>
#include <utils/common_types.hpp>
...
...
@@ -98,6 +99,7 @@ struct TaskBase
{
UeConfig
*
config
{};
LogBase
*
logBase
{};
app
::
IUeController
*
ueController
{};
app
::
INodeListener
*
nodeListener
{};
UeAppTask
*
appTask
{};
...
...
src/ue/ue.cpp
View file @
30cbc8e7
...
...
@@ -16,11 +16,12 @@
namespace
nr
::
ue
{
UserEquipment
::
UserEquipment
(
UeConfig
*
config
,
app
::
INodeListener
*
nodeListener
)
UserEquipment
::
UserEquipment
(
UeConfig
*
config
,
app
::
I
UeController
*
ueController
,
app
::
I
NodeListener
*
nodeListener
)
{
auto
*
base
=
new
TaskBase
();
base
->
config
=
config
;
base
->
logBase
=
new
LogBase
(
"logs/ue-"
+
config
->
getNodeName
()
+
".log"
);
base
->
ueController
=
ueController
;
base
->
nodeListener
=
nodeListener
;
base
->
nasTask
=
new
NasTask
(
base
);
...
...
src/ue/ue.hpp
View file @
30cbc8e7
...
...
@@ -23,7 +23,7 @@ class UserEquipment
TaskBase
*
taskBase
;
public:
UserEquipment
(
UeConfig
*
config
,
app
::
INodeListener
*
nodeListener
);
UserEquipment
(
UeConfig
*
config
,
app
::
I
UeController
*
ueController
,
app
::
I
NodeListener
*
nodeListener
);
virtual
~
UserEquipment
();
public:
...
...
src/utils/nts.hpp
View file @
30cbc8e7
...
...
@@ -52,7 +52,8 @@ enum class NtsMessageType
UE_RRC_TO_NAS
,
UE_NAS_TO_RRC
,
UE_RRC_TO_MR
,
UE_NAS_TO_NAS
,
UE_NAS_TO_NAS
,
UE_NAS_TO_APP
,
};
struct
NtsMessage
...
...
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