Changeset 4084

Timestamp:

02/18/08 10:42:28 (5 years ago)

Author:

erin_yueh

Message:

gsmd: bug fixed for some changes (Sudharshan S, Paulius Zaleckas)

Location:

trunk/src/target/gsm

Files:

• include/gsmd/gsmd.h (modified) (1 diff)
• src/gsmd/usock.c (modified) (6 diffs)
• src/util/shell.c (modified) (1 diff)

trunk/src/target/gsm/include/gsmd/gsmd.h

@@ -74 +74 @@
 
 #define GSMD_ATCMD_TIMEOUT      60      /* If doesn get respond within 60 secs, discard */
-#define GSMD_MAX_INFO_LEN       64      /* by the standard it should be 2048, way too much :) */
 
 struct gsmd {

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

@@ -619 +619 @@
 
         DEBUGP("cmd = '%s', resp: '%s'\n", cmd->buf, resp);
-        if (strncmp(resp, "+CGMI: ", 7))
-                return -EINVAL;
-        resp += 7;
+        if (!strncmp(resp, "+CGMI: ", 7))
+                resp += 7;
         return gsmd_ucmd_submit(gu, GSMD_MSG_PHONE, GSMD_PHONE_GET_MANUF,
                         cmd->id, strlen(resp) + 1, resp);
-        return 0;
 }
 
@@ -632 +630 @@
 
         DEBUGP("cmd = '%s', resp: '%s'\n", cmd->buf, resp);
-        if (strncmp(resp, "+CGMM: ", 7))
-                return -EINVAL;
-        resp += 7;
+        if (!strncmp(resp, "+CGMM: ", 7))
+                resp += 7;
         return gsmd_ucmd_submit(gu, GSMD_MSG_PHONE, GSMD_PHONE_GET_MODEL,
                         cmd->id, strlen(resp) + 1, resp);
-        return 0;
 }
 
@@ -645 +641 @@
 
         DEBUGP("cmd = '%s', resp: '%s'\n", cmd->buf, resp);
-        if (strncmp(resp, "+CGMR: ", 7))
-                return -EINVAL;
-        resp += 7;
+        if (!strncmp(resp, "+CGMR: ", 7))
+                resp += 7;
         return gsmd_ucmd_submit(gu, GSMD_MSG_PHONE, GSMD_PHONE_GET_REVISION,
                         cmd->id, strlen(resp) + 1, resp);
-        return 0;
 }
 
@@ -658 +652 @@
 
         DEBUGP("cmd = '%s', resp: '%s'\n", cmd->buf, resp);
-        if (strncmp(resp, "+CGSN: ", 7))
-                return -EINVAL;
-        resp += 7;
+        if (!strncmp(resp, "+CGSN: ", 7))
+                resp += 7;
         return gsmd_ucmd_submit(gu, GSMD_MSG_PHONE, GSMD_PHONE_GET_SERIAL,
                         cmd->id, strlen(resp) + 1, resp);
-        return 0;
 }
 
@@ -869 +861 @@
         if ( !er )
                 return -ENOMEM;
-        
+
         //extrsp_dump(er);      
 
@@ -879 +871 @@
                 buf[0] = '\0';
         }
-        else if ( er->num_tokens == 3 &&
+        else if ( er->num_tokens >= 3 &&
                         er->tokens[0].type == GSMD_ECMD_RTT_NUMERIC &&
                         er->tokens[1].type == GSMD_ECMD_RTT_NUMERIC &&
                         er->tokens[2].type == GSMD_ECMD_RTT_STRING ) {
 
-                
                 strlcpy(buf, er->tokens[2].u.string, sizeof(buf));
         }

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

@@ -393 +393 @@
 static int phone_msghandler(struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh)
 {
-        char *payload;
+        char *payload  = (char *)gmh + sizeof(*gmh);
         int *intresult = (void *)gmh + sizeof(*gmh);
 
         switch (gmh->msg_subtype) {
         case GSMD_PHONE_GET_IMSI:
-                payload = (char *)gmh + sizeof(*gmh);
                 printf("imsi <%s>\n", payload);
                 break;
         case GSMD_PHONE_GET_MANUF:
-                payload = (char *)gmh + sizeof(*gmh);
                 printf("manufacturer: %s\n", payload);
                 break;
         case GSMD_PHONE_GET_MODEL:
-                payload = (char *)gmh + sizeof(*gmh);
                 printf("model: %s\n", payload);
                 break;
         case GSMD_PHONE_GET_REVISION:
-                payload = (char *)gmh + sizeof(*gmh);
                 printf("revision: %s\n", payload);
                 break;
         case GSMD_PHONE_GET_SERIAL:
-                payload = (char *)gmh + sizeof(*gmh);
                 printf("serial: %s\n", payload);
                 break;