Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-SMF
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
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-SMF
Commits
30cf53be
Commit
30cf53be
authored
Feb 09, 2021
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue for AMF Addr
parent
7a5b83ea
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
14 deletions
+17
-14
src/smf_app/smf_app.hpp
src/smf_app/smf_app.hpp
+1
-1
src/smf_app/smf_context.cpp
src/smf_app/smf_context.cpp
+10
-8
src/smf_app/smf_context.hpp
src/smf_app/smf_context.hpp
+1
-1
src/smf_app/smf_procedure.cpp
src/smf_app/smf_procedure.cpp
+5
-4
No files found.
src/smf_app/smf_app.hpp
View file @
30cf53be
...
@@ -88,7 +88,7 @@ class smf_context_ref {
...
@@ -88,7 +88,7 @@ class smf_context_ref {
dnn
=
""
;
dnn
=
""
;
pdu_session_id
=
0
;
pdu_session_id
=
0
;
amf_status_uri
=
""
;
amf_status_uri
=
""
;
amf_addr
=
""
;
amf_addr
=
""
;
}
}
supi_t
supi
;
supi_t
supi
;
...
...
src/smf_app/smf_context.cpp
View file @
30cf53be
...
@@ -774,11 +774,11 @@ void smf_context::handle_itti_msg(
...
@@ -774,11 +774,11 @@ void smf_context::handle_itti_msg(
get_supi_prefix
(
supi_prefix
);
get_supi_prefix
(
supi_prefix
);
std
::
string
supi_str
=
supi_prefix
+
"-"
+
smf_supi_to_string
(
supi
);
std
::
string
supi_str
=
supi_prefix
+
"-"
+
smf_supi_to_string
(
supi
);
std
::
string
url
=
std
::
string
url
=
//std::string(inet_ntoa(
//
std::string(inet_ntoa(
// *((struct in_addr*) &smf_cfg.amf_addr.ipv4_addr))) +
// *((struct in_addr*) &smf_cfg.amf_addr.ipv4_addr))) +
//":" + std::to_string(smf_cfg.amf_addr.port) +
//":" + std::to_string(smf_cfg.amf_addr.port) +
sp
.
get
()
->
get_amf_addr
()
+
sp
.
get
()
->
get_amf_addr
()
+
NAMF_COMMUNICATION_BASE
+
NAMF_COMMUNICATION_BASE
+
smf_cfg
.
amf_addr
.
api_version
+
smf_cfg
.
amf_addr
.
api_version
+
fmt
::
format
(
fmt
::
format
(
NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL
,
NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL
,
supi_str
.
c_str
());
supi_str
.
c_str
());
...
@@ -1560,10 +1560,11 @@ void smf_context::handle_pdu_session_create_sm_context_request(
...
@@ -1560,10 +1560,11 @@ void smf_context::handle_pdu_session_create_sm_context_request(
supi_str
=
sm_context_resp_pending
->
res
.
get_supi_prefix
()
+
"-"
+
supi_str
=
sm_context_resp_pending
->
res
.
get_supi_prefix
()
+
"-"
+
smf_supi_to_string
(
supi
);
smf_supi_to_string
(
supi
);
std
::
string
url
=
std
::
string
url
=
// std::string(
// std::string(
// inet_ntoa(*((struct in_addr*) &smf_cfg.amf_addr.ipv4_addr))) +
// inet_ntoa(*((struct in_addr*) &smf_cfg.amf_addr.ipv4_addr))) +
// ":" + std::to_string(smf_cfg.amf_addr.port) + NAMF_COMMUNICATION_BASE +
// ":" + std::to_string(smf_cfg.amf_addr.port) + NAMF_COMMUNICATION_BASE
sp
.
get
()
->
get_amf_addr
()
+
NAMF_COMMUNICATION_BASE
+
// +
sp
.
get
()
->
get_amf_addr
()
+
NAMF_COMMUNICATION_BASE
+
smf_cfg
.
amf_addr
.
api_version
+
smf_cfg
.
amf_addr
.
api_version
+
fmt
::
format
(
fmt
::
format
(
NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL
,
supi_str
.
c_str
());
NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL
,
supi_str
.
c_str
());
...
@@ -2758,9 +2759,10 @@ void smf_context::handle_pdu_session_modification_network_requested(
...
@@ -2758,9 +2759,10 @@ void smf_context::handle_pdu_session_modification_network_requested(
std
::
string
supi_str
=
std
::
string
supi_str
=
itti_msg
->
msg
.
get_supi_prefix
()
+
"-"
+
smf_supi_to_string
(
supi
);
itti_msg
->
msg
.
get_supi_prefix
()
+
"-"
+
smf_supi_to_string
(
supi
);
std
::
string
url
=
std
::
string
url
=
//std::string(inet_ntoa(*((struct in_addr*) &smf_cfg.amf_addr.ipv4_addr))) +
// std::string(inet_ntoa(*((struct in_addr*)
// &smf_cfg.amf_addr.ipv4_addr))) +
//":" + std::to_string(smf_cfg.amf_addr.port) + NAMF_COMMUNICATION_BASE +
//":" + std::to_string(smf_cfg.amf_addr.port) + NAMF_COMMUNICATION_BASE +
sp
.
get
()
->
get_amf_addr
()
+
NAMF_COMMUNICATION_BASE
+
sp
.
get
()
->
get_amf_addr
()
+
NAMF_COMMUNICATION_BASE
+
smf_cfg
.
amf_addr
.
api_version
+
smf_cfg
.
amf_addr
.
api_version
+
fmt
::
format
(
fmt
::
format
(
NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL
,
supi_str
.
c_str
());
NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL
,
supi_str
.
c_str
());
...
...
src/smf_app/smf_context.hpp
View file @
30cf53be
...
@@ -1054,7 +1054,7 @@ class smf_context : public std::enable_shared_from_this<smf_context> {
...
@@ -1054,7 +1054,7 @@ class smf_context : public std::enable_shared_from_this<smf_context> {
std
::
string
supi_prefix
;
std
::
string
supi_prefix
;
scid_t
scid
;
// SM Context ID
scid_t
scid
;
// SM Context ID
//AMF IP addr
//
AMF IP addr
string
amf_addr
;
string
amf_addr
;
// Big recursive lock
// Big recursive lock
mutable
std
::
recursive_mutex
m_context
;
mutable
std
::
recursive_mutex
m_context
;
...
...
src/smf_app/smf_procedure.cpp
View file @
30cf53be
...
@@ -419,9 +419,10 @@ void session_create_sm_context_procedure::handle_itti_msg(
...
@@ -419,9 +419,10 @@ void session_create_sm_context_procedure::handle_itti_msg(
std
::
string
supi_str
=
n11_triggered_pending
->
res
.
get_supi_prefix
()
+
"-"
+
std
::
string
supi_str
=
n11_triggered_pending
->
res
.
get_supi_prefix
()
+
"-"
+
smf_supi_to_string
(
supi
);
smf_supi_to_string
(
supi
);
std
::
string
url
=
std
::
string
url
=
//std::string(inet_ntoa(*((struct in_addr*) &smf_cfg.amf_addr.ipv4_addr))) +
// std::string(inet_ntoa(*((struct in_addr*)
// &smf_cfg.amf_addr.ipv4_addr))) +
//":" + std::to_string(smf_cfg.amf_addr.port) + NAMF_COMMUNICATION_BASE +
//":" + std::to_string(smf_cfg.amf_addr.port) + NAMF_COMMUNICATION_BASE +
sps
.
get
()
->
get_amf_addr
()
+
NAMF_COMMUNICATION_BASE
+
sps
.
get
()
->
get_amf_addr
()
+
NAMF_COMMUNICATION_BASE
+
smf_cfg
.
amf_addr
.
api_version
+
smf_cfg
.
amf_addr
.
api_version
+
fmt
::
format
(
fmt
::
format
(
NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL
,
supi_str
.
c_str
());
NAMF_COMMUNICATION_N1N2_MESSAGE_TRANSFER_URL
,
supi_str
.
c_str
());
...
@@ -454,10 +455,10 @@ void session_create_sm_context_procedure::handle_itti_msg(
...
@@ -454,10 +455,10 @@ void session_create_sm_context_procedure::handle_itti_msg(
// N1N2MsgTxfrFailureNotification
// N1N2MsgTxfrFailureNotification
std
::
string
callback_uri
=
std
::
string
callback_uri
=
//std::string(
//
std::string(
// inet_ntoa(*((struct in_addr*) &smf_cfg.amf_addr.ipv4_addr))) +
// inet_ntoa(*((struct in_addr*) &smf_cfg.amf_addr.ipv4_addr))) +
//":" + std::to_string(smf_cfg.amf_addr.port) + NSMF_PDU_SESSION_BASE +
//":" + std::to_string(smf_cfg.amf_addr.port) + NSMF_PDU_SESSION_BASE +
sps
.
get
()
->
get_amf_addr
()
+
NSMF_PDU_SESSION_BASE
+
sps
.
get
()
->
get_amf_addr
()
+
NSMF_PDU_SESSION_BASE
+
smf_cfg
.
sbi_api_version
+
smf_cfg
.
sbi_api_version
+
fmt
::
format
(
fmt
::
format
(
NSMF_CALLBACK_N1N2_MESSAGE_TRANSFER_FAILURE
,
supi_str
.
c_str
());
NSMF_CALLBACK_N1N2_MESSAGE_TRANSFER_FAILURE
,
supi_str
.
c_str
());
...
...
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