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
da0f9ba1
Commit
da0f9ba1
authored
May 31, 2021
by
liuyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
liuyu
parent
6af38a77
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
7 deletions
+0
-7
src/amf-app/amf_n2.cpp
src/amf-app/amf_n2.cpp
+0
-7
No files found.
src/amf-app/amf_n2.cpp
View file @
da0f9ba1
...
...
@@ -27,9 +27,6 @@
*/
#include "amf_n2.hpp"
<<<<<<<
HEAD
=======
#include <curl/curl.h>
#include "amf_n1.hpp"
#include "amf_n11.hpp"
...
...
@@ -39,7 +36,6 @@
#include "itti.hpp"
#include "itti_msg_amf_app.hpp"
#include "amf_config.hpp"
>>>>>>>
amf_with_plugin
#include "DefaultPagingDRX.hpp"
#include "DownLinkNasTransport.hpp"
#include "InitialContextSetupRequest.hpp"
...
...
@@ -49,7 +45,6 @@
#include "Ngap_CauseNas.h"
#include "Ngap_CauseRadioNetwork.h"
#include "Ngap_TimeToWait.h"
<<<<<<<
HEAD
#include "PDUSessionResourceHandoverCommandTransfer.hpp"
#include "PduSessionResourceReleaseCommand.hpp"
#include "PduSessionResourceSetupRequest.hpp"
...
...
@@ -63,11 +58,9 @@
#include "itti_msg_amf_app.hpp"
#include "logger.hpp"
#include "sctp_server.hpp"
=======
#include <nlohmann/json.hpp>
#include "Record.h"
>>>>>>>
amf_with_plugin
extern
"C"
{
#include "dynamic_memory_check.h"
...
...
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