diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2021-11-05 02:00:17 +0100 |
|---|---|---|
| committer | Alexander Couzens <lynxis@fe80.eu> | 2021-11-27 04:39:34 +0100 |
| commit | 2c5e46104e2fe718e6e68739ef70c4f8b1a586fe (patch) | |
| tree | d8aa94a4e5968c8e29eb44ac6e1b89ffc8725862 /src | |
| parent | 8b7d78588aa33489d9055afbf8e3c4d203bc6839 (diff) | |
libmsc/gsm_04_08: refactor require ciphering into an own function
Make it more readable.
Change-Id: I9e407f65b282e645feabe714f7f4c3e44fae21e9
Diffstat (limited to 'src')
| -rw-r--r-- | src/libmsc/gsm_04_08.c | 8 | ||||
| -rw-r--r-- | src/libmsc/msc_a.c | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 075ef0fd2..b5d46fda3 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -415,7 +415,7 @@ static int mm_rx_loc_upd_req(struct msc_a *msc_a, struct msgb *msg) net->vlr, msc_a, vlr_lu_type, tmsi, imsi, &old_lai, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran ? net->uea_encryption_mask > (1 << OSMO_UTRAN_UEA0) : net->a5_encryption_mask > 0x01, + msc_a_require_ciphering(msc_a), lu->key_seq, osmo_gsm48_classmark1_is_r99(&lu->classmark1), is_utran, @@ -806,7 +806,7 @@ int gsm48_rx_mm_serv_req(struct msc_a *msc_a, struct msgb *msg) req->cm_service_type, &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran ? net->uea_encryption_mask > (1 << OSMO_UTRAN_UEA0) : net->a5_encryption_mask > 0x01, + msc_a_require_ciphering(msc_a), req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -932,7 +932,7 @@ static int gsm48_rx_cm_reest_req(struct msc_a *msc_a, struct msgb *msg) VLR_PR_ARQ_T_CM_RE_ESTABLISH_REQ, 0, &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran ? net->uea_encryption_mask > (1 << OSMO_UTRAN_UEA0) : net->a5_encryption_mask > 0x01, + msc_a_require_ciphering(msc_a), req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -1294,7 +1294,7 @@ static int gsm48_rx_rr_pag_resp(struct msc_a *msc_a, struct msgb *msg) net->vlr, msc_a, VLR_PR_ARQ_T_PAGING_RESP, 0, &mi, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran ? net->uea_encryption_mask > (1 << OSMO_UTRAN_UEA0) : net->a5_encryption_mask > 0x01, + msc_a_require_ciphering(msc_a), pr->key_seq, osmo_gsm48_classmark2_is_r99(cm2, classmark2_len), is_utran); diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 583f9e7b2..74721d2de 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -106,6 +106,16 @@ struct msc_a *msc_a_fi_priv(struct osmo_fsm_inst *fi) return fi->priv; } +bool msc_a_require_ciphering(const struct msc_a *msc_a) +{ + struct gsm_network *net = msc_a_net(msc_a); + bool is_utran = (msc_a->c.ran->type == OSMO_RAT_UTRAN_IU); + if (is_utran) + return net->uea_encryption_mask > (1 << OSMO_UTRAN_UEA0); + else + return net->a5_encryption_mask > 0x1; +} + static void update_counters(struct osmo_fsm_inst *fi, bool conn_accepted) { struct msc_a *msc_a = fi->priv; |