PATCH: addressing an issue in smsc_at that makes the modem stop reporting incoming SMSes

Index: gw/smsc/smsc_at.c
===================================================================
RCS file: /home/cvs/gateway/gw/smsc/smsc_at.c,v
retrieving revision 1.37
diff -u -r1.37 smsc_at.c
--- gw/smsc/smsc_at.c	22 Jul 2007 13:15:25 -0000	1.37
+++ gw/smsc/smsc_at.c	11 Sep 2007 10:34:18 -0000
@@ -339,7 +339,7 @@
         errno = 0;
         s = write(privdata->fd, octstr_get_cstr(linestr) + data_written, 
                   count - data_written);
-        if (s < 0 && errno == EAGAIN && write_count < RETRY_SEND) {
+        if (s < 0 && errno == EAGAIN && write_count < RETRY_WRITE) {
             gwthread_sleep(1);
             ++write_count;
         } else if (s > 0) {
@@ -372,7 +372,7 @@
     while (1) {
         errno = 0;
         s = write(privdata->fd, ctrlz, 1);
-        if (s < 0 && errno == EAGAIN && write_count < RETRY_SEND) {
+        if (s < 0 && errno == EAGAIN && write_count < RETRY_WRITE) {
             gwthread_sleep(1);
             ++write_count;
         } else
@@ -401,7 +401,7 @@
     count = strlen(line);
     while(count > data_written) {
         s = write(privdata->fd, line + data_written, count - data_written);
-        if (s < 0 && errno == EAGAIN && write_count < RETRY_SEND) {
+        if (s < 0 && errno == EAGAIN && write_count < RETRY_WRITE) {
             gwthread_sleep(1);
             ++write_count;
         } else if (s > 0) {
@@ -1188,12 +1188,7 @@
 
     idle_timeout = 0;
     while (!privdata->shutdown) {
-        l = gw_prioqueue_len(privdata->outgoing_queue);
-        if (l > 0) {
-            at2_send_messages(privdata);
-            idle_timeout = time(NULL);
-        } else
-            at2_wait_modem_command(privdata, 1, 0, NULL);
+				at2_wait_modem_command(privdata, 1, 0, NULL);
 
         /* read error, so re-connect */
         if (privdata->fd == -1) {
@@ -1225,6 +1220,11 @@
             }
             memory_poll_timeout = time(NULL);
         }
+
+        if (gw_prioqueue_len(privdata->outgoing_queue) > 0) {
+            at2_send_messages(privdata);
+            idle_timeout = time(NULL);
+        }
     }
     at2_close_device(privdata);
     mutex_lock(conn->flow_mutex);
@@ -1991,14 +1991,12 @@
 {
     Msg *msg;
 
-    do {
-        if (privdata->modem->enable_mms && 
-            gw_prioqueue_len(privdata->outgoing_queue) > 1)
-            at2_send_modem_command(privdata, "AT+CMMS=2", 0, 0);
-
-        if ((msg = gw_prioqueue_remove(privdata->outgoing_queue)))
-            at2_send_one_message(privdata, msg);
-    } while (msg);
+		if (privdata->modem->enable_mms && 
+				gw_prioqueue_len(privdata->outgoing_queue) > 1)
+				at2_send_modem_command(privdata, "AT+CMMS=2", 0, 0);
+
+		if ((msg = gw_prioqueue_remove(privdata->outgoing_queue)))
+				at2_send_one_message(privdata, msg);
 }
 
 
@@ -2007,7 +2005,6 @@
     unsigned char command[500];
     int ret = -1;
     char sc[3];
-    int retries = RETRY_SEND;
 
     if (octstr_len(privdata->my_number)) {
         octstr_destroy(msg->sms.sender);
@@ -2033,103 +2030,90 @@
             return;
         }	
 
-        ret = -99;
-        retries = RETRY_SEND;
-        while ((ret != 0) && (retries-- > 0)) {
-            int msg_id = -1;
-            /* 
-             * send the initial command and then wait for > 
-             */
-            sprintf(command, "AT+CMGS=%ld", octstr_len(pdu) / 2);
-            
-            ret = at2_send_modem_command(privdata, command, 5, 1);
-            debug("bb.smsc.at2", 0, "AT2[%s]: send command status: %d",
-                  octstr_get_cstr(privdata->name), ret);
-
-            if (ret != 1) /* > only! */
-                continue;
-                
-            /* 
-             * Ok the > has been see now so we can send the PDU now and a 
-             * control Z but no CR or LF 
-             * 
-             * We will handle the 'nokiaphone' types a bit differently, since
-             * they have a generic error in accepting PDUs that are "too big".
-             * Which means, PDU that are longer then 18 bytes get truncated by
-             * the phone modems. We'll buffer the PDU output in a loop.
-             * All other types will get handled as used to be.
-             */
-
-            if (octstr_compare(privdata->modem->id, octstr_imm("nokiaphone")) != 0) {           
-            
-                sprintf(command, "%s%s", sc, octstr_get_cstr(pdu));
-                at2_write(privdata, command);
-                at2_write_ctrlz(privdata);
-            
-            } else {
-            
-                /* include the CTRL-Z in the PDU string */
-                sprintf(command, "%s%s%c", sc, octstr_get_cstr(pdu), 0x1A);
-       
-                /* chop PDU into 18-byte-at-a-time pieces to prevent choking 
-                 * of certain GSM Phones (e.g. Nokia 6310, 6230 etc.) */
-                if (strlen(command) > 18) {
-                    unsigned char chop[20];
-                    int len = strlen(command);
-                    int pos = 0;
-                    int ret = 18;
-
-                    while (pos < len) {
-                        if (pos + ret > len)
-                            ret = len - pos;
-                        memcpy(chop, command + pos, ret);
-                        pos += ret;
-                        chop[ret] = '\0';
-                        at2_write(privdata, chop);
-                        gwthread_sleep((double) 10/1000);
-                    }
-                } else {
-                    at2_write(privdata, command);
-                }
-            }               
-                
-            /* wait 20 secs for modem command */
-            ret = at2_wait_modem_command(privdata, 20, 0, &msg_id);
-            debug("bb.smsc.at2", 0, "AT2[%s]: send command status: %d",
-                  octstr_get_cstr(privdata->name), ret);
-
-            if (ret != 0) /* OK only */
-                continue;
-
-            /* store DLR message if needed for SMSC generated delivery reports */
-            if (DLR_IS_ENABLED_DEVICE(msg->sms.dlr_mask)) {
-                if (msg_id == -1)
-                    error(0,"AT2[%s]: delivery notification requested, but I have no message ID!",
-                          octstr_get_cstr(privdata->name));
-                else {
-                    Octstr *dlrmsgid = octstr_format("%d", msg_id);
-
-                    dlr_add(privdata->conn->id, dlrmsgid, msg);
-
-                    O_DESTROY(dlrmsgid);
-                }
-            }
-
-            bb_smscconn_sent(privdata->conn, msg, NULL);
-        }
-
-        if (ret != 0) {
-            /*
-             * no need to do counter_increase(privdata->conn->failed) here,
-             * since bb_smscconn_send_failed() will inc the counter on
-             * SMSCCONN_FAILED_MALFORMED
-             */
-            bb_smscconn_send_failed(privdata->conn, msg,
-	        SMSCCONN_FAILED_MALFORMED, octstr_create("MALFORMED"));
-        }
-
-        O_DESTROY(pdu);
-    }
+				int msg_id = -1;
+				/* 
+				 * send the initial command and then wait for > 
+				 */
+				sprintf(command, "AT+CMGS=%ld", octstr_len(pdu) / 2);
+				
+				ret = at2_send_modem_command(privdata, command, 5, 1);
+				debug("bb.smsc.at2", 0, "AT2[%s]: send command status: %d",
+							octstr_get_cstr(privdata->name), ret);
+
+				if (ret == 1) {/* > only! */
+						
+					/* 
+					 * Ok the > has been see now so we can send the PDU now and a 
+					 * control Z but no CR or LF 
+					 * 
+					 * We will handle the 'nokiaphone' types a bit differently, since
+					 * they have a generic error in accepting PDUs that are "too big".
+					 * Which means, PDU that are longer then 18 bytes get truncated by
+					 * the phone modems. We'll buffer the PDU output in a loop.
+					 * All other types will get handled as used to be.
+					 */
+
+					if (octstr_compare(privdata->modem->id, octstr_imm("nokiaphone")) != 0) {           
+					
+							sprintf(command, "%s%s", sc, octstr_get_cstr(pdu));
+							at2_write(privdata, command);
+							at2_write_ctrlz(privdata);
+					
+					} else {
+					
+							/* include the CTRL-Z in the PDU string */
+							sprintf(command, "%s%s%c", sc, octstr_get_cstr(pdu), 0x1A);
+		 
+							/* chop PDU into 18-byte-at-a-time pieces to prevent choking 
+							 * of certain GSM Phones (e.g. Nokia 6310, 6230 etc.) */
+							if (strlen(command) > 18) {
+									unsigned char chop[20];
+									int len = strlen(command);
+									int pos = 0;
+									int ret = 18;
+
+									while (pos < len) {
+											if (pos + ret > len)
+													ret = len - pos;
+											memcpy(chop, command + pos, ret);
+											pos += ret;
+											chop[ret] = '\0';
+											at2_write(privdata, chop);
+											gwthread_sleep((double) 10/1000);
+									}
+							} else {
+									at2_write(privdata, command);
+							}
+					}               
+							
+					/* wait 20 secs for modem command */
+					ret = at2_wait_modem_command(privdata, 20, 0, &msg_id);
+					debug("bb.smsc.at2", 0, "AT2[%s]: send command status: %d",
+								octstr_get_cstr(privdata->name), ret);
+
+					if (ret != 0) {
+							bb_smscconn_send_failed(privdata->conn, msg,
+						SMSCCONN_FAILED_TEMPORARILY, octstr_create("ERROR"));
+					}else{
+						/* store DLR message if needed for SMSC generated delivery reports */
+						if (DLR_IS_ENABLED_DEVICE(msg->sms.dlr_mask)) {
+								if (msg_id == -1)
+										error(0,"AT2[%s]: delivery notification requested, but I have no message ID!",
+													octstr_get_cstr(privdata->name));
+								else {
+										Octstr *dlrmsgid = octstr_format("%d", msg_id);
+
+										dlr_add(privdata->conn->id, dlrmsgid, msg);
+
+										O_DESTROY(dlrmsgid);
+								}
+						}
+
+						bb_smscconn_sent(privdata->conn, msg, NULL);
+					}
+				}
+				O_DESTROY(pdu);
+		}
 }
 
 
Index: gw/smsc/smsc_at.h
===================================================================
RCS file: /home/cvs/gateway/gw/smsc/smsc_at.h,v
retrieving revision 1.12
diff -u -r1.12 smsc_at.h
--- gw/smsc/smsc_at.h	7 Jan 2007 23:52:53 -0000	1.12
+++ gw/smsc/smsc_at.h	11 Sep 2007 10:34:18 -0000
@@ -82,8 +82,8 @@
 #define PNT_INTER       1
 #define PNT_NATIONAL    2
 
-/* The number of times to attempt to send a message should sending fail */
-#define RETRY_SEND 3
+/* The number of times to attempt to write a line should writing fail */
+#define RETRY_WRITE 3
 
 /* 
  * defines for use with the so-called "SIM buffering techinique":