Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
oai
openairinterface5G
Commits
014fe30a
Commit
014fe30a
authored
2 years ago
by
Sakthivel Velumani
Browse files
Options
Downloads
Patches
Plain Diff
Remove xer prints from e1ap
and gcc warning fixes
parent
71f0c912
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
openair2/E1AP/e1ap_common.c
+3
-3
3 additions, 3 deletions
openair2/E1AP/e1ap_common.c
openair2/E1AP/e1ap_common.h
+2
-0
2 additions, 0 deletions
openair2/E1AP/e1ap_common.h
openair2/GNB_APP/gnb_config.c
+4
-4
4 additions, 4 deletions
openair2/GNB_APP/gnb_config.c
with
9 additions
and
7 deletions
openair2/E1AP/e1ap_common.c
+
3
−
3
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
"
);
...
...
This diff is collapsed.
Click to expand it.
openair2/E1AP/e1ap_common.h
+
2
−
0
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
);
...
...
This diff is collapsed.
Click to expand it.
openair2/GNB_APP/gnb_config.c
+
4
−
4
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
n
cpy
(
tmp
.
originHost
,
IPaddr
.
my_addr
,
sizeof
(
tmp
.
originHost
)
-
1
);
strcpy
(
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
,
...
...
This diff is collapsed.
Click to expand it.
Robert Schmidt
@schmidtr
mentioned in commit
553f1d1a
·
2 years ago
mentioned in commit
553f1d1a
mentioned in commit 553f1d1a52845911be4ba61ec2bcc5c60ad42ae7
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment