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-Simple
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
CommunityXG
OpenXG-AMF-Simple
Commits
21bb2917
Commit
21bb2917
authored
Oct 01, 2020
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Transfer N1/N2 msg to UE/gNB in case of PDU Session Release
parent
247cfd26
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
9 deletions
+43
-9
src/amf-app/amf_n11.cpp
src/amf-app/amf_n11.cpp
+40
-6
src/utils/http_multi_parser.cpp
src/utils/http_multi_parser.cpp
+3
-3
No files found.
src/amf-app/amf_n11.cpp
View file @
21bb2917
...
@@ -429,6 +429,7 @@ void amf_n11::curl_http_client(std::string remoteUri, std::string jsonData,
...
@@ -429,6 +429,7 @@ void amf_n11::curl_http_client(std::string remoteUri, std::string jsonData,
//TODO:
//TODO:
}
}
uint8_t
number_parts
=
0
;
mime_parser
parser
=
{
};
mime_parser
parser
=
{
};
std
::
string
body
;
std
::
string
body
;
...
@@ -514,11 +515,7 @@ void amf_n11::curl_http_client(std::string remoteUri, std::string jsonData,
...
@@ -514,11 +515,7 @@ void amf_n11::curl_http_client(std::string remoteUri, std::string jsonData,
//TODO: send context response error
//TODO: send context response error
return
;
return
;
}
}
if
(
!
(
multipart_parser
(
response
,
json_data_response
,
n1sm
,
n2sm
)))
{
number_parts
=
multipart_parser
(
response
,
json_data_response
,
n1sm
,
n2sm
);
Logger
::
amf_n11
().
error
(
"Could not get N1/N2 content from the response"
);
//TODO:
}
}
else
{
}
else
{
//store location of the created context
//store location of the created context
std
::
string
header_response
=
*
httpHeaderData
.
get
();
std
::
string
header_response
=
*
httpHeaderData
.
get
();
...
@@ -535,10 +532,14 @@ void amf_n11::curl_http_client(std::string remoteUri, std::string jsonData,
...
@@ -535,10 +532,14 @@ void amf_n11::curl_http_client(std::string remoteUri, std::string jsonData,
psc
.
get
()
->
smf_context_location
=
location
;
psc
.
get
()
->
smf_context_location
=
location
;
}
}
}
}
if
(
response
.
size
()
>
0
)
{
number_parts
=
multipart_parser
(
response
,
json_data_response
,
n1sm
,
n2sm
);
}
}
}
nlohmann
::
json
response_data
=
{
};
nlohmann
::
json
response_data
=
{
};
bstring
n1sm_hex
;
bstring
n1sm_hex
,
n2sm_hex
;
if
(
!
is_response_ok
)
{
if
(
!
is_response_ok
)
{
try
{
try
{
...
@@ -561,6 +562,39 @@ void amf_n11::curl_http_client(std::string remoteUri, std::string jsonData,
...
@@ -561,6 +562,39 @@ void amf_n11::curl_http_client(std::string remoteUri, std::string jsonData,
if
(
!
cause
.
compare
(
"DNN_DENIED"
))
if
(
!
cause
.
compare
(
"DNN_DENIED"
))
handle_post_sm_context_response_error
(
httpCode
,
cause
,
n1sm_hex
,
supi
,
handle_post_sm_context_response_error
(
httpCode
,
cause
,
n1sm_hex
,
supi
,
pdu_session_id
);
pdu_session_id
);
}
else
{
//If N1,N2 exist then forward to UE/gNB
itti_n1n2_message_transfer_request
*
itti_msg
=
new
itti_n1n2_message_transfer_request
(
TASK_AMF_N11
,
TASK_AMF_APP
);
if
(
n1sm
.
size
()
>
0
)
{
msg_str_2_msg_hex
(
n1sm
.
substr
(
0
,
n1sm
.
length
()
-
2
),
n1sm_hex
);
print_buffer
(
"amf_n11"
,
"Get response n1sm:"
,
(
uint8_t
*
)
bdata
(
n1sm_hex
),
blength
(
n1sm_hex
));
itti_msg
->
n1sm
=
n1sm_hex
;
itti_msg
->
is_n1sm_set
=
true
;
}
else
if
(
n2sm
.
size
()
>
0
)
{
msg_str_2_msg_hex
(
n2sm
.
substr
(
0
,
n2sm
.
length
()
-
2
),
n2sm_hex
);
print_buffer
(
"amf_n11"
,
"Get response n1sm:"
,
(
uint8_t
*
)
bdata
(
n2sm_hex
),
blength
(
n2sm_hex
));
itti_msg
->
n2sm
=
n2sm_hex
;
itti_msg
->
is_n2sm_set
=
true
;
}
//itti_msg->supi = supi;
itti_msg
->
pdu_session_id
=
pdu_session_id
;
std
::
shared_ptr
<
itti_n1n2_message_transfer_request
>
i
=
std
::
shared_ptr
<
itti_n1n2_message_transfer_request
>
(
itti_msg
);
int
ret
=
itti_inst
->
send_msg
(
i
);
if
(
0
!=
ret
)
{
Logger
::
amf_n1
().
error
(
"Could not send ITTI message %s to task TASK_AMF_APP"
,
i
->
get_msg_name
());
}
}
}
curl_slist_free_all
(
headers
);
curl_slist_free_all
(
headers
);
curl_easy_cleanup
(
curl
);
curl_easy_cleanup
(
curl
);
...
...
src/utils/http_multi_parser.cpp
View file @
21bb2917
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#include <string>
#include <string>
#include <iostream>
#include <iostream>
bool
multipart_parser
(
std
::
string
input
,
std
::
string
&
jsonData
,
uint8_t
multipart_parser
(
std
::
string
input
,
std
::
string
&
jsonData
,
std
::
string
&
n1sm
,
std
::
string
&
n2sm
)
{
std
::
string
&
n1sm
,
std
::
string
&
n2sm
)
{
//simple parser
//simple parser
...
@@ -14,7 +14,7 @@ bool multipart_parser(std::string input, std::string &jsonData,
...
@@ -14,7 +14,7 @@ bool multipart_parser(std::string input, std::string &jsonData,
uint8_t
size
=
parts
.
size
();
uint8_t
size
=
parts
.
size
();
//at least 2 parts for Json data and N1 (+ N2)
//at least 2 parts for Json data and N1 (+ N2)
if
(
size
<
2
)
{
if
(
size
<
2
)
{
return
fals
e
;
return
siz
e
;
}
}
jsonData
=
parts
[
0
].
body
;
jsonData
=
parts
[
0
].
body
;
...
@@ -26,6 +26,6 @@ bool multipart_parser(std::string input, std::string &jsonData,
...
@@ -26,6 +26,6 @@ bool multipart_parser(std::string input, std::string &jsonData,
n2sm
=
"null"
;
n2sm
=
"null"
;
}
}
return
tru
e
;
return
siz
e
;
}
}
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