From d62e7331784bcb2bf4abe3024862ebad0198c1c7 Mon Sep 17 00:00:00 2001
From: bagyenda <>
Date: Fri, 16 Jan 2009 05:47:43 +0000
Subject: [PATCH] mm1 improvements

---
 mbuni/ChangeLog              |  2 ++
 mbuni/mmsc/mmsmobilesender.c | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index 7fdab4b..ba3befc 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,5 @@
+2009-01-16 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* Minor update to mmsc mm1 notifier: cleanup
 2009-01-12 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* Minor fixes: Output from admin interfaces always valid XML
 	* Minor fixes: admin module
diff --git a/mbuni/mmsc/mmsmobilesender.c b/mbuni/mmsc/mmsmobilesender.c
index b52d4eb..98ff27f 100644
--- a/mbuni/mmsc/mmsmobilesender.c
+++ b/mbuni/mmsc/mmsmobilesender.c
@@ -19,11 +19,11 @@
 #define WAPPUSH_PORT 2948
 
 
-static MmsEnvelope *update_env_success(MmsEnvelope *e, MmsEnvelopeTo *xto)
+static MmsEnvelope *update_env(MmsEnvelope *e, MmsEnvelopeTo *xto, int success)
 {
      time_t tnow = time(NULL);
      
-     if (xto && !(e->msgtype == MMS_MSGTYPE_SEND_REQ || 
+     if (success && xto && !(e->msgtype == MMS_MSGTYPE_SEND_REQ || 
 		  e->msgtype == MMS_MSGTYPE_RETRIEVE_CONF))
 	  xto->process = 0; /* No more processing. */
      else {
@@ -46,6 +46,7 @@ static MmsEnvelope *update_env_success(MmsEnvelope *e, MmsEnvelopeTo *xto)
      return e;
 } 
 
+#if 0
 static MmsEnvelope *update_env_failed(MmsEnvelope *e)
 {
      
@@ -58,6 +59,7 @@ static MmsEnvelope *update_env_failed(MmsEnvelope *e)
 	  e = NULL;
      return e;
 }
+#endif
 
 static void do_mm1_push(Octstr *rcpt_to, int isphonenum, MmsEnvelope *e, MmsMsg *msg)
 {
@@ -110,12 +112,12 @@ static void do_mm1_push(Octstr *rcpt_to, int isphonenum, MmsEnvelope *e, MmsMsg
 	       mms_error(0,  "MM1", NULL, " Push[%s] from %s, to %s, failed, HTTP code => %d", e->xqfname, 
 			 octstr_get_cstr(e->from), octstr_get_cstr(to), status);	       
 
-	       e = update_env_failed(e);
+	       e = update_env(e,xto,0);
 	  } else {	 /* Successful push. */      
 
 	       mms_log2("Notify", octstr_imm("system"), to, 
 			-1, e ? e->msgId : NULL, NULL, NULL, "MM1", NULL,NULL);
-	       e = update_env_success(e, xto);	       
+	       e = update_env(e, xto, 1);	       
 	  }     
 	  
 	  http_destroy_headers(pheaders);
@@ -137,9 +139,9 @@ static void do_mm1_push(Octstr *rcpt_to, int isphonenum, MmsEnvelope *e, MmsMsg
 	       mms_log2("Notify", octstr_imm("system"), to, 
 			-1, e ? e->msgId : NULL, 
 			NULL, NULL, "MM1", NULL,NULL);
-	       e = update_env_success(e, xto);
+	       e = update_env(e, xto, 1);
 	  } else {
-	       e = update_env_failed(e);
+	    e = update_env(e, NULL, 0);
 	       mms_error(0,  "MM1", NULL, "push to %s:%d failed: %s", octstr_get_cstr(to), WAPPUSH_PORT, strerror(errno));
 	  }
 	  octstr_destroy(addr);