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
lizhongxiao
OpenXG-RAN
Commits
57c45cf1
Commit
57c45cf1
authored
Nov 10, 2020
by
Frédéric Leroy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: fix astyle codestyle on modified files
parent
06aefa58
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
289 additions
and
293 deletions
+289
-293
openair2/COMMON/s1ap_messages_types.h
openair2/COMMON/s1ap_messages_types.h
+5
-5
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+41
-46
openair2/ENB_APP/enb_paramdef.h
openair2/ENB_APP/enb_paramdef.h
+233
-233
openair3/S1AP/s1ap_eNB.c
openair3/S1AP/s1ap_eNB.c
+10
-9
No files found.
openair2/COMMON/s1ap_messages_types.h
View file @
57c45cf1
...
...
@@ -235,9 +235,9 @@ typedef struct transport_layer_addr_s {
#define TRANSPORT_LAYER_ADDR_COPY(dEST,sOURCE) \
do { \
AssertFatal(sOURCE.len <= 20); \
memcpy(dEST.buffer, sOURCE.buffer, sOURCE.len); \
dEST.length = sOURCE.length; \
AssertFatal(sOURCE.len <= 20); \
memcpy(dEST.buffer, sOURCE.buffer, sOURCE.len); \
dEST.length = sOURCE.length; \
} while (0)
typedef
struct
e_rab_level_qos_parameter_s
{
...
...
@@ -622,7 +622,7 @@ typedef struct s1ap_path_switch_req_s {
uint16_t
ue_initial_id
;
/* Security algorithms */
/* Security algorithms */
security_capabilities_t
security_capabilities
;
}
s1ap_path_switch_req_t
;
...
...
@@ -663,7 +663,7 @@ typedef struct s1ap_e_rab_modification_ind_s {
unsigned
eNB_ue_s1ap_id
:
24
;
/* MME UE id */
uint32_t
mme_ue_s1ap_id
;
uint32_t
mme_ue_s1ap_id
;
/* Number of e_rab setup-ed in the list */
uint8_t
nb_of_e_rabs_tobemodified
;
...
...
openair2/ENB_APP/enb_config.c
View file @
57c45cf1
This diff is collapsed.
Click to expand it.
openair2/ENB_APP/enb_paramdef.h
View file @
57c45cf1
This diff is collapsed.
Click to expand it.
openair3/S1AP/s1ap_eNB.c
View file @
57c45cf1
...
...
@@ -125,8 +125,9 @@ static void s1ap_eNB_register_mme(s1ap_eNB_instance_t *instance_p,
s1ap_mme_data_p
->
assoc_id
=
-
1
;
s1ap_mme_data_p
->
broadcast_plmn_num
=
broadcast_plmn_num
;
memcpy
(
&
s1ap_mme_data_p
->
mme_s1_ip
,
mme_ip_address
,
sizeof
(
*
mme_ip_address
));
mme_ip_address
,
sizeof
(
*
mme_ip_address
));
for
(
int
i
=
0
;
i
<
broadcast_plmn_num
;
++
i
)
s1ap_mme_data_p
->
broadcast_plmn_index
[
i
]
=
broadcast_plmn_index
[
i
];
...
...
@@ -195,10 +196,9 @@ void s1ap_eNB_handle_register_eNB(instance_t instance, s1ap_register_enb_req_t *
new_instance
->
eNB_id
=
s1ap_register_eNB
->
eNB_id
;
new_instance
->
cell_type
=
s1ap_register_eNB
->
cell_type
;
new_instance
->
tac
=
s1ap_register_eNB
->
tac
;
memcpy
(
&
new_instance
->
eNB_s1_ip
,
&
s1ap_register_eNB
->
enb_ip_address
,
sizeof
(
s1ap_register_eNB
->
enb_ip_address
));
&
s1ap_register_eNB
->
enb_ip_address
,
sizeof
(
s1ap_register_eNB
->
enb_ip_address
));
for
(
int
i
=
0
;
i
<
s1ap_register_eNB
->
num_plmn
;
i
++
)
{
new_instance
->
mcc
[
i
]
=
s1ap_register_eNB
->
mcc
[
i
];
...
...
@@ -228,13 +228,15 @@ void s1ap_eNB_handle_register_eNB(instance_t instance, s1ap_register_enb_req_t *
/* Compare whether IPv4 and IPv6 information is already present, in which
* wase we do not register again */
if
(
mme
->
mme_s1_ip
.
ipv4
==
mme_ip
->
ipv4
&&
(
!
mme_ip
->
ipv4
||
strncmp
(
mme
->
mme_s1_ip
.
ipv4_address
,
mme_ip
->
ipv4_address
,
16
)
==
0
)
||
strncmp
(
mme
->
mme_s1_ip
.
ipv4_address
,
mme_ip
->
ipv4_address
,
16
)
==
0
)
&&
mme
->
mme_s1_ip
.
ipv6
==
mme_ip
->
ipv6
&&
(
!
mme_ip
->
ipv6
||
strncmp
(
mme
->
mme_s1_ip
.
ipv6_address
,
mme_ip
->
ipv6_address
,
46
)
==
0
))
break
;
}
if
(
mme
)
continue
;
s1ap_eNB_register_mme
(
new_instance
,
mme_ip
,
mme_port
,
...
...
@@ -377,8 +379,8 @@ void *s1ap_eNB_process_itti_msg(void *notUsed) {
break
;
case
S1AP_E_RAB_MODIFICATION_IND
:
{
s1ap_eNB_generate_E_RAB_Modification_Indication
(
ITTI_MESSAGE_GET_INSTANCE
(
received_msg
),
&
S1AP_E_RAB_MODIFICATION_IND
(
received_msg
));
s1ap_eNB_generate_E_RAB_Modification_Indication
(
ITTI_MESSAGE_GET_INSTANCE
(
received_msg
),
&
S1AP_E_RAB_MODIFICATION_IND
(
received_msg
));
}
break
;
...
...
@@ -519,7 +521,6 @@ static int s1ap_eNB_generate_s1_setup_request(
ie
->
value
.
choice
.
PagingDRX
=
instance_p
->
default_drx
;
ASN_SEQUENCE_ADD
(
&
out
->
protocolIEs
.
list
,
ie
);
if
(
s1ap_eNB_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
S1AP_ERROR
(
"Failed to encode S1 setup request
\n
"
);
return
-
1
;
...
...
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