Commit c80d2ec4 authored by yaojie's avatar yaojie

fix error in timer stop missing

parent 9efd38d1
...@@ -63,7 +63,8 @@ typedef struct x2ap_ue_context_release_s { ...@@ -63,7 +63,8 @@ typedef struct x2ap_ue_context_release_s {
typedef enum { typedef enum {
X2AP_T_RELOC_PREP_TIMEOUT, X2AP_T_RELOC_PREP_TIMEOUT,
X2AP_TX2_RELOC_OVERALL_TIMEOUT X2AP_TX2_RELOC_OVERALL_TIMEOUT,
X2AP_UNKNOWN_CAUSE
} x2ap_handover_cancel_cause_t; } x2ap_handover_cancel_cause_t;
typedef struct x2ap_handover_cancel_s { typedef struct x2ap_handover_cancel_s {
......
...@@ -9134,6 +9134,9 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -9134,6 +9134,9 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
case X2AP_TX2_RELOC_OVERALL_TIMEOUT: case X2AP_TX2_RELOC_OVERALL_TIMEOUT:
cause = "Tx2_RelocOverall timeout"; cause = "Tx2_RelocOverall timeout";
break; break;
case X2AP_UNKNOWN_CAUSE:
cause = "UNKNOWN timeout";
break;
default: default:
/* cannot come here */ /* cannot come here */
exit(1); exit(1);
......
...@@ -1087,9 +1087,14 @@ int x2ap_eNB_handle_handover_cancel (instance_t instance, ...@@ -1087,9 +1087,14 @@ int x2ap_eNB_handle_handover_cancel (instance_t instance,
ie->value.choice.Cause.choice.radioNetwork == ie->value.choice.Cause.choice.radioNetwork ==
X2AP_CauseRadioNetwork_tx2relocoverall_expiry)) { X2AP_CauseRadioNetwork_tx2relocoverall_expiry)) {
X2AP_ERROR("%s %d: Cause not supported (only T_reloc_prep and TX2_reloc_overall handled)\n",__FILE__,__LINE__); X2AP_ERROR("%s %d: Cause not supported (only T_reloc_prep and TX2_reloc_overall handled)\n",__FILE__,__LINE__);
return -1; X2AP_ERROR("\tie->value.present=%u\n"
} "\tie->value.choice.Cause.present=%u\n"
"\tie->value.choice.Cause.choice.radioNetwork=%ld\n"
"\tie->value.choice.Cause.choice.radioNetwork=%ld\n",ie->value.present,ie->value.choice.Cause.present,
ie->value.choice.Cause.choice.radioNetwork,ie->value.choice.Cause.choice.radioNetwork);
//return -1;
}
cause = X2AP_UNKNOWN_CAUSE;
switch (ie->value.choice.Cause.choice.radioNetwork) { switch (ie->value.choice.Cause.choice.radioNetwork) {
case X2AP_CauseRadioNetwork_trelocprep_expiry: case X2AP_CauseRadioNetwork_trelocprep_expiry:
cause = X2AP_T_RELOC_PREP_TIMEOUT; cause = X2AP_T_RELOC_PREP_TIMEOUT;
...@@ -1097,7 +1102,8 @@ int x2ap_eNB_handle_handover_cancel (instance_t instance, ...@@ -1097,7 +1102,8 @@ int x2ap_eNB_handle_handover_cancel (instance_t instance,
case X2AP_CauseRadioNetwork_tx2relocoverall_expiry: case X2AP_CauseRadioNetwork_tx2relocoverall_expiry:
cause = X2AP_TX2_RELOC_OVERALL_TIMEOUT; cause = X2AP_TX2_RELOC_OVERALL_TIMEOUT;
break; break;
default: /* can't come here */ exit(1); default: /* can't come here */ //exit(1);
break;
} }
ue_id = x2ap_find_id_from_id_source(&instance_p->id_manager, id_source); ue_id = x2ap_find_id_from_id_source(&instance_p->id_manager, id_source);
......
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