Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
f92906d9
Commit
f92906d9
authored
May 10, 2016
by
knopp
Browse files
Merge branch 'develop' of
https://gitlab.eurecom.fr/oai/openairinterface5g
into develop
parents
7e31cb2a
8df63bdf
Changes
2
Hide whitespace changes
Inline
Side-by-side
openair3/TEST/EPC_TEST/play_scenario_s1ap.c
View file @
f92906d9
...
...
@@ -666,7 +666,7 @@ int et_s1ap_process_rx_packet(et_event_s1ap_data_ind_t * const s1ap_data_ind)
packet
=
g_scenario
->
last_rx_packet
->
next
;
}
// not_found threshold may sure depend on number of mme, may be not sure on number of UE
while
((
NULL
!=
packet
)
&&
(
not_found
<
7
))
{
while
((
NULL
!=
packet
)
&&
(
not_found
<
9
))
{
S1AP_DEBUG
(
"%s() Considering packet num %d original frame number %u
\n
"
,
__FUNCTION__
,
packet
->
packet_number
,
packet
->
original_frame_number
);
if
(
packet
->
action
==
ET_PACKET_ACTION_S1C_RECEIVE
)
{
comp_results
=
et_sctp_is_matching
(
&
packet
->
sctp_hdr
,
&
rx_packet
->
sctp_hdr
,
g_constraints
);
...
...
@@ -692,7 +692,7 @@ int et_s1ap_process_rx_packet(et_event_s1ap_data_ind_t * const s1ap_data_ind)
return
et_scenario_set_packet_received
(
packet
);
}
}
else
if
(
strcmp
(
comp_results
->
name
,
"S1ap-TransportLayerAddress"
)
==
0
)
{
S1AP_WARN
(
"Some work needed there for %s, TODO in generic_scenario.xsl, add
epc
conf file in the process, anyway continuing...
\n
"
,
comp_results
->
name
);
S1AP_WARN
(
"Some work needed there for %s, TODO in generic_scenario.xsl, add
sgw
conf file in the process, anyway continuing...
\n
"
,
comp_results
->
name
);
packet
->
timestamp_packet
.
tv_sec
=
rx_packet
->
timestamp_packet
.
tv_sec
;
packet
->
timestamp_packet
.
tv_usec
=
rx_packet
->
timestamp_packet
.
tv_usec
;
return
et_scenario_set_packet_received
(
packet
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
View file @
f92906d9
...
...
@@ -140,25 +140,6 @@ eNBs =
}
);
rrh_gw_config
= (
{
local_if_name
=
"eth0"
;
#remote_address = "169.254.10.158";
#local_address = "169.254.8.15";
remote_address
=
"74:d4:35:cc:88:e3"
;
local_address
=
"74:d4:35:cc:88:d1"
;
local_port
=
50000
;
#for raw option local port must be the same to remote
remote_port
=
50000
;
rrh_gw_active
=
"yes"
;
tr_preference
=
"raw"
;
rf_preference
=
"usrp_b200"
;
iq_txshift
=
4
;
tx_sample_advance
=
70
;
tx_scheduling_advance
=
9
;
}
);
NETWORK_INTERFACES
:
{
...
...
@@ -169,6 +150,24 @@ rrh_gw_config = (
ENB_PORT_FOR_S1U
=
2152
;
# Spec 2152
};
rrh_gw_config
= (
{
local_if_name
=
"eth0"
;
#remote_address = "169.254.10.158";
#local_address = "169.254.8.15";
remote_address
=
"74:d4:35:cc:88:e3"
;
local_address
=
"74:d4:35:cc:88:d1"
;
local_port
=
50000
;
#for raw option local port must be the same to remote
remote_port
=
50000
;
rrh_gw_active
=
"yes"
;
tr_preference
=
"raw"
;
rf_preference
=
"usrp_b200"
;
iq_txshift
=
4
;
tx_sample_advance
=
70
;
tx_scheduling_advance
=
9
;
}
);
log_config
:
{
global_log_level
=
"info"
;
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment