Changeset 4101

Timestamp:

02/21/08 12:41:29 (5 years ago)

Author:

erin_yueh

Message:

gsmd: get the operator list 2nd try (Paulius Zaleckas)

File:

• trunk/src/target/gsm/src/gsmd/usock.c (modified) (3 diffs)

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

@@ -922 +922 @@
         if (strncmp(str, "+COPS: ", 7))
                 return -EINVAL;
+        /*
+         * string ",," means the begginig of extended parameters and we
+         * don't want to scan them for operators.
+         */
+        ptr = strstr(str, ",,");
+        if(ptr)
+                ptr[0] = '\0';
 
         ptr = (char *) str;
@@ -959 +966 @@
                         //extrsp_dump(er);      
                                 
-                        if ( er->num_tokens == 4 &&
+                        if ( er->num_tokens >= 4 &&
                                         er->tokens[0].type == GSMD_ECMD_RTT_NUMERIC &&
                                         er->tokens[1].type == GSMD_ECMD_RTT_STRING &&
@@ -1003 +1010 @@
 
         len = network_opers_parse(resp, &buf);
+        if(len < 0)
+                return len;     /* error we got from network_opers_parse */
 
         ret = gsmd_ucmd_submit(gu, GSMD_MSG_NETWORK, GSMD_NETWORK_OPER_LIST,