Changeset 3390

Timestamp:

11/12/07 10:38:04 (6 years ago)

Author:

tick

Message:

keeping track of current registration state internally in gsmd. Without this the"gsmd->dev_state.registered" variable had bogus values. (Andrew)

Location:

trunk/src/target/gsm/src/gsmd

Files:

• atcmd.c (modified) (1 diff)
• unsolicited.c (modified) (2 diffs)

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

@@ -669 +669 @@
         
         llist_add(&cmd->list, &g->pending_atcmds);
-        return atcmd_done(g, cur, "OK");
+        return atcmd_done(g, cur, "ERROR");
 }
 

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

@@ -146 +146 @@
 {
         const char *comma = strchr(param, ',');
-        struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_NETREG,
-                                             sizeof(struct gsmd_evt_auxdata));
+        struct gsmd_ucmd *ucmd;
         struct gsmd_evt_auxdata *aux;
+        int prev_registered = gsmd->dev_state.registered;
+        int state;
+        char *end;
+
+        state = strtol(param, &end, 10);
+        if (!(end > param)) {
+                gsmd_log(GSMD_ERROR, "Bad +CREG format, not updating state\n");
+                return -EINVAL;
+        }
+
+        /* Update our knowledge about our state */
+        gsmd->dev_state.registered =
+                (state == GSMD_NETREG_REG_HOME ||
+                 state == GSMD_NETREG_REG_ROAMING);
+
+        /* Intialise things that depend on network registration */
+        if (gsmd->dev_state.registered && !prev_registered) {
+                sms_cb_network_init(gsmd);
+        }
+
+        /* Notify clients */
+        ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_NETREG,
+                        sizeof(struct gsmd_evt_auxdata));
         if (!ucmd)
                 return -ENOMEM;
@@ -164 +186 @@
                 aux->u.netreg.lac = aux->u.netreg.ci = 0;
 
-        /* Intialise things that depend on network registration */
-        if (aux->u.netreg.state == GSMD_NETREG_REG_HOME ||
-                        aux->u.netreg.state == GSMD_NETREG_REG_ROAMING) {
-                sms_cb_network_init(gsmd);
-        }
-
         return usock_evt_send(gsmd, ucmd, GSMD_EVT_NETREG);
+
 }