Commit 7f015358 authored by gauthier's avatar gauthier

SCTP issue: accept a mme stream id different from the one sent by eNB

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7683 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 53d1a18b
...@@ -117,7 +117,7 @@ int s1ap_ue_context_release_complete(instance_t instance, ...@@ -117,7 +117,7 @@ int s1ap_ue_context_release_complete(instance_t instance,
/* UE associated signalling -> use the allocated stream */ /* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance, s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer, ue_context_p->mme_ref->assoc_id, buffer,
length, ue_context_p->stream); length, ue_context_p->tx_stream);
//LG s1ap_eNB_itti_send_sctp_close_association(s1ap_eNB_instance_p->instance, //LG s1ap_eNB_itti_send_sctp_close_association(s1ap_eNB_instance_p->instance,
...@@ -234,7 +234,7 @@ int s1ap_ue_context_release_req(instance_t instance, ...@@ -234,7 +234,7 @@ int s1ap_ue_context_release_req(instance_t instance,
/* UE associated signalling -> use the allocated stream */ /* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance, s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer, ue_context_p->mme_ref->assoc_id, buffer,
length, ue_context_p->stream); length, ue_context_p->tx_stream);
return 0; return 0;
} }
......
...@@ -712,12 +712,14 @@ int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id, ...@@ -712,12 +712,14 @@ int s1ap_eNB_handle_initial_context_request(uint32_t assoc_id,
} }
/* Initial context request = UE-related procedure -> stream != 0 */ /* Initial context request = UE-related procedure -> stream != 0 */
if (stream != ue_desc_p->stream) { if (stream == 0) {
S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d) whereas expecting (%d)\n", S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n",
assoc_id, stream, ue_desc_p->stream); assoc_id, stream);
return -1; return -1;
} }
ue_desc_p->rx_stream = stream;
ue_desc_p->mme_ue_s1ap_id = initialContextSetupRequest_p->mme_ue_s1ap_id; ue_desc_p->mme_ue_s1ap_id = initialContextSetupRequest_p->mme_ue_s1ap_id;
message_p = itti_alloc_new_message(TASK_S1AP, S1AP_INITIAL_CONTEXT_SETUP_REQ); message_p = itti_alloc_new_message(TASK_S1AP, S1AP_INITIAL_CONTEXT_SETUP_REQ);
......
...@@ -226,7 +226,7 @@ int s1ap_eNB_handle_nas_first_req( ...@@ -226,7 +226,7 @@ int s1ap_eNB_handle_nas_first_req(
mme_desc_p->nextstream += 1; mme_desc_p->nextstream += 1;
} }
ue_desc_p->stream = mme_desc_p->nextstream; ue_desc_p->tx_stream = mme_desc_p->nextstream;
MSC_LOG_TX_MESSAGE( MSC_LOG_TX_MESSAGE(
MSC_S1AP_ENB, MSC_S1AP_ENB,
...@@ -239,7 +239,7 @@ int s1ap_eNB_handle_nas_first_req( ...@@ -239,7 +239,7 @@ int s1ap_eNB_handle_nas_first_req(
/* Send encoded message over sctp */ /* Send encoded message over sctp */
s1ap_eNB_itti_send_sctp_data_req(instance_p->instance, mme_desc_p->assoc_id, s1ap_eNB_itti_send_sctp_data_req(instance_p->instance, mme_desc_p->assoc_id,
buffer, length, ue_desc_p->stream); buffer, length, ue_desc_p->tx_stream);
return 0; return 0;
} }
...@@ -295,6 +295,14 @@ int s1ap_eNB_handle_nas_downlink(const uint32_t assoc_id, ...@@ -295,6 +295,14 @@ int s1ap_eNB_handle_nas_downlink(const uint32_t assoc_id,
return -1; return -1;
} }
if (0 == ue_desc_p->rx_stream) {
ue_desc_p->rx_stream = stream;
} else if (stream != ue_desc_p->rx_stream) {
S1AP_ERROR("[SCTP %d] Received UE-related procedure on stream %u, expecting %u\n",
assoc_id, stream, ue_desc_p->rx_stream);
return -1;
}
/* Is it the first outcome of the MME for this UE ? If so store the mme /* Is it the first outcome of the MME for this UE ? If so store the mme
* UE s1ap id. * UE s1ap id.
*/ */
...@@ -308,6 +316,7 @@ int s1ap_eNB_handle_nas_downlink(const uint32_t assoc_id, ...@@ -308,6 +316,7 @@ int s1ap_eNB_handle_nas_downlink(const uint32_t assoc_id,
downlink_NAS_transport_p->mme_ue_s1ap_id, downlink_NAS_transport_p->mme_ue_s1ap_id,
ue_desc_p->mme_ue_s1ap_id ue_desc_p->mme_ue_s1ap_id
); );
return -1;
} }
} }
...@@ -425,7 +434,7 @@ int s1ap_eNB_nas_uplink(instance_t instance, s1ap_uplink_nas_t *s1ap_uplink_nas_ ...@@ -425,7 +434,7 @@ int s1ap_eNB_nas_uplink(instance_t instance, s1ap_uplink_nas_t *s1ap_uplink_nas_
/* UE associated signalling -> use the allocated stream */ /* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance, s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer, ue_context_p->mme_ref->assoc_id, buffer,
length, ue_context_p->stream); length, ue_context_p->tx_stream);
return 0; return 0;
} }
...@@ -503,7 +512,7 @@ void s1ap_eNB_nas_non_delivery_ind(instance_t instance, ...@@ -503,7 +512,7 @@ void s1ap_eNB_nas_non_delivery_ind(instance_t instance,
/* UE associated signalling -> use the allocated stream */ /* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance, s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer, ue_context_p->mme_ref->assoc_id, buffer,
length, ue_context_p->stream); length, ue_context_p->tx_stream);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
...@@ -593,7 +602,7 @@ int s1ap_eNB_initial_ctxt_resp( ...@@ -593,7 +602,7 @@ int s1ap_eNB_initial_ctxt_resp(
/* UE associated signalling -> use the allocated stream */ /* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance, s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer, ue_context_p->mme_ref->assoc_id, buffer,
length, ue_context_p->stream); length, ue_context_p->tx_stream);
return ret; return ret;
} }
...@@ -672,7 +681,7 @@ int s1ap_eNB_ue_capabilities(instance_t instance, ...@@ -672,7 +681,7 @@ int s1ap_eNB_ue_capabilities(instance_t instance,
/* UE associated signalling -> use the allocated stream */ /* UE associated signalling -> use the allocated stream */
s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance, s1ap_eNB_itti_send_sctp_data_req(s1ap_eNB_instance_p->instance,
ue_context_p->mme_ref->assoc_id, buffer, ue_context_p->mme_ref->assoc_id, buffer,
length, ue_context_p->stream); length, ue_context_p->tx_stream);
return ret; return ret;
} }
......
...@@ -76,7 +76,7 @@ void s1ap_eNB_generate_trace_failure(struct s1ap_eNB_ue_context_s *ue_desc_p, ...@@ -76,7 +76,7 @@ void s1ap_eNB_generate_trace_failure(struct s1ap_eNB_ue_context_s *ue_desc_p,
s1ap_eNB_itti_send_sctp_data_req(ue_desc_p->mme_ref->s1ap_eNB_instance->instance, s1ap_eNB_itti_send_sctp_data_req(ue_desc_p->mme_ref->s1ap_eNB_instance->instance,
ue_desc_p->mme_ref->assoc_id, buffer, ue_desc_p->mme_ref->assoc_id, buffer,
length, ue_desc_p->stream); length, ue_desc_p->tx_stream);
} }
int s1ap_eNB_handle_trace_start(uint32_t assoc_id, int s1ap_eNB_handle_trace_start(uint32_t assoc_id,
......
...@@ -66,7 +66,8 @@ typedef struct s1ap_eNB_ue_context_s { ...@@ -66,7 +66,8 @@ typedef struct s1ap_eNB_ue_context_s {
uint32_t mme_ue_s1ap_id; uint32_t mme_ue_s1ap_id;
/* Stream used for this particular UE */ /* Stream used for this particular UE */
int32_t stream; int32_t tx_stream;
int32_t rx_stream;
/* Current UE state. */ /* Current UE state. */
s1ap_ue_state ue_state; s1ap_ue_state ue_state;
......
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