Changeset 3684

Timestamp:

12/19/07 10:34:34 (5 years ago)

Author:

erin_yueh

Message:

gsmd: set and get Voicemail number (Erin Yueh)

Location:

trunk/src/target/gsm

Files:

• include/libgsmd/misc.h (modified) (1 diff)
• include/libgsmd/sms.h (modified) (1 diff)
• src/gsmd/usock.c (modified) (2 diffs)
• src/libgsmd/libgsmd_network.c (modified) (2 diffs)
• src/util/shell.c (modified) (4 diffs)

trunk/src/target/gsm/include/libgsmd/misc.h

@@ -34 +34 @@
 /* Get Signal Strehngth (Chapter 8.5) */
 extern int lgsm_signal_quality(struct lgsm_handle *h);
-
-/* Set voice mail number */
-extern int lgsm_voicemail_set(struct lgsm_handle *lh,
-                              struct lgsm_addr *addr);
-
-/* Get currently configured voice mail number */
-extern int lgsm_voicemail_get(struct lgsm_handle *lh,
-                              struct lgsm_addr *addr);
 
 /* Operator Selection, Network Registration */

trunk/src/target/gsm/include/libgsmd/sms.h

@@ -80 +80 @@
                 enum ts0705_mem_type mem1, enum ts0705_mem_type mem2,
                 enum ts0705_mem_type mem3);
+extern int lgsm_number2addr(struct gsmd_addr *dst, const char *src,
+        int skipplus);
 
 /* Retrieve current default service centre address */

trunk/src/target/gsm/src/gsmd/usock.c

@@ -521 +521 @@
 {
         struct gsmd_user *gu = ctx;
-        struct gsmd_voicemail *vmail;
-        struct gsmd_ucmd *ucmd;
-        char *comma;
-
-        DEBUGP("entering(cmd=%p, gu=%p)\n", cmd, gu);
-
-        ucmd = ucmd_alloc(sizeof(*vmail));
-        if (!ucmd)
-                return -ENOMEM;
-        
-        /* FIXME: pass error values back somehow */
-        ucmd->hdr.version = GSMD_PROTO_VERSION;
-        ucmd->hdr.msg_type = GSMD_MSG_NETWORK;
-        ucmd->hdr.len = sizeof(*vmail);
-        ucmd->hdr.id = cmd->id;
+        struct gsmd_voicemail vmail;
+        struct gsm_extrsp *er;
+        int rc;
+        int ret = cmd->ret;
+
+        DEBUGP("cmd = '%s', resp: '%s'\n", cmd->buf, resp);
 
         if (cmd->buf[7] == '=') {
                 /* response to set command */
-                ucmd->hdr.msg_subtype = GSMD_NETWORK_VMAIL_SET;
-                /* FIXME: */
-                return 0;
+                rc = gsmd_ucmd_submit(gu, GSMD_MSG_NETWORK, 
+                                GSMD_NETWORK_VMAIL_SET,cmd->id, sizeof(ret), &ret);
         } else {
                 /* response to get command */
-                char *tok = strtok(resp, ",");
-                if (!tok)
-                        goto out_free_einval;
-                ucmd->hdr.msg_subtype = GSMD_NETWORK_VMAIL_GET;
-                vmail->enable = atoi(tok);
-
-                tok = strtok(NULL, ",");
-                if (!tok)
-                        goto out_free_einval;
-                strncpy(vmail->addr.number, tok, GSMD_ADDR_MAXLEN);
-                vmail->addr.number[GSMD_ADDR_MAXLEN] = '\0';
-
-                tok = strtok(NULL, ",");
-                if (!tok)
-                        goto out_free_einval;
-                vmail->addr.type = atoi(tok);
-        }
-
-        usock_cmd_enqueue(ucmd, gu);
-
-        return 0;
-
-out_free_einval:
-        gsmd_log(GSMD_ERROR, "can't understand voicemail response\n");
-        talloc_free(ucmd);
-        return -EINVAL;
+                if (strncmp(resp, "+CSVM: ", 7))
+                        return -EINVAL;
+                resp += 7;
+                er = extrsp_parse(gsmd_tallocs, resp);
+                if(!er)
+                        return -ENOMEM;
+                if(er->num_tokens == 3 &&
+                        er->tokens[0].type == GSMD_ECMD_RTT_NUMERIC &&
+                        er->tokens[1].type == GSMD_ECMD_RTT_STRING &&
+                        er->tokens[2].type == GSMD_ECMD_RTT_NUMERIC) {
+                                vmail.enable = er->tokens[0].u.numeric;
+                                strcpy(vmail.addr.number, er->tokens[1].u.string);
+                                vmail.addr.type = er->tokens[2].u.numeric;
+                }
+                rc = gsmd_ucmd_submit(gu, GSMD_MSG_NETWORK, GSMD_NETWORK_VMAIL_GET,
+                        cmd->id, sizeof(vmail), &vmail);
+                talloc_free(er);
+        }
+        return rc;
 }
 
@@ -814 +797 @@
                 break;
         case GSMD_NETWORK_VMAIL_SET:
-                cmd = atcmd_fill("AT+CSVM=", 8+1, &network_vmail_cb, gu, 0, NULL);
+                cmdlen = sprintf(buffer, "AT+CSVM=1,\"%s\",%d",
+                        vmail->addr.number, vmail->addr.type);
+                cmd = atcmd_fill(buffer, cmdlen + 1, &network_vmail_cb, gu, 0, NULL);
                 break;
         case GSMD_NETWORK_SIGQ_GET:

trunk/src/target/gsm/src/libgsmd/libgsmd_network.c

@@ -27 +27 @@
 #include <libgsmd/libgsmd.h>
 #include <libgsmd/misc.h>
+#include <libgsmd/sms.h>
 
 #include <gsmd/usock.h>
@@ -134 +135 @@
         return lgsm_send_simple(lh, GSMD_MSG_NETWORK, GSMD_NETWORK_GET_NUMBER);
 }
+
+int lgsm_voicemail_set(struct lgsm_handle *lh, const char *number)
+{
+        struct gsmd_msg_hdr *gmh;
+        struct gsmd_voicemail *vmail;
+        int rc;
+
+        gmh = lgsm_gmh_fill(GSMD_MSG_NETWORK,
+                        GSMD_NETWORK_VMAIL_SET, sizeof(*vmail));
+        if (!gmh)
+                return -ENOMEM;
+
+        vmail = (struct gsmd_voicemail *) gmh->data;
+        vmail->enable = 1;
+        if (lgsm_number2addr(&vmail->addr, number, 0)){
+                lgsm_gmh_free(gmh);
+                return -EINVAL;
+        }
+
+        if (lgsm_send(lh, gmh) < gmh->len + sizeof(*gmh)) {
+                lgsm_gmh_free(gmh);
+                return -EIO;
+        }
+
+        lgsm_gmh_free(gmh);
+        return 0;
+}
+
+/* Get currently configured voice mail number */
+int lgsm_voicemail_get(struct lgsm_handle *lh)
+{
+        return lgsm_send_simple(lh, GSMD_MSG_NETWORK, GSMD_NETWORK_VMAIL_GET);
+}

trunk/src/target/gsm/src/util/shell.c

@@ -286 +286 @@
         const struct gsmd_own_number *num = (struct gsmd_own_number *)
                 ((void *) gmh + sizeof(*gmh));
+        const struct gsmd_voicemail *vmail = (struct gsmd_voicemail *)
+                ((void *) gmh + sizeof(*gmh));
+        int result = *(int *) gmh->data;
         static const char *oper_stat[] = {
                 [GSMD_OPER_UNKNOWN] = "of unknown status",
@@ -340 +343 @@
                                 (num->service == GSMD_SERVICE_UNKNOWN) ?
                                 "" : " services");
+                pending_responses --;
+                break;
+        case GSMD_NETWORK_VMAIL_SET:
+                if (result)
+                        printf("Set voicemail error %i\n", result);
+                else
+                        printf("Set voicemail OK \n");
+                pending_responses --;
+                break;
+        case GSMD_NETWORK_VMAIL_GET:
+                if(vmail->addr.number)
+                        printf ("voicemail number is %s \n",vmail->addr.number);
                 pending_responses --;
                 break;
@@ -482 +497 @@
                 "\tsc\tSMS Show Service Centre\n"
                 "\tsC\tSMS Set Service Centre (sC=number)\n"
+                "\tgvm\tGet Voicemail number\n"
+                "\tsvm\tSet Voicemail number(svm=number)\n"
                 "\tim\tGet imsi\n"
                 "\tcs\tGet Call status\n"
@@ -767 +784 @@
                                 lgsm_get_subscriber_num(lgsmh);
                                 pending_responses ++;
+                        } else if ( !strncmp(buf, "gvm", 3)) {
+                                printf("Get Voicemail Number\n");
+                                lgsm_voicemail_get(lgsmh);
+                                pending_responses ++;
+                        } else if ( !strncmp(buf, "svm", 3)) {
+                                printf("Set Voicemail Number\n");
+                                ptr = strchr(buf, '=');
+                                if (!ptr || strlen(ptr) < 3)
+                                        printf("No.\n");
+                                else
+                                        lgsm_voicemail_set(lgsmh, ptr + 1);
+                                pending_responses ++;
                         } else if (!strncmp(buf, "im", 2)) {
                                 printf("Get imsi\n");