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
zzha zzha
OpenXG-RAN
Commits
014fe30a
Commit
014fe30a
authored
Aug 30, 2022
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove xer prints from e1ap
and gcc warning fixes
parent
71f0c912
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
openair2/E1AP/e1ap_common.c
openair2/E1AP/e1ap_common.c
+3
-3
openair2/E1AP/e1ap_common.h
openair2/E1AP/e1ap_common.h
+2
-0
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+4
-4
No files found.
openair2/E1AP/e1ap_common.c
View file @
014fe30a
...
@@ -164,7 +164,7 @@ int e1ap_decode_unsuccessful_outcome(E1AP_E1AP_PDU_t *pdu) {
...
@@ -164,7 +164,7 @@ int e1ap_decode_unsuccessful_outcome(E1AP_E1AP_PDU_t *pdu) {
return
0
;
return
0
;
}
}
int
asn1_xer_print
_e1ap
=
1
;
int
asn1_xer_print
;
int
e1ap_decode_pdu
(
E1AP_E1AP_PDU_t
*
pdu
,
const
uint8_t
*
const
buffer
,
uint32_t
length
)
{
int
e1ap_decode_pdu
(
E1AP_E1AP_PDU_t
*
pdu
,
const
uint8_t
*
const
buffer
,
uint32_t
length
)
{
asn_dec_rval_t
dec_ret
;
asn_dec_rval_t
dec_ret
;
...
@@ -177,7 +177,7 @@ int e1ap_decode_pdu(E1AP_E1AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t
...
@@ -177,7 +177,7 @@ int e1ap_decode_pdu(E1AP_E1AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t
0
,
0
,
0
);
0
);
if
(
asn1_xer_print
_e1ap
)
{
if
(
asn1_xer_print
)
{
LOG_E
(
E1AP
,
"----------------- ASN1 DECODER PRINT START-----------------
\n
"
);
LOG_E
(
E1AP
,
"----------------- ASN1 DECODER PRINT START-----------------
\n
"
);
xer_fprint
(
stdout
,
&
asn_DEF_E1AP_E1AP_PDU
,
pdu
);
xer_fprint
(
stdout
,
&
asn_DEF_E1AP_E1AP_PDU
,
pdu
);
LOG_E
(
E1AP
,
"----------------- ASN1 DECODER PRINT END -----------------
\n
"
);
LOG_E
(
E1AP
,
"----------------- ASN1 DECODER PRINT END -----------------
\n
"
);
...
@@ -209,7 +209,7 @@ int e1ap_decode_pdu(E1AP_E1AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t
...
@@ -209,7 +209,7 @@ int e1ap_decode_pdu(E1AP_E1AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t
int
e1ap_encode_send
(
E1_t
type
,
instance_t
instance
,
E1AP_E1AP_PDU_t
*
pdu
,
uint16_t
stream
,
const
char
*
func
)
{
int
e1ap_encode_send
(
E1_t
type
,
instance_t
instance
,
E1AP_E1AP_PDU_t
*
pdu
,
uint16_t
stream
,
const
char
*
func
)
{
DevAssert
(
pdu
!=
NULL
);
DevAssert
(
pdu
!=
NULL
);
if
(
asn1_xer_print
_e1ap
)
{
if
(
asn1_xer_print
)
{
LOG_E
(
E1AP
,
"----------------- ASN1 ENCODER PRINT START -----------------
\n
"
);
LOG_E
(
E1AP
,
"----------------- ASN1 ENCODER PRINT START -----------------
\n
"
);
xer_fprint
(
stdout
,
&
asn_DEF_E1AP_E1AP_PDU
,
pdu
);
xer_fprint
(
stdout
,
&
asn_DEF_E1AP_E1AP_PDU
,
pdu
);
LOG_E
(
E1AP
,
"----------------- ASN1 ENCODER PRINT END-----------------
\n
"
);
LOG_E
(
E1AP
,
"----------------- ASN1 ENCODER PRINT END-----------------
\n
"
);
...
...
openair2/E1AP/e1ap_common.h
View file @
014fe30a
...
@@ -62,6 +62,8 @@
...
@@ -62,6 +62,8 @@
#include <E1AP_Dynamic5QIDescriptor.h>
#include <E1AP_Dynamic5QIDescriptor.h>
#include <E1AP_T-ReorderingTimer.h>
#include <E1AP_T-ReorderingTimer.h>
extern
int
asn1_xer_print
;
int
e1ap_decode_pdu
(
E1AP_E1AP_PDU_t
*
pdu
,
const
uint8_t
*
const
buffer
,
uint32_t
length
);
int
e1ap_decode_pdu
(
E1AP_E1AP_PDU_t
*
pdu
,
const
uint8_t
*
const
buffer
,
uint32_t
length
);
e1ap_upcp_inst_t
*
getCxtE1
(
E1_t
type
,
instance_t
instance
);
e1ap_upcp_inst_t
*
getCxtE1
(
E1_t
type
,
instance_t
instance
);
...
...
openair2/GNB_APP/gnb_config.c
View file @
014fe30a
...
@@ -1288,16 +1288,16 @@ static int get_NGU_S1U_addr(char *addr, int *port) {
...
@@ -1288,16 +1288,16 @@ static int get_NGU_S1U_addr(char *addr, int *port) {
}
}
instance_t
RCconfig_nr_gtpu
(
void
)
{
instance_t
RCconfig_nr_gtpu
(
void
)
{
char
address
[
160
];
char
address
[
64
];
int
port
;
int
port
;
int
ret
=
get_NGU_S1U_addr
(
address
,
&
port
);
int
ret
=
get_NGU_S1U_addr
(
address
,
&
port
);
instance_t
ret_inst
;
instance_t
ret_inst
=
0
;
if
(
!
ret
)
{
if
(
!
ret
)
{
eth_params_t
IPaddr
;
eth_params_t
IPaddr
;
IPaddr
.
my_addr
=
address
;
IPaddr
.
my_addr
=
address
;
IPaddr
.
my_portd
=
port
;
IPaddr
.
my_portd
=
port
;
openAddr_t
tmp
=
{
0
};
openAddr_t
tmp
=
{
0
};
str
ncpy
(
tmp
.
originHost
,
IPaddr
.
my_addr
,
sizeof
(
tmp
.
originHost
)
-
1
);
str
cpy
(
tmp
.
originHost
,
IPaddr
.
my_addr
);
sprintf
(
tmp
.
originService
,
"%d"
,
IPaddr
.
my_portd
);
sprintf
(
tmp
.
originService
,
"%d"
,
IPaddr
.
my_portd
);
strcpy
(
tmp
.
destinationService
,
tmp
.
originService
);
strcpy
(
tmp
.
destinationService
,
tmp
.
originService
);
LOG_I
(
GTPU
,
"Configuring GTPu address : %s, port : %s
\n
"
,
tmp
.
originHost
,
tmp
.
originService
);
LOG_I
(
GTPU
,
"Configuring GTPu address : %s, port : %s
\n
"
,
tmp
.
originHost
,
tmp
.
originService
);
...
@@ -1848,7 +1848,7 @@ int RCconfig_NR_CU_E1(MessageDef *msg_p, uint32_t i) {
...
@@ -1848,7 +1848,7 @@ int RCconfig_NR_CU_E1(MessageDef *msg_p, uint32_t i) {
strcpy
(
e1Setup
->
CUUP_e1_ip_address
.
ipv4_address
,
*
(
GNBE1ParamList
.
paramarray
[
0
][
GNB_CONFIG_E1_IPV4_ADDRESS_CUUP
].
strptr
));
strcpy
(
e1Setup
->
CUUP_e1_ip_address
.
ipv4_address
,
*
(
GNBE1ParamList
.
paramarray
[
0
][
GNB_CONFIG_E1_IPV4_ADDRESS_CUUP
].
strptr
));
e1Setup
->
CUUP_e1_ip_address
.
ipv4
=
1
;
e1Setup
->
CUUP_e1_ip_address
.
ipv4
=
1
;
e1Setup
->
port_cuup
=
*
GNBE1ParamList
.
paramarray
[
0
][
GNB_CONFIG_E1_PORT_CUUP
].
uptr
;
e1Setup
->
port_cuup
=
*
GNBE1ParamList
.
paramarray
[
0
][
GNB_CONFIG_E1_PORT_CUUP
].
uptr
;
char
N3Addr
[
160
];
char
N3Addr
[
64
];
int
N3Port
;
int
N3Port
;
if
(
!
get_NGU_S1U_addr
(
N3Addr
,
&
N3Port
))
{;
if
(
!
get_NGU_S1U_addr
(
N3Addr
,
&
N3Port
))
{;
inet_pton
(
AF_INET
,
inet_pton
(
AF_INET
,
...
...
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