Commit d64e9b78 authored by alexandr's avatar alexandr

ping-pong almost done (some scenarios need to be tested)

parent c73b577f
...@@ -752,5 +752,6 @@ void rrc_lite_ue_update_ho_status(module_id_t Mod_idP){ ...@@ -752,5 +752,6 @@ void rrc_lite_ue_update_ho_status(module_id_t Mod_idP){
LOG_D(RRC,"Reset HO timer in RRC\n"); LOG_D(RRC,"Reset HO timer in RRC\n");
UE_rrc_inst[Mod_idP].Info[0].T304_active = 0; // Stop the timer (MAC procedure was successful) UE_rrc_inst[Mod_idP].Info[0].T304_active = 0; // Stop the timer (MAC procedure was successful)
//UE_rrc_inst[Mod_idP].HandoverInfoUe.measFlag = 0; // Stop the measurements //UE_rrc_inst[Mod_idP].HandoverInfoUe.measFlag = 0; // Stop the measurements
UE_mac_inst[Mod_idP].RA_active = 0;
UE_rrc_inst[Mod_idP].Info[0].State = RRC_RECONFIGURED; UE_rrc_inst[Mod_idP].Info[0].State = RRC_RECONFIGURED;
} }
...@@ -1973,7 +1973,9 @@ rrc_ue_decode_dcch( ...@@ -1973,7 +1973,9 @@ rrc_ue_decode_dcch(
target_eNB_index, target_eNB_index,
dl_dcch_msg->message.choice.c1.choice.rrcConnectionReconfiguration.rrc_TransactionIdentifier); dl_dcch_msg->message.choice.c1.choice.rrcConnectionReconfiguration.rrc_TransactionIdentifier);
UE_rrc_inst[ctxt_pP->module_id].Info[eNB_indexP].State = RRC_HO_EXECUTION; UE_rrc_inst[ctxt_pP->module_id].Info[eNB_indexP].State = RRC_HO_EXECUTION;
UE_rrc_inst[ctxt_pP->module_id].Info[target_eNB_index].State = RRC_RECONFIGURED; if(eNB_indexP!=target_eNB_index){
UE_rrc_inst[ctxt_pP->module_id].Info[target_eNB_index].State = RRC_RECONFIGURED;
}
LOG_I(RRC, "[UE %d] State = RRC_RECONFIGURED during HO (eNB %d)\n", LOG_I(RRC, "[UE %d] State = RRC_RECONFIGURED during HO (eNB %d)\n",
ctxt_pP->module_id, target_eNB_index); ctxt_pP->module_id, target_eNB_index);
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<SOURCE_ID>2</SOURCE_ID> <SOURCE_ID>2</SOURCE_ID>
<TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL> <TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL>
<FLOW_START_ms>1600</FLOW_START_ms> <FLOW_START_ms>1600</FLOW_START_ms>
<FLOW_DURATION_ms>900</FLOW_DURATION_ms> <FLOW_DURATION_ms>1000</FLOW_DURATION_ms>
<IP_VERSION>ipv4</IP_VERSION> <IP_VERSION>ipv4</IP_VERSION>
<DESTINATION_ID>1</DESTINATION_ID> <DESTINATION_ID>1</DESTINATION_ID>
<IDT_DIST>uniform</IDT_DIST> <IDT_DIST>uniform</IDT_DIST>
...@@ -85,6 +85,21 @@ ...@@ -85,6 +85,21 @@
<SIZE_MIN_byte>850</SIZE_MIN_byte> <SIZE_MIN_byte>850</SIZE_MIN_byte>
<SIZE_MAX_byte>1408</SIZE_MAX_byte> <SIZE_MAX_byte>1408</SIZE_MAX_byte>
</CUSTOMIZED_TRAFFIC> </CUSTOMIZED_TRAFFIC>
<CUSTOMIZED_TRAFFIC>
<SOURCE_ID>2</SOURCE_ID>
<TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL>
<FLOW_START_ms>4400</FLOW_START_ms>
<FLOW_DURATION_ms>1000</FLOW_DURATION_ms>
<IP_VERSION>ipv4</IP_VERSION>
<DESTINATION_ID>0</DESTINATION_ID>
<IDT_DIST>uniform</IDT_DIST>
<IDT_MIN_ms>10</IDT_MIN_ms>
<IDT_MAX_ms>50</IDT_MAX_ms>
<SIZE_DIST>uniform</SIZE_DIST>
<SIZE_MIN_byte>850</SIZE_MIN_byte>
<SIZE_MAX_byte>1408</SIZE_MAX_byte>
</CUSTOMIZED_TRAFFIC>
<!--</APPLICATION_CONFIG> --> <!--</APPLICATION_CONFIG> -->
<!-- DL --> <!-- DL -->
...@@ -108,7 +123,7 @@ ...@@ -108,7 +123,7 @@
<SOURCE_ID>1</SOURCE_ID> <SOURCE_ID>1</SOURCE_ID>
<TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL> <TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL>
<FLOW_START_ms>1600</FLOW_START_ms> <FLOW_START_ms>1600</FLOW_START_ms>
<FLOW_DURATION_ms>900</FLOW_DURATION_ms> <FLOW_DURATION_ms>1000</FLOW_DURATION_ms>
<IP_VERSION>ipv4</IP_VERSION> <IP_VERSION>ipv4</IP_VERSION>
<DESTINATION_ID>2</DESTINATION_ID> <DESTINATION_ID>2</DESTINATION_ID>
<IDT_DIST>uniform</IDT_DIST> <IDT_DIST>uniform</IDT_DIST>
...@@ -122,7 +137,7 @@ ...@@ -122,7 +137,7 @@
<CUSTOMIZED_TRAFFIC> <CUSTOMIZED_TRAFFIC>
<SOURCE_ID>0</SOURCE_ID> <SOURCE_ID>0</SOURCE_ID>
<TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL> <TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL>
<FLOW_START_ms>480</FLOW_START_ms> <FLOW_START_ms>4400</FLOW_START_ms>
<FLOW_DURATION_ms>1000</FLOW_DURATION_ms> <FLOW_DURATION_ms>1000</FLOW_DURATION_ms>
<IP_VERSION>ipv4</IP_VERSION> <IP_VERSION>ipv4</IP_VERSION>
<DESTINATION_ID>2</DESTINATION_ID> <DESTINATION_ID>2</DESTINATION_ID>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment