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
0c325a38
Commit
0c325a38
authored
Sep 28, 2021
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_http2' into 'develop'
Fix http2 See merge request oai/cn5g/oai-cn5g-smf!99
parents
d6ef116a
16f1a548
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
etc/smf.conf
etc/smf.conf
+4
-4
src/smf_app/smf_app.cpp
src/smf_app/smf_app.cpp
+1
-1
src/smf_app/smf_config.cpp
src/smf_app/smf_config.cpp
+0
-2
src/smf_app/smf_procedure.cpp
src/smf_app/smf_procedure.cpp
+4
-0
src/smf_app/smf_sbi.cpp
src/smf_app/smf_sbi.cpp
+1
-1
No files found.
etc/smf.conf
View file @
0c325a38
...
@@ -91,7 +91,7 @@ SMF =
...
@@ -91,7 +91,7 @@ SMF =
# but you may need to set to yes for UE that do not explicitly request a PDN address through NAS signalling
# but you may need to set to yes for UE that do not explicitly request a PDN address through NAS signalling
USE_LOCAL_SUBSCRIPTION_INFO
=
"yes"
;
# Set to yes if SMF uses local subscription information instead of from an UDM
USE_LOCAL_SUBSCRIPTION_INFO
=
"yes"
;
# Set to yes if SMF uses local subscription information instead of from an UDM
USE_FQDN_DNS
=
"@USE_FQDN_DNS@"
;
# Set to yes if AMF/UDM/NRF/UPF will relying on a DNS to resolve FQDN
USE_FQDN_DNS
=
"@USE_FQDN_DNS@"
;
# Set to yes if AMF/UDM/NRF/UPF will relying on a DNS to resolve FQDN
HTTP_VERSION
= @
HTTP_VERSION
@;
#
YOUR NRF CONFIG HERE (default: 1)
HTTP_VERSION
= @
HTTP_VERSION
@;
#
Default: 1
USE_NETWORK_INSTANCE
=
"@USE_NETWORK_INSTANCE@"
# Set yes if network instance is to be used for given UPF
USE_NETWORK_INSTANCE
=
"@USE_NETWORK_INSTANCE@"
# Set yes if network instance is to be used for given UPF
}
}
...
...
src/smf_app/smf_app.cpp
View file @
0c325a38
...
@@ -892,7 +892,7 @@ void smf_app::handle_pdu_session_create_sm_context_request(
...
@@ -892,7 +892,7 @@ void smf_app::handle_pdu_session_create_sm_context_request(
// If no DNN information from UE, set to default value
// If no DNN information from UE, set to default value
std
::
string
dnn
=
smreq
->
req
.
get_dnn
();
std
::
string
dnn
=
smreq
->
req
.
get_dnn
();
if
(
dnn
.
length
()
==
0
)
{
if
(
dnn
.
length
()
==
0
)
{
dnn
=
=
smf_cfg
.
get_default_dnn
();
dnn
=
smf_cfg
.
get_default_dnn
();
}
}
// TODO: For the moment, not support PDU session authentication and
// TODO: For the moment, not support PDU session authentication and
...
...
src/smf_app/smf_config.cpp
View file @
0c325a38
...
@@ -1233,8 +1233,6 @@ std::string smf_config::get_default_dnn() {
...
@@ -1233,8 +1233,6 @@ std::string smf_config::get_default_dnn() {
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
bool
smf_config
::
get_nwi_list_index
(
bool
smf_config
::
get_nwi_list_index
(
bool
nwi_enabled
,
uint8_t
nwi_list_index
,
pfcp
::
node_id_t
node_id
)
{
bool
nwi_enabled
,
uint8_t
nwi_list_index
,
pfcp
::
node_id_t
node_id
)
{
Logger
::
smf_app
().
debug
(
"Default DNN: %s"
,
smf_cfg
.
dnn
[
0
].
dnn
.
c_str
());
// return smf_cfg.dnn[0].dnn;
if
(
node_id
.
node_id_type
==
pfcp
::
NODE_ID_TYPE_IPV4_ADDRESS
)
{
if
(
node_id
.
node_id_type
==
pfcp
::
NODE_ID_TYPE_IPV4_ADDRESS
)
{
for
(
int
i
=
0
;
i
<
upf_nwi_list
.
size
();
i
++
)
{
for
(
int
i
=
0
;
i
<
upf_nwi_list
.
size
();
i
++
)
{
if
(
node_id
.
u1
.
ipv4_address
.
s_addr
==
if
(
node_id
.
u1
.
ipv4_address
.
s_addr
==
...
...
src/smf_app/smf_procedure.cpp
View file @
0c325a38
...
@@ -1194,6 +1194,10 @@ void session_update_sm_context_procedure::handle_itti_msg(
...
@@ -1194,6 +1194,10 @@ void session_update_sm_context_procedure::handle_itti_msg(
// set UpCnxState to ACTIVATED
// set UpCnxState to ACTIVATED
sps
->
set_upCnx_state
(
upCnx_state_e
::
UPCNX_STATE_ACTIVATED
);
sps
->
set_upCnx_state
(
upCnx_state_e
::
UPCNX_STATE_ACTIVATED
);
// Display UE Context Info
Logger
::
smf_app
().
info
(
"SMF context:
\n
%s"
,
sc
.
get
()
->
toString
().
c_str
());
// Trigger Event_exposure event
// Trigger Event_exposure event
std
::
string
str_scid
=
n11_trigger
.
get
()
->
scid
;
std
::
string
str_scid
=
n11_trigger
.
get
()
->
scid
;
// TODO: validate the str_scid
// TODO: validate the str_scid
...
...
src/smf_app/smf_sbi.cpp
View file @
0c325a38
...
@@ -237,7 +237,7 @@ void smf_sbi::send_n1n2_message_transfer_request(
...
@@ -237,7 +237,7 @@ void smf_sbi::send_n1n2_message_transfer_request(
// Create a new curl easy handle and add to the multi handle
// Create a new curl easy handle and add to the multi handle
if
(
!
curl_create_handle
(
if
(
!
curl_create_handle
(
sm_context_res
->
res
.
get_amf_url
(),
data_str
,
str_len
,
response_data
,
sm_context_res
->
res
.
get_amf_url
(),
data_str
,
str_len
,
response_data
,
pid_ptr
,
"POST"
,
true
))
{
pid_ptr
,
"POST"
,
true
,
sm_context_res
->
http_version
))
{
Logger
::
smf_sbi
().
warn
(
"Could not create a new handle to send message"
);
Logger
::
smf_sbi
().
warn
(
"Could not create a new handle to send message"
);
remove_promise
(
promise_id
);
remove_promise
(
promise_id
);
return
;
return
;
...
...
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