diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-09 14:59:44 +0100 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-10 05:17:38 +0100 |
commit | d656dff235cbd3d18c929c718a25cfcdeef60e9a (patch) | |
tree | d1557e8a3e13530f454132916c45c47cf9a32bbe /src/libmsc/silent_call.c | |
parent | e9495388d9fdcf9b3abe3919faa0b6ec2a7fa416 (diff) |
silent call: clarify rc and error messages logged on vty
In gsm_silent_call_{start,stop}(), return meaningful error codes and interpret
them on the VTY to clearly indicate the result.
Change-Id: Id5abb8f2ba901689e03040af8e51483b6c618e7f
Diffstat (limited to 'src/libmsc/silent_call.c')
-rw-r--r-- | src/libmsc/silent_call.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index f3291d77f..1ea2305ed 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -30,6 +30,7 @@ #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/osmo_msc.h> +#include <osmocom/msc/vlr.h> /* paging of the requested subscriber has completed */ static int paging_cb_silent(unsigned int hooknum, unsigned int event, @@ -130,7 +131,9 @@ int gsm_silent_call_start(struct vlr_subscr *vsub, void *data, int type) * A-interface. */ req = subscr_request_conn(vsub, paging_cb_silent, data, "establish silent call"); - return req != NULL; + if (!req) + return -ENODEV; + return 0; } /* end a silent call with a given subscriber */ @@ -139,12 +142,18 @@ int gsm_silent_call_stop(struct vlr_subscr *vsub) struct gsm_subscriber_connection *conn; conn = connection_for_subscr(vsub); - if (!conn) - return -EINVAL; + if (!conn) { + LOGP(DMM, LOGL_ERROR, "%s: Cannot stop silent call, no connection for subscriber\n", + vlr_subscr_name(vsub)); + return -ENODEV; + } /* did we actually establish a silent call for this guy? */ - if (!conn->silent_call) - return -EINVAL; + if (!conn->silent_call) { + LOGP(DMM, LOGL_ERROR, "%s: Cannot stop silent call, subscriber has no active silent call\n", + vlr_subscr_name(vsub)); + return -ENOENT; + } #if BEFORE_MSCSPLIT /* Re-enable this log output once we can obtain this information via |