Changeset 3201

Timestamp:

10/17/07 08:14:20 (6 years ago)

Author:

jserv

Message:

Added 'Ask Status report' option in shell.

From: Andrzej Zaborowski <balrogg@…>

I also moved the .ask_ds field from struct gsmd_sms into struct
gsmd_sms_submit because it seemed more logical being a property
of SMS-SUBMIT PDU.

Location:

trunk/src/target/gsm

Files:

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

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

@@ -331 +331 @@
         struct gsmd_addr addr;
         struct gsmd_sms payload;
+        int ask_ds;
 };
 

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

@@ -47 +47 @@
         u_int8_t data[LGSM_SMS_DATA_MAXLEN+1];
         int length;
+        int ask_ds;
 };
 

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

@@ -248 +248 @@
                 (0 << 2) |              /* Reject Duplicates: 0 */
                 GSMD_SMS_TP_VPF_NOT_PRESENT |
-                GSMD_SMS_TP_SRR_STATUS_REQUEST |
+                (src->ask_ds ? GSMD_SMS_TP_SRR_STATUS_REQUEST :
+                 GSMD_SMS_TP_SRR_NOT_REQUEST) |
                 (src->payload.has_header ? GSMD_SMS_TP_UDHI_WITH_HEADER :
                  GSMD_SMS_TP_UDHI_NO_HEADER) |

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

@@ -127 +127 @@
                 return -EINVAL;
 
+        gss->ask_ds = sms->ask_ds;
         gss->payload.has_header = 0;
         gss->payload.length = sms->length;
@@ -162 +163 @@
                 return -EINVAL;
 
+        gsw->sms.ask_ds = sms_write->sms.ask_ds;
         gsw->sms.payload.has_header = 0;
         gsw->sms.payload.length = sms_write->sms.length;

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

@@ -390 +390 @@
                 "\tsl\tSMS List (sl=stat)\n"
                 "\tsr\tSMS Read (sr=index)\n"
-                "\tss\tSMS Send (ss=number,text|[\"text\"])\n"
+                "\tss\tSMS Send (ss=ask_ds,number,text|[\"text\"])\n"
                 "\tsw\tSMS Write (sw=stat,number,text)\n"
                 "\tsm\tSMS Storage stats\n"
@@ -616 +616 @@
 
                                 ptr = strchr(buf, '=');
+                                sms.ask_ds = atoi(ptr+1);
                                 fcomma = strchr(buf, ',');
-                                if (!ptr || !fcomma) {
-                                        printf("Wrong command format\n");
-                                } else {
-                                        strncpy(sms.addr, ptr+1, fcomma-ptr-1);
-                                        sms.addr[fcomma-ptr-1] = '\0';
-
-                                        /* todo define \" to allow " in text */
-                                        if (fcomma[1] == '"' &&
-                                                !strchr(fcomma+2, '"')) {
+                                lcomma = strchr(fcomma+1, ',');
+                                strncpy(sms.addr, fcomma+1, lcomma-fcomma-1);
+                                sms.addr[lcomma-fcomma-1] = '\0';
+                                /* todo define \" to allow " in text */
+                                if (lcomma[1]=='"' &&
+                                                !strchr(lcomma+2, '"')) {
                                                 /* read until closing '"' */
                                                 rc = fscanf(stdin, "%[^\"]\"",
-                                                        fcomma+strlen(fcomma));
+                                                        lcomma+strlen(lcomma));
                                                 if (rc == EOF) {
                                                         printf("EOF\n");
@@ -634 +632 @@
                                                 }
                                                 /* remove brackets */
-                                                fcomma++;
-                                                fcomma[strlen(fcomma)] = '\0';
-                                        }
-
-                                        printf("Send SMS\n");
-                                        packing_7bit_character(fcomma+1, &sms);
-
-                                        lgsm_sms_send(lgsmh, &sms);
+                                                lcomma++;
+                                                lcomma[strlen(lcomma)] = '\0';
                                 }
+                                printf("Send SMS\n");
+                                packing_7bit_character(lcomma+1, &sms);
+
+                                lgsm_sms_send(lgsmh, &sms);
                         } else if ( !strncmp(buf, "sw", 2)) {   
                                 printf("Write SMS\n");                          
@@ -656 +652 @@
                                 packing_7bit_character(
                                                 lcomma+1, &sms_write.sms);
+                                sms_write.sms.ask_ds = 0;
 
                                 lgsm_sms_write(lgsmh, &sms_write);