sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move enb_ostream_id from mme_ue to enb_ue (#206)

This commit is contained in:
Sukchan Lee 2019-06-28 18:11:16 +09:00
parent 6901278816
commit a4d18c2d96
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mme/mme-context.c
View File

@ -1790,6 +1790,16 @@ enb_ue_t* enb_ue_add(mme_enb_t *enb)
enb_ue->enb_ue_s1ap_id = INVALID_UE_S1AP_ID;
enb_ue->mme_ue_s1ap_id = NEXT_ID(self.mme_ue_s1ap_id, 1, 0xffffffff);
/*
* SCTP output stream identification
* Default context_self()->config.parameter.sctp_streams : 30
* 0 : Non UE signalling
* 1-29 : UE specific association
*/
enb_ue->enb_ostream_id =
NEXT_ID(enb->ostream_id, 1, enb->max_num_of_ostreams-1);
enb_ue->enb = enb;
ogs_hash_set(self.mme_ue_s1ap_id_hash, &enb_ue->mme_ue_s1ap_id,
@ -1948,15 +1958,6 @@ mme_ue_t* mme_ue_add(enb_ue_t *enb_ue)
ogs_assert(mme_ue->mme_s11_teid > 0 &&
mme_ue->mme_s11_teid <= context_self()->pool.ue);
/*
* SCTP output stream identification
* Default context_self()->config.parameter.sctp_streams : 30
* 0 : Non UE signalling
* 1-29 : UE specific association
*/
mme_ue->enb_ostream_id =
NEXT_ID(enb->ostream_id, 1, enb->max_num_of_ostreams-1);
/* Create New GUTI */
mme_ue_new_guti(mme_ue);

3
src/mme/mme-context.h
View File

@ -215,6 +215,8 @@ struct enb_ue_s {
uint32_t enb_ue_s1ap_id; /* eNB-UE-S1AP-ID received from eNB */
uint32_t mme_ue_s1ap_id; /* MME-UE-S1AP-ID received from MME */
uint16_t enb_ostream_id; /* SCTP output stream id for eNB */
/* Handover Info */
S1AP_HandoverType_t handover_type;
enb_ue_t *source_ue;
@ -278,7 +280,6 @@ struct mme_ue_s {
uint32_t mme_s11_teid; /* MME-S11-TEID is derived from INDEX */
uint32_t sgw_s11_teid; /* SGW-S11-TEID is received from SGW */
uint16_t enb_ostream_id; /* SCTP output stream id for eNB */
uint16_t vlr_ostream_id; /* SCTP output stream id for VLR */
/* UE Info */

2
src/mme/s1ap-path.c
View File

@ -103,7 +103,7 @@ int s1ap_send_to_enb_ue(enb_ue_t *enb_ue, ogs_pkbuf_t *pkbuf)
mme_ue = enb_ue->mme_ue;
ogs_assert(mme_ue);
return s1ap_send_to_enb(enb, pkbuf, mme_ue->enb_ostream_id);
return s1ap_send_to_enb(enb, pkbuf, enb_ue->enb_ostream_id);
}
int s1ap_delayed_send_to_enb_ue(