aboutsummaryrefslogtreecommitdiffstats
path: root/src/libmsc/a_iface_bssap.c
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-11-30 01:20:32 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-11-30 22:44:23 +0100
commitd03e7289156f1b54926a5a63ce97a3ef954f0c9d (patch)
tree39de328217485f1ae6d967e86fdd528f1224846c /src/libmsc/a_iface_bssap.c
parentf41658d52e0ee26283d6f2c67d369473ab671ed9 (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 'src/libmsc/a_iface_bssap.c')
-rw-r--r--src/libmsc/a_iface_bssap.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c
index 9a2333db5..77d84b32c 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -260,8 +260,6 @@ static int bssmap_rx_l3_compl(struct osmo_sccp_user *scu, const struct a_conn_in
uint16_t lac = 0;
uint8_t data_length;
const uint8_t *data;
- int rc;
-
struct gsm_network *network = a_conn_info->network;
struct gsm_subscriber_connection *conn;
@@ -345,17 +343,8 @@ static int bssmap_rx_l3_compl(struct osmo_sccp_user *scu, const struct a_conn_in
conn = subscr_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id);
/* Handover location update to the MSC code */
- rc = msc_compl_l3(conn, msg, 0);
-
- if (rc == MSC_CONN_ACCEPT) {
- LOGP(DMSC, LOGL_INFO, "User has been accepted by MSC.\n");
- return 0;
- } else if (rc == MSC_CONN_REJECT)
- LOGP(DMSC, LOGL_INFO, "User has been rejected by MSC.\n");
- else
- LOGP(DMSC, LOGL_INFO, "User has been rejected by MSC (unknown error)\n");
-
- return -EINVAL;
+ msc_compl_l3(conn, msg, 0);
+ return 0;
}
/* Endpoint to handle BSSMAP classmark update */