From: Yang Gu <yang.gu@intel.com>
To: ofono@ofono.org
Subject: [PATCH 06/12] Refactor ussd parser
Date: Sun, 13 Jun 2010 17:43:16 +0800 [thread overview]
Message-ID: <1276422202-16240-6-git-send-email-yang.gu@intel.com> (raw)
In-Reply-To: <1276422202-16240-1-git-send-email-yang.gu@intel.com>
[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]
---
drivers/isimodem/ussd.c | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c
index 8be20b6..10bee0f 100644
--- a/drivers/isimodem/ussd.c
+++ b/drivers/isimodem/ussd.c
@@ -47,6 +47,7 @@
#include "isiutil.h"
#include "ss.h"
#include "debug.h"
+#include "ussdutil.h"
struct ussd_data {
GIsiClient *client;
@@ -73,44 +74,21 @@ static void ussd_parse(struct ofono_ussd *ussd, const void *restrict data,
size_t len)
{
const unsigned char *msg = data;
- unsigned char buf[256];
- unsigned char *unpacked;
- long written;
- int status;
+ int status = OFONO_USSD_STATUS_NOT_SUPPORTED;
char *converted = NULL;
- gboolean udhi;
- enum sms_charset charset;
- gboolean compressed;
- gboolean iso639;
if (!msg || len < 4)
- goto error;
+ goto out;
status = isi_type_to_status(msg[2]);
if (msg[3] == 0 || (size_t)(msg[3] + 4) > len)
- goto error;
-
- if (!cbs_dcs_decode(msg[1], &udhi, NULL, &charset,
- &compressed, NULL, &iso639))
- goto error;
-
- if (udhi || compressed || iso639)
- goto error;
-
- if (charset != SMS_CHARSET_7BIT)
- goto error;
-
- unpacked = unpack_7bit_own_buf(msg + 4, msg[3], 0, TRUE,
- SS_MAX_USSD_LENGTH, &written, 0, buf);
+ goto out;
- converted = convert_gsm_to_utf8((const guint8 *)unpacked, written,
- NULL, NULL, 0);
+ converted = ussd_decode(msg[1], msg[3], msg + 4);
- goto out;
-
-error:
- status = OFONO_USSD_STATUS_NOT_SUPPORTED;
+ if (converted)
+ status = OFONO_USSD_STATUS_NOTIFY;
out:
ofono_ussd_notify(ussd, status, converted);
--
1.7.0.4
next prev parent reply other threads:[~2010-06-13 9:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-13 9:43 [PATCH 01/12] stk: Add parser for send ss commands Yang Gu
2010-06-13 9:43 ` [PATCH 02/12] teststk: Add test for send ss parser Yang Gu
2010-06-13 9:43 ` [PATCH 03/12] stk: Add parser for send ussd commands Yang Gu
2010-06-16 22:44 ` Denis Kenzior
2010-06-13 9:43 ` [PATCH 04/12] teststk: Add test for send ussd parser Yang Gu
2010-06-13 9:43 ` [PATCH 05/12] Modify " Yang Gu
2010-06-16 22:48 ` Denis Kenzior
2010-06-17 10:33 ` Gu, Yang
2010-06-17 9:35 ` Denis Kenzior
2010-06-13 9:43 ` Yang Gu [this message]
2010-06-16 22:49 ` [PATCH 06/12] Refactor " Denis Kenzior
2010-06-21 14:09 ` Aki Niemi
2010-06-21 14:08 ` Aki Niemi
2010-06-13 9:43 ` [PATCH 07/12] Add several proactive command parsers Yang Gu
2010-06-13 9:43 ` [PATCH 08/12] stk: Add parser for cell broadcast page objects Yang Gu
2010-06-13 9:43 ` [PATCH 09/12] stk: Add parser for bcch channel list objects Yang Gu
2010-06-13 9:43 ` [PATCH 10/12] stk: Add parser for timing advance objects Yang Gu
2010-06-16 22:50 ` Denis Kenzior
2010-06-16 23:19 ` andrzej zaborowski
2010-06-17 1:44 ` Gu, Yang
2010-06-13 9:43 ` [PATCH 11/12] stk: Add parser for PDP activation param objects Yang Gu
2010-06-13 9:43 ` [PATCH 12/12] stk: Add parser for UTRAN meas qualifier objects Yang Gu
2010-06-16 22:42 ` [PATCH 01/12] stk: Add parser for send ss commands Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1276422202-16240-6-git-send-email-yang.gu@intel.com \
--to=yang.gu@intel.com \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox