Changeset 3545

Timestamp:

12/01/07 02:55:39 (5 years ago)

Author:

tick

Message:

gsmd: Submitting a PIN for authentication needs to respond with status too.(Andrzej Zaborowski)

Location:

trunk/src/target/gsm

Files:

• include/gsmd/unsolicited.h (modified) (1 diff)
• include/libgsmd/pin.h (modified) (1 diff)
• src/gsmd/unsolicited.c (modified) (3 diffs)
• src/gsmd/usock.c (modified) (3 diffs)
• src/libgsmd/libgsmd_pin.c (modified) (3 diffs)
• src/util/pin.c (modified) (3 diffs)
• src/util/shell.c (modified) (3 diffs)
• src/util/shell.h (modified) (1 diff)

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

@@ -16 +16 @@
 extern int unsolicited_register_array(const struct gsmd_unsolicit *arr,
                 int len);
+extern const int pintype_from_cme[];
 
 #endif /* __GSMD__ */

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

@@ -4 +4 @@
 extern const char *lgsm_pin_name(enum gsmd_pin_type ptype);
 
-extern int lgsm_pin(struct lgsm_handle *lh, unsigned int type, char *pin, char *newpin);
+extern int lgsm_pin(struct lgsm_handle *lh, unsigned int type,
+                const char *pin, const char *newpin);
 
 #endif

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

@@ -488 +488 @@
 }
 
+const int pintype_from_cme[GSM0707_CME_UNKNOWN] = {
+        [GSM0707_CME_PH_SIM_PIN_REQUIRED]       = GSMD_PIN_PH_SIM_PIN,
+        [GSM0707_CME_PH_FSIM_PIN_REQUIRED]      = GSMD_PIN_PH_FSIM_PIN,
+        [GSM0707_CME_PH_FSIM_PUK_REQUIRED]      = GSMD_PIN_PH_FSIM_PUK,
+        [GSM0707_CME_SIM_PIN_REQUIRED]          = GSMD_PIN_SIM_PIN,
+        [GSM0707_CME_SIM_PUK_REQUIRED]          = GSMD_PIN_SIM_PUK,
+        [GSM0707_CME_SIM_PIN2_REQUIRED]         = GSMD_PIN_SIM_PIN2,
+        [GSM0707_CME_SIM_PUK2_REQUIRED]         = GSMD_PIN_SIM_PUK2,
+        [GSM0707_CME_NETPERS_PIN_REQUIRED]      = GSMD_PIN_PH_NET_PIN,
+        [GSM0707_CME_NETPERS_PUK_REQUIRED]      = GSMD_PIN_PH_NET_PUK,
+        [GSM0707_CME_NETSUBSET_PIN_REQUIRED]    = GSMD_PIN_PH_NETSUB_PIN,
+        [GSM0707_CME_NETSUBSET_PUK_REQUIRED]    = GSMD_PIN_PH_NETSUB_PUK,
+        [GSM0707_CME_PROVIDER_PIN_REQUIRED]     = GSMD_PIN_PH_SP_PIN,
+        [GSM0707_CME_PROVIDER_PUK_REQUIRED]     = GSMD_PIN_PH_SP_PUK,
+        [GSM0707_CME_CORPORATE_PIN_REQUIRED]    = GSMD_PIN_PH_CORP_PIN,
+        [GSM0707_CME_CORPORATE_PUK_REQUIRED]    = GSMD_PIN_PH_CORP_PUK,
+        /* FIXME: */
+        [GSM0707_CME_SIM_FAILURE]               = 0,
+        [GSM0707_CME_SIM_BUSY]                  = 0,
+        [GSM0707_CME_SIM_WRONG]                 = 0,
+        [GSM0707_CME_MEMORY_FULL]               = 0,
+        [GSM0707_CME_MEMORY_FAILURE]            = 0,
+        [GSM0707_CME_PHONE_FAILURE]             = 0,
+        [GSM0707_CME_PHONE_NOCONNECT]           = 0,
+        [GSM0707_CME_PHONE_ADAPT_RESERVED]      = 0,
+        [GSM0707_CME_SIM_NOT_INSERTED]          = 0,
+};
+
 int generate_event_from_cme(struct gsmd *g, unsigned int cme_error)
 {
@@ -493 +521 @@
         struct gsmd_evt_auxdata *eaux;
 
-        if (!is_in_array(cme_error, errors_creating_events,
+        if (!is_in_array(cme_error, errors_creating_events,
                 ARRAY_SIZE(errors_creating_events))) {
 
@@ -502 +530 @@
                 eaux->u.cme_err.number = cme_error;
                 return usock_evt_send(g, gu, GSMD_EVT_IN_ERROR);
-        }
-        else {
-                gu = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_PIN, sizeof(*eaux));
+        } else {
+                if (cme_error >= GSM0707_CME_UNKNOWN ||
+                                !pintype_from_cme[cme_error])
+                        return 0;
+
+                gu = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_PIN,
+                                sizeof(*eaux));
                 if (!gu)
                         return -1;
+
                 eaux = ((void *)gu) + sizeof(*gu);
-        
-                switch (cme_error) {
-                case GSM0707_CME_PH_SIM_PIN_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_SIM_PIN;
-                        break;
-                case GSM0707_CME_PH_FSIM_PIN_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_FSIM_PIN;
-                        break;
-                case GSM0707_CME_PH_FSIM_PUK_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_FSIM_PUK;
-                        break;
-                case GSM0707_CME_SIM_PIN_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_SIM_PIN;
-                        break;
-                case GSM0707_CME_SIM_PUK_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_SIM_PUK;
-                        break;
-                case GSM0707_CME_SIM_PIN2_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_SIM_PIN2;
-                        break;
-                case GSM0707_CME_SIM_PUK2_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_SIM_PUK2;
-                        break;
-                case GSM0707_CME_NETPERS_PIN_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_NET_PIN;
-                        break;
-                case GSM0707_CME_NETPERS_PUK_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_NET_PUK;
-                        break;
-                case GSM0707_CME_NETSUBSET_PIN_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_NETSUB_PIN;
-                        break;
-                case GSM0707_CME_NETSUBSET_PUK_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_NETSUB_PUK;
-                        break;
-                case GSM0707_CME_PROVIDER_PIN_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_SP_PIN;
-                        break;
-                case GSM0707_CME_PROVIDER_PUK_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_SP_PUK;
-                        break;
-                case GSM0707_CME_CORPORATE_PIN_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_CORP_PIN;
-                        break;
-                case GSM0707_CME_CORPORATE_PUK_REQUIRED:
-                        eaux->u.pin.type = GSMD_PIN_PH_CORP_PUK;
-                        break;
-        
-                case GSM0707_CME_SIM_FAILURE:
-                case GSM0707_CME_SIM_BUSY:
-                case GSM0707_CME_SIM_WRONG:
-                case GSM0707_CME_MEMORY_FULL:
-                case GSM0707_CME_MEMORY_FAILURE:
-                case GSM0707_CME_PHONE_FAILURE:
-                case GSM0707_CME_PHONE_NOCONNECT:
-                case GSM0707_CME_PHONE_ADAPT_RESERVED:
-                case GSM0707_CME_SIM_NOT_INSERTED:
-                        /* FIXME */
-                        talloc_free(gu);
-                        return 0;
-                        break;
-                default:
-                        talloc_free(gu);
-                        return 0;
-                        break;
-                }
+                eaux->u.pin.type = pintype_from_cme[cme_error];
                 return usock_evt_send(g, gu, GSMD_EVT_PIN);
         }

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

@@ -186 +186 @@
 static int pin_cmd_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
 {
-        gsmd_log(GSMD_DEBUG, "pin cmd cb\n");
-
-        /* We need to verify if there is some error */
-        switch (cmd->ret) {
-        case 0:
-                break;
-        case GSM0707_CME_INCORRECT_PASSWORD:
-                /* prompt for pin again */
-                break;
-        default:        
-                /* something went wrong */
-                break;
-        }
+        struct gsmd_user *gu = ctx;
+        struct gsmd_ucmd *ucmd = gsmd_ucmd_fill(sizeof(int), GSMD_MSG_PIN,
+                        GSMD_PIN_INPUT, 0);
+
+        if (!ucmd)
+                return -ENOMEM;
+
+        /* Pass a GSM07.07 CME code directly, don't issue a new PIN
+         * request because the client waits for a response to her
+         * PIN submission rather than an event.  */
+        ((int *) ucmd->buf)[0] = cmd->ret;
+        usock_cmd_enqueue(ucmd, gu);
         return 0;
 }
@@ -410 +409 @@
         if (!ucmd)
                 return NULL;
-        
+
         ucmd->hdr.version = GSMD_PROTO_VERSION;
         ucmd->hdr.msg_type = msg_type;
@@ -652 +651 @@
         num->name[len] = 0;
         num->addr.type = type;
-        num->is_last = (cmd->ret == 0, NULL);
+        num->is_last = (cmd->ret == 0);
 
         usock_cmd_enqueue(ucmd, gu);

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

@@ -56 +56 @@
 }
 
-int lgsm_pin(struct lgsm_handle *lh, unsigned int type, char *pin, char *newpin)
+int lgsm_pin(struct lgsm_handle *lh, unsigned int type,
+                const char *pin, const char *newpin)
 {
         int rc;
@@ -75 +76 @@
 
         gm->gp.type = type;
-
-        gm->gp.pin[0] = '\0';
-        strcat(gm->gp.pin, pin);
+        strcpy(gm->gp.pin, pin);
 
         switch (type) {
@@ -85 +84 @@
                  * require a new pin to be specified! Don't know if this is a
                  * bug or a feature. */
-                if (!newpin)
+                if (!newpin) {
+                        free(gm);
                         return -EINVAL;
-                gm->gp.newpin[0] = '\0';
-                strcat(gm->gp.newpin, newpin);
+                }
+                strcpy(gm->gp.newpin, newpin);
                 break;
         default:

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

@@ -28 +28 @@
 #include <libgsmd/pin.h>
 
+#include "shell.h"
+
 #define PIN_SIZE 8
 
-static char *pin;
+static const char *pin;
 static char pinbuf[PIN_SIZE+1];
 static char pinbuf2[PIN_SIZE+1];
 
-static int pin_handler(struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
+static int pin_handler(struct lgsm_handle *lh,
+                int evt, struct gsmd_evt_auxdata *aux)
 {
         int rc;
@@ -40 +43 @@
         char *newpin = NULL;
 
-        printf("EVENT: PIN request (type='%s') ", lgsm_pin_name(aux->u.pin.type));
+        printf("EVENT: PIN request (type='%s') ", lgsm_pin_name(type));
 
         /* FIXME: read pin from STDIN and send it back via lgsm_pin */
         if (type == 1 && pin) {
                 printf("Auto-responding with pin `%s'\n", pin);
-                lgsm_pin(lh, type, pin, NULL);
+                pending_responses ++;
+                return lgsm_pin(lh, type, pin, NULL);
         } else {
                 do {
@@ -65 +69 @@
                 }
 
+                pending_responses ++;
                 return lgsm_pin(lh, type, pinbuf, newpin);
         }
-
-        return 0;
 }
 

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

@@ -45 +45 @@
 static int nREADRG = 0;
 
-static int pending_responses = 0;
+int pending_responses = 0;
 
 /* this is the handler for receiving passthrough responses */
@@ -373 +373 @@
         return 0;
 }
+
+static int pin_msghandler(struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh)
+{
+        int result = *(int *) gmh->data;
+
+        if (result)
+                printf("PIN error %i\n", result);
+        else
+                printf("PIN accepted!\n");
+        pending_responses --;
+        return 0;
+}
+
+static const struct msghandler_s {
+        int type;
+        lgsm_msg_handler *fn;
+} msghandlers[] = {
+        { GSMD_MSG_PASSTHROUGH, pt_msghandler },
+        { GSMD_MSG_PHONEBOOK,   pb_msghandler },
+        { GSMD_MSG_SMS,         sms_msghandler },
+        { GSMD_MSG_NETWORK,     net_msghandler },
+        { GSMD_MSG_PHONE,       phone_msghandler },
+        { GSMD_MSG_PIN,         pin_msghandler },
+
+        { 0, 0 }
+};
 
 static int shell_help(void)
@@ -425 +451 @@
         char *ptr, *fcomma, *lcomma;
         int gsm_fd = lgsm_fd(lgsmh);
-
-        lgsm_register_handler(lgsmh, GSMD_MSG_PASSTHROUGH, &pt_msghandler);
-        lgsm_register_handler(lgsmh, GSMD_MSG_PHONEBOOK, &pb_msghandler);
-        lgsm_register_handler(lgsmh, GSMD_MSG_SMS, &sms_msghandler);
-        lgsm_register_handler(lgsmh, GSMD_MSG_NETWORK, &net_msghandler);
-        lgsm_register_handler(lgsmh, GSMD_MSG_PHONE, &phone_msghandler);
+        const struct msghandler_s *hndl;
+
+        for (hndl = msghandlers; hndl->fn; hndl ++)
+                lgsm_register_handler(lgsmh, hndl->type, hndl->fn);
 
         fcntl(0, F_SETFD, O_NONBLOCK);

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

@@ -1 @@
-
 extern int shell_main(struct lgsm_handle *lgsmh, int sync);
+extern int pending_responses;