From 12d221f8cc5ae02cce0a8a228dbc710a55a3a46a Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Wed, 4 Apr 2018 05:30:16 +0700 Subject: libmsc/gsm_04_80.c: drop unused 'in_msg' argument It isn't used, so no need to pass it. Change-Id: I4248ebf8626d3f7f0bf273fd20cc4f64e979938b --- src/libmsc/gsm_04_80.c | 4 +--- src/libmsc/ussd.c | 13 +++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c index 37e058cb6..12b41a19d 100644 --- a/src/libmsc/gsm_04_80.c +++ b/src/libmsc/gsm_04_80.c @@ -62,8 +62,7 @@ static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, /* Send response to a mobile-originated ProcessUnstructuredSS-Request */ int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, - const struct msgb *in_msg, const char *response_text, - const struct ss_request *req) + const char *response_text, const struct ss_request *req) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD RSP"); struct gsm48_hdr *gh; @@ -110,7 +109,6 @@ int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, } int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, - const struct msgb *in_msg, const struct ss_request *req) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD REJ"); diff --git a/src/libmsc/ussd.c b/src/libmsc/ussd.c index eeab52a14..748cfbbd0 100644 --- a/src/libmsc/ussd.c +++ b/src/libmsc/ussd.c @@ -40,7 +40,8 @@ const char USSD_TEXT_OWN_NUMBER[] = "*#100#"; /* A network-specific handler function */ -static int send_own_number(struct gsm_subscriber_connection *conn, const struct msgb *msg, const struct ss_request *req) +static int send_own_number(struct gsm_subscriber_connection *conn, + const struct ss_request *req) { char *own_number = conn->vsub->msisdn; char response_string[GSM_EXTENSION_LENGTH + 20]; @@ -50,7 +51,7 @@ static int send_own_number(struct gsm_subscriber_connection *conn, const struct /* Need trailing CR as EOT character */ snprintf(response_string, sizeof(response_string), "Your extension is %s\r", own_number); - return gsm0480_send_ussd_response(conn, msg, response_string, req); + return gsm0480_send_ussd_response(conn, response_string, req); } /* Entrypoint - handler function common to all mobile-originated USSDs */ @@ -72,7 +73,7 @@ int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg) rc = gsm0480_decode_ss_request(gh, msgb_l3len(msg), &req); if (!rc) { DEBUGP(DMM, "Unhandled SS\n"); - rc = gsm0480_send_ussd_reject(conn, msg, &req); + rc = gsm0480_send_ussd_reject(conn, &req); return rc; } @@ -80,7 +81,7 @@ int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg) if (req.ussd_text[0] == '\0' || req.ussd_text[0] == 0xFF) { if (req.ss_code > 0) { /* Assume interrogateSS or modification of it and reject */ - rc = gsm0480_send_ussd_reject(conn, msg, &req); + rc = gsm0480_send_ussd_reject(conn, &req); return rc; } /* Still assuming a Release-Complete and returning */ @@ -90,10 +91,10 @@ int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg) msc_subscr_conn_communicating(conn); if (!strcmp(USSD_TEXT_OWN_NUMBER, (const char *)req.ussd_text)) { DEBUGP(DMM, "USSD: Own number requested\n"); - rc = send_own_number(conn, msg, &req); + rc = send_own_number(conn, &req); } else { DEBUGP(DMM, "Unhandled USSD %s\n", req.ussd_text); - rc = gsm0480_send_ussd_reject(conn, msg, &req); + rc = gsm0480_send_ussd_reject(conn, &req); } return rc; -- cgit v1.2.3