From d42c3f25a683ab64b957b713ad930244a04b372c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 17 Jun 2010 17:35:57 +0800 Subject: bsc_api: Remove the lchan from the USSD code... --- openbsc/src/ussd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'openbsc/src/ussd.c') diff --git a/openbsc/src/ussd.c b/openbsc/src/ussd.c index 547691965..7f1489915 100644 --- a/openbsc/src/ussd.c +++ b/openbsc/src/ussd.c @@ -38,11 +38,11 @@ const char USSD_TEXT_OWN_NUMBER[] = "*#100#"; /* Forward declarations of network-specific handler functions */ -static int send_own_number(const struct msgb *msg, const struct ussd_request *req); +static int send_own_number(struct gsm_subscriber_connection *conn, const struct msgb *msg, const struct ussd_request *req); /* Entrypoint - handler function common to all mobile-originated USSDs */ -int handle_rcv_ussd(struct msgb *msg) +int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg) { struct ussd_request req; @@ -52,20 +52,20 @@ int handle_rcv_ussd(struct msgb *msg) if (strstr(USSD_TEXT_OWN_NUMBER, req.text) != NULL) { DEBUGP(DMM, "USSD: Own number requested\n"); - return send_own_number(msg, &req); + return send_own_number(conn, msg, &req); } else { DEBUGP(DMM, "Unhandled USSD %s\n", req.text); - return gsm0480_send_ussd_reject(msg, &req); + return gsm0480_send_ussd_reject(conn, msg, &req); } } /* A network-specific handler function */ -static int send_own_number(const struct msgb *msg, const struct ussd_request *req) +static int send_own_number(struct gsm_subscriber_connection *conn, const struct msgb *msg, const struct ussd_request *req) { - char *own_number = msg->lchan->conn.subscr->extension; + char *own_number = conn->subscr->extension; char response_string[GSM_EXTENSION_LENGTH + 20]; /* Need trailing CR as EOT character */ snprintf(response_string, sizeof(response_string), "Your extension is %s\r", own_number); - return gsm0480_send_ussd_response(msg, response_string, req); + return gsm0480_send_ussd_response(conn, msg, response_string, req); } -- cgit v1.2.3