Commit 0ae08168 authored by Ding Yumei's avatar Ding Yumei

fix s1ap StreamID issue

parent fc3d2ec6
...@@ -299,7 +299,7 @@ int s1ap_eNB_handle_s1_setup_response(uint32_t assoc_id, ...@@ -299,7 +299,7 @@ int s1ap_eNB_handle_s1_setup_response(uint32_t assoc_id,
if (stream != 0) { if (stream != 0) {
S1AP_ERROR("[SCTP %d] Received s1 setup response on stream != 0 (%d)\n", S1AP_ERROR("[SCTP %d] Received s1 setup response on stream != 0 (%d)\n",
assoc_id, stream); assoc_id, stream);
return -1; //return -1;
} }
if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
...@@ -786,7 +786,7 @@ int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id, ...@@ -786,7 +786,7 @@ int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id,
if (stream == 0) { if (stream == 0) {
S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n", S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n",
assoc_id, stream); assoc_id, stream);
return -1; //return -1;
} }
ue_desc_p->rx_stream = stream; ue_desc_p->rx_stream = stream;
...@@ -1022,7 +1022,7 @@ int s1ap_eNB_handle_e_rab_setup_request(uint32_t assoc_id, ...@@ -1022,7 +1022,7 @@ int s1ap_eNB_handle_e_rab_setup_request(uint32_t assoc_id,
if (stream == 0) { if (stream == 0) {
S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n", S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n",
assoc_id, stream); assoc_id, stream);
return -1; //return -1;
} }
ue_desc_p->rx_stream = stream; ue_desc_p->rx_stream = stream;
...@@ -1307,7 +1307,7 @@ int s1ap_eNB_handle_e_rab_modify_request(uint32_t assoc_id, ...@@ -1307,7 +1307,7 @@ int s1ap_eNB_handle_e_rab_modify_request(uint32_t assoc_id,
if (stream == 0) { if (stream == 0) {
S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n", S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n",
assoc_id, stream); assoc_id, stream);
return -1; //return -1;
} }
ue_desc_p->rx_stream = stream; ue_desc_p->rx_stream = stream;
...@@ -1439,7 +1439,7 @@ int s1ap_eNB_handle_e_rab_release_command(uint32_t assoc_id, ...@@ -1439,7 +1439,7 @@ int s1ap_eNB_handle_e_rab_release_command(uint32_t assoc_id,
if (stream == 0) { if (stream == 0) {
S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n", S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n",
assoc_id, stream); assoc_id, stream);
return -1; //return -1;
} }
ue_desc_p->rx_stream = stream; ue_desc_p->rx_stream = stream;
...@@ -1668,7 +1668,7 @@ int s1ap_eNB_handle_s1_path_switch_request_failure(uint32_t assoc_ ...@@ -1668,7 +1668,7 @@ int s1ap_eNB_handle_s1_path_switch_request_failure(uint32_t assoc_
if (stream != 0) { if (stream != 0) {
S1AP_ERROR("[SCTP %d] Received s1 path switch request failure on stream != 0 (%d)\n", S1AP_ERROR("[SCTP %d] Received s1 path switch request failure on stream != 0 (%d)\n",
assoc_id, stream); assoc_id, stream);
return -1; //return -1;
} }
if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
......
...@@ -468,7 +468,7 @@ int s1ap_eNB_handle_nas_downlink(uint32_t assoc_id, ...@@ -468,7 +468,7 @@ int s1ap_eNB_handle_nas_downlink(uint32_t assoc_id,
if (stream == 0) { if (stream == 0) {
S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream == 0\n", S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream == 0\n",
assoc_id); assoc_id);
return -1; //return -1;
} }
if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
......
...@@ -63,7 +63,7 @@ int s1ap_eNB_handle_overload_start(uint32_t assoc_id, ...@@ -63,7 +63,7 @@ int s1ap_eNB_handle_overload_start(uint32_t assoc_id,
S1AP_OverloadResponse_PR_overloadAction, 0, 0); S1AP_OverloadResponse_PR_overloadAction, 0, 0);
} }
/* Non UE-associated signalling -> stream 0 */ /* Non UE-associated signalling -> stream 0 */
DevCheck(stream == 0, stream, 0, 0); //DevCheck(stream == 0, stream, 0, 0);
if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
/* No MME context associated */ /* No MME context associated */
...@@ -93,7 +93,7 @@ int s1ap_eNB_handle_overload_stop(uint32_t assoc_id, ...@@ -93,7 +93,7 @@ int s1ap_eNB_handle_overload_stop(uint32_t assoc_id,
s1ap_eNB_mme_data_t *mme_desc_p; s1ap_eNB_mme_data_t *mme_desc_p;
/* Non UE-associated signalling -> stream 0 */ /* Non UE-associated signalling -> stream 0 */
DevCheck(stream == 0, stream, 0, 0); //DevCheck(stream == 0, stream, 0, 0);
if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) { if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
/* No MME context associated */ /* No MME context associated */
......
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