[PATCH] Add retrieving phone's own subscriber number.
andrzej zaborowski
balrogg at gmail.com
Fri Jul 27 21:50:32 CEST 2007
This patch makes use of AT+CNUM to read out the subscriber number from
the SIM. Also adds a libgsmd-tool shell's command for that.
Applies on top of attachments #204, #205, #207, #220, #225, #226, #229
and #230 from bugzilla (in that order).
Regards,
Andrzej
-------------- next part --------------
From 8993ebb0975d21bb908f5d8e58393afc52eefda0 Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog at zabor.org>
Date: Fri, 27 Jul 2007 21:25:33 +0200
Subject: [PATCH] Add retrieving phone's own subscriber number.
---
include/gsmd/usock.h | 19 ++++++++++++++++
include/libgsmd/misc.h | 3 ++
src/gsmd/usock.c | 49 +++++++++++++++++++++++++++++++++++++++++
src/libgsmd/libgsmd_network.c | 5 ++++
src/util/event.c | 1 +
src/util/shell.c | 26 ++++++++++++++++++++-
6 files changed, 101 insertions(+), 2 deletions(-)
diff --git a/include/gsmd/usock.h b/include/gsmd/usock.h
index 3bb00a7..14d7f3d 100644
--- a/include/gsmd/usock.h
+++ b/include/gsmd/usock.h
@@ -70,6 +70,7 @@ enum gsmd_msg_network {
GSMD_NETWORK_OPER_LIST = 6,
GSMD_NETWORK_CIND_GET = 7,
GSMD_NETWORK_DEREGISTER = 8,
+ GSMD_NETWORK_GET_NUMBER = 9,
};
enum gsmd_msg_sms {
@@ -458,6 +459,24 @@ struct gsmd_msg_oper {
gsmd_oper_numeric opname_num;
};
+/* Subscriber number information from 3GPP TS 07.07, Clause 7.1 */
+enum gsmd_subscriber_service {
+ GSMD_SERVICE_UNKNOWN = -1,
+ GSMD_SERVICE_ASYNC_MODEM = 0,
+ GSMD_SERVICE_SYNC_MODEM,
+ GSMD_SERVICE_PAD_ACCESS,
+ GSMD_SERVICE_PACKET_ACCESS,
+ GSMD_SERVICE_VOICE,
+ GSMD_SERVICE_FAX,
+};
+
+struct gsmd_own_number {
+ int is_last;
+ enum gsmd_subscriber_service service;
+ struct gsmd_addr addr;
+ char name[0];
+};
+
struct gsmd_msg_hdr {
u_int8_t version;
u_int8_t msg_type;
diff --git a/include/libgsmd/misc.h b/include/libgsmd/misc.h
index 9988518..a11ea96 100644
--- a/include/libgsmd/misc.h
+++ b/include/libgsmd/misc.h
@@ -62,6 +62,9 @@ enum lgsm_netreg_state {
extern int lgsm_get_netreg_state(struct lgsm_handle *lh,
enum lgsm_netreg_state *state);
+/* Get subscriber's own phone number */
+extern int lgsm_get_subscriber_num(struct lgsm_handle *lh);
+
/* CLIP, CLIR, COLP, Call Forwarding, Call Waiting, Call Deflecting */
/* TBD */
diff --git a/src/gsmd/usock.c b/src/gsmd/usock.c
index f0e725f..4d3e051 100644
--- a/src/gsmd/usock.c
+++ b/src/gsmd/usock.c
@@ -479,6 +479,51 @@ static int network_opers_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
return 0;
}
+static int network_ownnumbers_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
+{
+ struct gsmd_user *gu = (struct gsmd_user *) ctx;
+ struct gsmd_ucmd *ucmd;
+ struct gsmd_own_number *num;
+ int len, ret, type;
+ char dummy;
+
+ if (cmd->ret && cmd->ret != -255)
+ return 0;
+
+ if (sscanf(resp, "+CNUM: \"%*[^\"]\"%c%n", &dummy, &len) > 0)
+ len -= strlen("+CNUM: \"\",");
+ else
+ len = 0;
+
+ ucmd = gsmd_ucmd_fill(sizeof(*num) + len + 1,
+ GSMD_MSG_NETWORK, GSMD_NETWORK_GET_NUMBER, cmd->id);
+ if (!ucmd)
+ return -ENOMEM;
+
+ num = (struct gsmd_own_number *) ucmd->buf;
+ if (len)
+ ret = sscanf(resp, "+CNUM: \"%[^\"]\",\"%32[^\"]\",%i,%*i,%i,",
+ num->name, num->addr.number,
+ &type, &num->service) - 1;
+ else
+ ret = sscanf(resp, "+CNUM: ,\"%32[^\"]\",%i,%*i,%i,",
+ num->addr.number,
+ &type, &num->service);
+ if (ret < 2) {
+ talloc_free(ucmd);
+ return -EINVAL;
+ }
+ if (ret < 3)
+ num->service = GSMD_SERVICE_UNKNOWN;
+ num->name[len] = 0;
+ num->addr.type = type;
+ num->is_last = (cmd->ret == 0);
+
+ usock_cmd_enqueue(ucmd, gu);
+
+ return 0;
+}
+
static int usock_rcv_network(struct gsmd_user *gu, struct gsmd_msg_hdr *gph,
int len)
{
@@ -518,6 +563,10 @@ static int usock_rcv_network(struct gsmd_user *gu, struct gsmd_msg_hdr *gph,
case GSMD_NETWORK_OPER_LIST:
cmd = atcmd_fill("AT+COPS=?", 9+1, &network_opers_cb, gu, 0);
break;
+ case GSMD_NETWORK_GET_NUMBER:
+ cmd = atcmd_fill("AT+CNUM", 7 + 1,
+ &network_ownnumbers_cb, gu, 0);
+ break;
default:
return -EINVAL;
}
diff --git a/src/libgsmd/libgsmd_network.c b/src/libgsmd/libgsmd_network.c
index 9a21fb5..f65767d 100644
--- a/src/libgsmd/libgsmd_network.c
+++ b/src/libgsmd/libgsmd_network.c
@@ -78,3 +78,8 @@ int lgsm_signal_quality(struct lgsm_handle *lh)
{
return lgsm_send_simple(lh, GSMD_MSG_NETWORK, GSMD_NETWORK_SIGQ_GET);
}
+
+int lgsm_get_subscriber_num(struct lgsm_handle *lh)
+{
+ return lgsm_send_simple(lh, GSMD_MSG_NETWORK, GSMD_NETWORK_GET_NUMBER);
+}
diff --git a/src/util/event.c b/src/util/event.c
index a206bbc..ea8ad3b 100644
--- a/src/util/event.c
+++ b/src/util/event.c
@@ -26,6 +26,7 @@
#include <common/linux_list.h>
#include <libgsmd/libgsmd.h>
#include <libgsmd/event.h>
+#include <libgsmd/sms.h>
static int incall_handler(struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
{
diff --git a/src/util/shell.c b/src/util/shell.c
index 3ac5c65..7576184 100644
--- a/src/util/shell.c
+++ b/src/util/shell.c
@@ -210,12 +210,22 @@ static int net_msghandler(struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh)
const char *oper = (char *) gmh + sizeof(*gmh);
const struct gsmd_msg_oper *opers = (struct gsmd_msg_oper *)
((void *) gmh + sizeof(*gmh));
+ const struct gsmd_own_number *num = (struct gsmd_own_number *)
+ ((void *) gmh + sizeof(*gmh));
static const char *oper_stat[] = {
[GSMD_OPER_UNKNOWN] = "of unknown status",
[GSMD_OPER_AVAILABLE] = "available",
[GSMD_OPER_CURRENT] = "our current operator",
[GSMD_OPER_FORBIDDEN] = "forbidden",
};
+ static const char *srvname[] = {
+ [GSMD_SERVICE_ASYNC_MODEM] = "asynchronous modem",
+ [GSMD_SERVICE_SYNC_MODEM] = "synchronous modem",
+ [GSMD_SERVICE_PAD_ACCESS] = "PAD Access (asynchronous)",
+ [GSMD_SERVICE_PACKET_ACCESS] = "Packet Access (synchronous)",
+ [GSMD_SERVICE_VOICE] = "voice",
+ [GSMD_SERVICE_FAX] = "fax",
+ };
switch (gmh->msg_subtype) {
case GSMD_NETWORK_SIGQ_GET:
@@ -245,6 +255,15 @@ static int net_msghandler(struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh)
opers->opname_shortalpha,
oper_stat[opers->stat]);
break;
+ case GSMD_NETWORK_GET_NUMBER:
+ printf("\t%s\t%10s%s%s%s\n", num->addr.number, num->name,
+ (num->service == GSMD_SERVICE_UNKNOWN) ?
+ "" : " related to ",
+ (num->service == GSMD_SERVICE_UNKNOWN) ?
+ "" : srvname[num->service],
+ (num->service == GSMD_SERVICE_UNKNOWN) ?
+ "" : " services");
+ break;
default:
return -EINVAL;
}
@@ -264,6 +283,7 @@ static int shell_help(void)
"\tL\tDetect available operators\n"
"\tQ\tRead signal quality\n"
"\tT\tSend DTMF Tone\n"
+ "\tn\tPrint subscriber numbers\n"
"\tpd\tPB Delete (pb=index)\n"
"\tpr\tPB Read (pr=index)\n"
"\tprr\tPB Read Range (prr=index1,index2)\n"
@@ -497,16 +517,18 @@ int shell_main(struct lgsm_handle *lgsmh)
else
lgsm_sms_set_storage(lgsmh, mem[0],
mem[1], mem[2]);
- } else if (!strncmp(buf, "sc", 2)) {
+ } else if (!strncmp(buf, "sc", 2)) {
printf("Get the default SMSC\n");
lgsm_sms_get_smsc(lgsmh);
- } else if (!strncmp(buf, "sC", 2)) {
+ } else if (!strncmp(buf, "sC", 2)) {
printf("Set the default SMSC\n");
ptr = strchr(buf, '=');
if (!ptr || strlen(ptr) < 6)
printf("No.\n");
else
lgsm_sms_set_smsc(lgsmh, ptr + 1);
+ } else if (!strcmp(buf, "n")) {
+ lgsm_get_subscriber_num(lgsmh);
} else {
printf("Unknown command `%s'\n", buf);
}
--
1.4.4.3
More information about the gsmd-devel
mailing list
