libmsc/gsm_04_80.c: drop unused 'in_msg' argument
It isn't used, so no need to pass it. Change-Id: I4248ebf8626d3f7f0bf273fd20cc4f64e979938b
This commit is contained in:
parent
01c0549af3
commit
12d221f8cc
|
@ -7,10 +7,9 @@
|
||||||
struct gsm_subscriber_connection;
|
struct gsm_subscriber_connection;
|
||||||
|
|
||||||
int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn,
|
int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn,
|
||||||
const struct msgb *in_msg, const char* response_text,
|
const char* response_text,
|
||||||
const struct ss_request *req);
|
const struct ss_request *req);
|
||||||
int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn,
|
int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn,
|
||||||
const struct msgb *msg,
|
|
||||||
const struct ss_request *request);
|
const struct ss_request *request);
|
||||||
|
|
||||||
int msc_send_ussd_notify(struct gsm_subscriber_connection *conn, int level,
|
int msc_send_ussd_notify(struct gsm_subscriber_connection *conn, int level,
|
||||||
|
|
|
@ -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 */
|
/* Send response to a mobile-originated ProcessUnstructuredSS-Request */
|
||||||
int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn,
|
int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn,
|
||||||
const struct msgb *in_msg, const char *response_text,
|
const char *response_text, const struct ss_request *req)
|
||||||
const struct ss_request *req)
|
|
||||||
{
|
{
|
||||||
struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD RSP");
|
struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD RSP");
|
||||||
struct gsm48_hdr *gh;
|
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,
|
int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn,
|
||||||
const struct msgb *in_msg,
|
|
||||||
const struct ss_request *req)
|
const struct ss_request *req)
|
||||||
{
|
{
|
||||||
struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD REJ");
|
struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD REJ");
|
||||||
|
|
|
@ -40,7 +40,8 @@
|
||||||
const char USSD_TEXT_OWN_NUMBER[] = "*#100#";
|
const char USSD_TEXT_OWN_NUMBER[] = "*#100#";
|
||||||
|
|
||||||
/* A network-specific handler function */
|
/* 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 *own_number = conn->vsub->msisdn;
|
||||||
char response_string[GSM_EXTENSION_LENGTH + 20];
|
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 */
|
/* Need trailing CR as EOT character */
|
||||||
snprintf(response_string, sizeof(response_string), "Your extension is %s\r", own_number);
|
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 */
|
/* 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);
|
rc = gsm0480_decode_ss_request(gh, msgb_l3len(msg), &req);
|
||||||
if (!rc) {
|
if (!rc) {
|
||||||
DEBUGP(DMM, "Unhandled SS\n");
|
DEBUGP(DMM, "Unhandled SS\n");
|
||||||
rc = gsm0480_send_ussd_reject(conn, msg, &req);
|
rc = gsm0480_send_ussd_reject(conn, &req);
|
||||||
return rc;
|
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.ussd_text[0] == '\0' || req.ussd_text[0] == 0xFF) {
|
||||||
if (req.ss_code > 0) {
|
if (req.ss_code > 0) {
|
||||||
/* Assume interrogateSS or modification of it and reject */
|
/* 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;
|
return rc;
|
||||||
}
|
}
|
||||||
/* Still assuming a Release-Complete and returning */
|
/* 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);
|
msc_subscr_conn_communicating(conn);
|
||||||
if (!strcmp(USSD_TEXT_OWN_NUMBER, (const char *)req.ussd_text)) {
|
if (!strcmp(USSD_TEXT_OWN_NUMBER, (const char *)req.ussd_text)) {
|
||||||
DEBUGP(DMM, "USSD: Own number requested\n");
|
DEBUGP(DMM, "USSD: Own number requested\n");
|
||||||
rc = send_own_number(conn, msg, &req);
|
rc = send_own_number(conn, &req);
|
||||||
} else {
|
} else {
|
||||||
DEBUGP(DMM, "Unhandled USSD %s\n", req.ussd_text);
|
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;
|
return rc;
|
||||||
|
|
Loading…
Reference in New Issue