diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-04-17 18:16:48 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-04-20 16:17:38 +0200 |
commit | cde18c56321f34456d3c8ba8a3af411310e25400 (patch) | |
tree | 03bbd7133baa5f1d730a9544b582fddb830ed18f /src | |
parent | bfc9756c2ba158117d536482bc7486aff5c0538c (diff) |
bts: Rename bts_ms_by_{tlli,imsi} -> bts_get_ms_by_{tlli,imsi}
While at it, put them together and mark bts param as const.
This is a preparation for next patch.
Change-Id: Iad8aec4424f1f23cd4d02a14c4f9ec1b9fdb1f75
Diffstat (limited to 'src')
-rw-r--r-- | src/bts.cpp | 14 | ||||
-rw-r--r-- | src/bts.h | 4 | ||||
-rw-r--r-- | src/gprs_bssgp_pcu.c | 4 | ||||
-rw-r--r-- | src/gprs_ms.c | 2 | ||||
-rw-r--r-- | src/pcu_l1_if.cpp | 2 | ||||
-rw-r--r-- | src/pdch.cpp | 6 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/bts.cpp b/src/bts.cpp index 30450bc1..e3a5eeb9 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -724,7 +724,7 @@ int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32 } /* Find related TBF and send confirmation signal to FSM */ - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) { LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm for unknown MS with TLLI=%08x\n", fn, tlli); return -EINVAL; @@ -1212,11 +1212,16 @@ struct GprsMsStorage *bts_ms_store(const struct gprs_rlcmac_bts *bts) return bts->ms_store; } -struct GprsMs *bts_ms_by_tlli(struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli) +struct GprsMs *bts_get_ms_by_tlli(const struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli) { return bts_ms_store(bts)->get_ms(tlli, old_tlli); } +struct GprsMs *bts_get_ms_by_imsi(const struct gprs_rlcmac_bts *bts, const char *imsi) +{ + return bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); +} + /* update TA based on TA provided by PH-DATA-IND */ void update_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, int8_t ta_delta) { @@ -1422,11 +1427,6 @@ void bts_recalc_max_mcs(struct gprs_rlcmac_bts *bts) bts_set_max_mcs_ul(bts, mcs_ul); } -struct GprsMs *bts_ms_by_imsi(struct gprs_rlcmac_bts *bts, const char *imsi) -{ - return bts_ms_store(bts)->get_ms(GSM_RESERVED_TMSI, GSM_RESERVED_TMSI, imsi); -} - const struct llist_head* bts_ms_list(struct gprs_rlcmac_bts *bts) { return bts_ms_store(bts)->ms_list(); @@ -331,7 +331,8 @@ void bts_send_gsmtap_rach(struct gprs_rlcmac_bts *bts, struct GprsMsStorage *bts_ms_store(const struct gprs_rlcmac_bts *bts); -struct GprsMs *bts_ms_by_tlli(struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli); +struct GprsMs *bts_get_ms_by_tlli(const struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t old_tlli); +struct GprsMs *bts_get_ms_by_imsi(const struct gprs_rlcmac_bts *bts, const char *imsi); static inline struct rate_ctr_group *bts_rate_counters(struct gprs_rlcmac_bts *bts) { @@ -369,7 +370,6 @@ void bts_recalc_initial_cs(struct gprs_rlcmac_bts *bts); void bts_recalc_initial_mcs(struct gprs_rlcmac_bts *bts); void bts_recalc_max_cs(struct gprs_rlcmac_bts *bts); void bts_recalc_max_mcs(struct gprs_rlcmac_bts *bts); -struct GprsMs *bts_ms_by_imsi(struct gprs_rlcmac_bts *bts, const char *imsi); uint8_t bts_max_cs_dl(const struct gprs_rlcmac_bts *bts); uint8_t bts_max_cs_ul(const struct gprs_rlcmac_bts *bts); uint8_t bts_max_mcs_dl(const struct gprs_rlcmac_bts *bts); diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index 656342e8..2c5a97a7 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -244,9 +244,9 @@ static int gprs_bssgp_pcu_rx_paging_cs(struct msgb *msg, const struct tlv_parsed * target MS is using. */ llist_for_each_entry(bts, &the_pcu->bts_list, list) { /* TODO: Match by TMSI before IMSI if present?! */ - ms = bts_ms_by_tlli(bts, req.tlli, req.tlli); + ms = bts_get_ms_by_tlli(bts, req.tlli, req.tlli); if (!ms && req.mi_imsi_present) - ms = bts_ms_by_imsi(bts, req.mi_imsi.imsi); + ms = bts_get_ms_by_imsi(bts, req.mi_imsi.imsi); bts_add_paging(bts, &req, ms); } diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 9ce3d823..909e7f8b 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -558,7 +558,7 @@ void ms_set_imsi(struct GprsMs *ms, const char *imsi) "Modifying MS object, TLLI = 0x%08x, IMSI '%s' -> '%s'\n", ms_tlli(ms), ms->imsi, imsi); - struct GprsMs *old_ms = bts_ms_by_imsi(ms->bts, imsi); + struct GprsMs *old_ms = bts_get_ms_by_imsi(ms->bts, imsi); /* Check if we are going to store a different MS object with already existing IMSI. This is probably a bug in code calling this function, since it should take care of this explicitly */ diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 577ba570..7068083a 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -1071,7 +1071,7 @@ static int pcu_rx_pag_req(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_pag_req case GSM_MI_TYPE_IMSI: req.mi_imsi = mi; req.mi_imsi_present = true; - ms = bts_ms_by_imsi(bts, req.mi_imsi.imsi); + ms = bts_get_ms_by_imsi(bts, req.mi_imsi.imsi); break; default: LOGP(DL1IF, LOGL_ERROR, "Unexpected MI type %u\n", mi.type); diff --git a/src/pdch.cpp b/src/pdch.cpp index e397a8f7..081c306d 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -348,7 +348,7 @@ void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet, LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "PACKET CONTROL ACK with " "unknown FN=%u TLLI=0x%08x (TRX %d TS %d)\n", fn, tlli, trx_no(), ts_no); - ms = bts_ms_by_tlli(bts(), tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts(), tlli, GSM_RESERVED_TMSI); if (ms) LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "PACKET CONTROL ACK with " "unknown TBF corresponds to MS with IMSI %s, TA %d, " @@ -664,7 +664,7 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, /* First gather MS from TLLI/DL_TFI/UL_TFI:*/ if (request->ID.UnionType) { /* ID_TYPE = TLLI */ uint32_t tlli = request->ID.u.TLLI; - ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) { ms = bts_alloc_ms(bts); ms_set_tlli(ms, tlli); @@ -854,7 +854,7 @@ void gprs_rlcmac_pdch::rcv_measurement_report(Packet_Measurement_Report_t *repor struct pdch_ulc_node *poll; GprsMs *ms; - ms = bts_ms_by_tlli(bts(), report->TLLI, GSM_RESERVED_TMSI); + ms = bts_get_ms_by_tlli(bts(), report->TLLI, GSM_RESERVED_TMSI); if (!ms) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "MS send measurement " "but TLLI 0x%08x is unknown\n", report->TLLI); |