Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
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
promise
OpenXG-RAN
Commits
abaf6ba7
Commit
abaf6ba7
authored
May 10, 2017
by
Navid Nikaein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix the conflict of the primitives between S1ap and X2ap
parent
45df334d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
openair2/ENB_APP/enb_app.c
openair2/ENB_APP/enb_app.c
+1
-1
openair2/X2AP/x2ap_common.c
openair2/X2AP/x2ap_common.c
+8
-8
No files found.
openair2/ENB_APP/enb_app.c
View file @
abaf6ba7
...
...
@@ -419,7 +419,7 @@ void *eNB_app_task(void *args_p)
# if defined(ENABLE_USE_MME)
/* Try to register each eNB */
registered_enb
=
0
;
register_enb_pending
=
eNB_app_register
(
enb_id_start
,
enb_id_end
,
enb_properties_p
);
register_enb_pending
=
eNB_app_register
_s1
(
enb_id_start
,
enb_id_end
,
enb_properties_p
);
# else
/* Start L2L1 task */
msg_p
=
itti_alloc_new_message
(
TASK_ENB_APP
,
INITIALIZE_MESSAGE
);
...
...
openair2/X2AP/x2ap_common.c
View file @
abaf6ba7
...
...
@@ -39,13 +39,13 @@
#include "x2ap_common.h"
#include "X2AP-PDU.h"
int
asn_debug
=
0
;
int
asn1_xer_print
=
0
;
int
asn_debug
_x2
=
0
;
int
asn1_xer_print
_x2
=
0
;
#if defined(EMIT_ASN_DEBUG_EXTERN)
inline
void
ASN_DEBUG
(
const
char
*
fmt
,
...)
inline
void
ASN_DEBUG
_X2
(
const
char
*
fmt
,
...)
{
if
(
asn_debug
)
{
if
(
asn_debug
_x2
)
{
int
adi
=
asn_debug_indent
;
va_list
ap
;
va_start
(
ap
,
fmt
);
...
...
@@ -78,7 +78,7 @@ ssize_t x2ap_generate_initiating_message(
pdu
.
choice
.
initiatingMessage
.
criticality
=
criticality
;
ANY_fromType_aper
(
&
pdu
.
choice
.
initiatingMessage
.
value
,
td
,
sptr
);
if
(
asn1_xer_print
)
{
if
(
asn1_xer_print
_x2
)
{
xer_fprint
(
stdout
,
&
asn_DEF_X2AP_PDU
,
(
void
*
)
&
pdu
);
}
...
...
@@ -112,7 +112,7 @@ ssize_t x2ap_generate_successfull_outcome(
pdu
.
choice
.
successfulOutcome
.
criticality
=
criticality
;
ANY_fromType_aper
(
&
pdu
.
choice
.
successfulOutcome
.
value
,
td
,
sptr
);
if
(
asn1_xer_print
)
{
if
(
asn1_xer_print
_x2
)
{
xer_fprint
(
stdout
,
&
asn_DEF_X2AP_PDU
,
(
void
*
)
&
pdu
);
}
...
...
@@ -147,7 +147,7 @@ ssize_t x2ap_generate_unsuccessfull_outcome(
pdu
.
choice
.
successfulOutcome
.
criticality
=
criticality
;
ANY_fromType_aper
(
&
pdu
.
choice
.
successfulOutcome
.
value
,
td
,
sptr
);
if
(
asn1_xer_print
)
{
if
(
asn1_xer_print
_x2
)
{
xer_fprint
(
stdout
,
&
asn_DEF_X2AP_PDU
,
(
void
*
)
&
pdu
);
}
...
...
@@ -188,7 +188,7 @@ X2ap_IE_t *x2ap_new_ie(
return
NULL
;
}
if
(
asn1_xer_print
)
if
(
asn1_xer_print
_x2
)
if
(
xer_fprint
(
stdout
,
&
asn_DEF_X2ap_IE
,
buff
)
<
0
)
{
free
(
buff
);
return
NULL
;
...
...
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