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
64684f25
Commit
64684f25
authored
Sep 21, 2022
by
KARIM
Browse files
Options
Browse Files
Download
Plain Diff
fix conflicts
parents
ee09cb41
cc787054
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
src/amf-app/amf_n1.cpp
src/amf-app/amf_n1.cpp
+5
-5
src/amf-app/amf_sbi.cpp
src/amf-app/amf_sbi.cpp
+3
-3
src/sbi/amf_server/model/AmfEventReport.cpp
src/sbi/amf_server/model/AmfEventReport.cpp
+3
-3
src/sbi/amf_server/model/AmfEventReport.h
src/sbi/amf_server/model/AmfEventReport.h
+3
-3
No files found.
src/amf-app/amf_n1.cpp
View file @
64684f25
...
@@ -3113,12 +3113,12 @@ void amf_n1::ue_initiate_de_registration_handle(
...
@@ -3113,12 +3113,12 @@ void amf_n1::ue_initiate_de_registration_handle(
event_sub
.
ue_loss_of_connectivity
(
event_sub
.
ue_loss_of_connectivity
(
supi
,
DEREGISTERED
,
1
,
ran_ue_ngap_id
,
amf_ue_ngap_id
);
supi
,
DEREGISTERED
,
1
,
ran_ue_ngap_id
,
amf_ue_ngap_id
);
// TODO: put once this scenario is implemented
// Trigger UE Loss of Connectivity Status Notify
// Trigger UE Loss of Connectivity Status Notify
Logger
::
amf_n1
().
debug
(
// Logger::amf_n1().debug(
"Signal the UE Loss of Connectivity Event notification for SUPI %s"
,
// "Signal the UE Loss of Connectivity Event notification for SUPI %s",
supi
.
c_str
());
// supi.c_str());
event_sub
.
ue_loss_of_connectivity
(
// event_sub.ue_loss_of_connectivity(supi, PURGED, 1, ran_ue_ngap_id, amf_ue_ngap_id);
supi
,
PURGED
,
1
,
ran_ue_ngap_id
,
amf_ue_ngap_id
);
if
(
nc
->
is_stacs_available
)
{
if
(
nc
->
is_stacs_available
)
{
stacs
.
update_5gmm_state
(
nc
->
imsi
,
"5GMM-DEREGISTERED"
);
stacs
.
update_5gmm_state
(
nc
->
imsi
,
"5GMM-DEREGISTERED"
);
...
...
src/amf-app/amf_sbi.cpp
View file @
64684f25
...
@@ -560,7 +560,7 @@ void amf_sbi::handle_itti_message(itti_sbi_notify_subscribed_event& itti_msg) {
...
@@ -560,7 +560,7 @@ void amf_sbi::handle_itti_message(itti_sbi_notify_subscribed_event& itti_msg) {
i
.
get_reports
(
event_reports
);
i
.
get_reports
(
event_reports
);
for
(
auto
r
:
event_reports
)
{
for
(
auto
r
:
event_reports
)
{
report
[
"type"
]
=
r
.
getType
().
get_value
();
report
[
"type"
]
=
r
.
getType
().
get_value
();
report
[
"state"
][
"active"
]
=
"TRUE"
;
report
[
"state"
][
"active"
]
=
true
;
// as boolean
if
(
r
.
supiIsSet
())
{
if
(
r
.
supiIsSet
())
{
report
[
"supi"
]
=
r
.
getSupi
();
report
[
"supi"
]
=
r
.
getSupi
();
}
}
...
@@ -592,8 +592,8 @@ void amf_sbi::handle_itti_message(itti_sbi_notify_subscribed_event& itti_msg) {
...
@@ -592,8 +592,8 @@ void amf_sbi::handle_itti_message(itti_sbi_notify_subscribed_event& itti_msg) {
// Timestamp
// Timestamp
std
::
time_t
time_epoch_ntp
=
std
::
time
(
nullptr
);
std
::
time_t
time_epoch_ntp
=
std
::
time
(
nullptr
);
uint64_t
tv_ntp
=
time_epoch_ntp
+
SECONDS_SINCE_FIRST_EPOCH
;
uint64_t
tv_ntp
=
time_epoch_ntp
;
// not needed:
+ SECONDS_SINCE_FIRST_EPOCH;
report
[
"timeStamp"
]
=
std
::
to_string
(
tv_ntp
);
report
[
"timeStamp"
]
=
tv_ntp
;
// don't convert to string, leave as int64
report_lists
.
push_back
(
report
);
report_lists
.
push_back
(
report
);
}
}
...
...
src/sbi/amf_server/model/AmfEventReport.cpp
View file @
64684f25
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
namespace
oai
::
amf
::
model
{
namespace
oai
::
amf
::
model
{
AmfEventReport
::
AmfEventReport
()
{
AmfEventReport
::
AmfEventReport
()
{
m_TimeStamp
=
""
;
m_TimeStamp
=
0
;
m_SubscriptionId
=
""
;
m_SubscriptionId
=
""
;
m_SubscriptionIdIsSet
=
false
;
m_SubscriptionIdIsSet
=
false
;
m_AnyUe
=
false
;
m_AnyUe
=
false
;
...
@@ -412,10 +412,10 @@ AmfEventState AmfEventReport::getState() const {
...
@@ -412,10 +412,10 @@ AmfEventState AmfEventReport::getState() const {
void
AmfEventReport
::
setState
(
AmfEventState
const
&
value
)
{
void
AmfEventReport
::
setState
(
AmfEventState
const
&
value
)
{
m_State
=
value
;
m_State
=
value
;
}
}
std
::
string
AmfEventReport
::
getTimeStamp
()
const
{
uint64_t
AmfEventReport
::
getTimeStamp
()
const
{
return
m_TimeStamp
;
return
m_TimeStamp
;
}
}
void
AmfEventReport
::
setTimeStamp
(
std
::
string
const
&
value
)
{
void
AmfEventReport
::
setTimeStamp
(
uint64_t
const
&
value
)
{
m_TimeStamp
=
value
;
m_TimeStamp
=
value
;
}
}
std
::
string
AmfEventReport
::
getSubscriptionId
()
const
{
std
::
string
AmfEventReport
::
getSubscriptionId
()
const
{
...
...
src/sbi/amf_server/model/AmfEventReport.h
View file @
64684f25
...
@@ -75,8 +75,8 @@ class AmfEventReport {
...
@@ -75,8 +75,8 @@ class AmfEventReport {
/// <summary>
/// <summary>
///
///
/// </summary>
/// </summary>
std
::
string
getTimeStamp
()
const
;
uint64_t
getTimeStamp
()
const
;
void
setTimeStamp
(
std
::
string
const
&
value
);
void
setTimeStamp
(
uint64_t
const
&
value
);
/// <summary>
/// <summary>
///
///
/// </summary>
/// </summary>
...
@@ -222,7 +222,7 @@ class AmfEventReport {
...
@@ -222,7 +222,7 @@ class AmfEventReport {
AmfEventState
m_State
;
AmfEventState
m_State
;
std
::
string
m_TimeStamp
;
uint64_t
m_TimeStamp
;
std
::
string
m_SubscriptionId
;
std
::
string
m_SubscriptionId
;
bool
m_SubscriptionIdIsSet
;
bool
m_SubscriptionIdIsSet
;
...
...
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