From 733aad491727db0dd9c96c6afd84cb2b91ebba34 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 30 May 2016 15:07:23 +0200 Subject: subscr_request_channel() -> subscr_request_conn() Change-Id: Ife8e10b240693a8d369139881774f1892044aa65 --- openbsc/include/openbsc/gsm_subscriber.h | 4 ++-- openbsc/src/libmsc/gsm_04_11.c | 3 +-- openbsc/src/libmsc/silent_call.c | 5 ++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h index 9055b99c5..7c4a0205f 100644 --- a/openbsc/include/openbsc/gsm_subscriber.h +++ b/openbsc/include/openbsc/gsm_subscriber.h @@ -134,8 +134,8 @@ int subscr_update_expire_lu(struct gsm_subscriber *subscr); /* * Paging handling with authentication */ -struct subscr_request *subscr_request_channel(struct gsm_subscriber *subscr, - int type, gsm_cbfn *cbfn, void *param); +struct subscr_request *subscr_request_conn(struct gsm_subscriber *subscr, + gsm_cbfn *cbfn, void *param); void subscr_remove_request(struct subscr_request *req); /* internal */ diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c index 729d2162d..8de638438 100644 --- a/openbsc/src/libmsc/gsm_04_11.c +++ b/openbsc/src/libmsc/gsm_04_11.c @@ -1004,8 +1004,7 @@ int gsm411_send_sms_subscr(struct gsm_subscriber *subscr, /* if not, we have to start paging */ LOGP(DLSMS, LOGL_DEBUG, "Sending SMS: no connection open, start paging %s\n", subscr_name(subscr)); - res = subscr_request_channel(subscr, RSL_CHANNEED_SDCCH, - paging_cb_send_sms, sms); + res = subscr_request_conn(subscr, paging_cb_send_sms, sms); if (!res) { send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, GSM_PAGING_BUSY); sms_free(sms); diff --git a/openbsc/src/libmsc/silent_call.c b/openbsc/src/libmsc/silent_call.c index 5d0b6ef19..5e637b627 100644 --- a/openbsc/src/libmsc/silent_call.c +++ b/openbsc/src/libmsc/silent_call.c @@ -123,7 +123,10 @@ int gsm_silent_call_start(struct gsm_subscriber *subscr, void *data, int type) { struct subscr_request *req; - req = subscr_request_channel(subscr, type, paging_cb_silent, data); + /* FIXME the VTY command allows selecting a silent call channel type. + * This doesn't apply to the situation after MSCSPLIT with an + * A-interface. */ + req = subscr_request_conn(subscr, paging_cb_silent, data); return req != NULL; } -- cgit v1.2.3