diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 01:20:32 +0100 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 22:44:23 +0100 |
commit | d03e7289156f1b54926a5a63ce97a3ef954f0c9d (patch) | |
tree | 39de328217485f1ae6d967e86fdd528f1224846c /include/osmocom | |
parent | f41658d52e0ee26283d6f2c67d369473ab671ed9 (diff) |
drop msc_compl_l3() return value
msc_compl_l3() always returns MSC_CONN_ACCEPT, because the conn FSM handles (or
should handle) all reject cases. The accept/reject return value is a legacy
from libbsc internally passing a conn over to libmsc, in osmo-nitb.
Drop enum msc_compl_l3_rc.
Change msc_compl_l3_rc() to return void.
Change all callers to always act like for acceptance, as they always did anyway.
Drop some local variables now no longer needed.
Adjust the comment to msc_compl_l3().
Drop a bunch of #if-0'd code from msc_compl_l3().
Change-Id: I759d15f4e820d5fc16397ed7210ce92308e52a09
Diffstat (limited to 'include/osmocom')
-rw-r--r-- | include/osmocom/msc/osmo_msc.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index ad81da5d5..674de3bb3 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -40,11 +40,6 @@ enum subscr_conn_fsm_state { SUBSCR_CONN_S_RELEASED, }; -enum msc_compl_l3_rc { - MSC_CONN_ACCEPT = 0, - MSC_CONN_REJECT = 1, -}; - struct gsm_subscriber_connection *msc_subscr_conn_alloc(struct gsm_network *network, enum ran_type via_ran, uint16_t lac); @@ -59,8 +54,8 @@ int msc_vlr_start(struct gsm_network *net); void msc_sapi_n_reject(struct gsm_subscriber_connection *conn, int dlci); int msc_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause); -int msc_compl_l3(struct gsm_subscriber_connection *conn, - struct msgb *msg, uint16_t chosen_channel); +void msc_compl_l3(struct gsm_subscriber_connection *conn, + struct msgb *msg, uint16_t chosen_channel); void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg); int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv); |