From eba4e9e09dde48e54a30184024fe60d1ac606106 Mon Sep 17 00:00:00 2001
From: bagyenda <>
Date: Mon, 3 Jan 2011 06:57:50 +0000
Subject: [PATCH] fixed dlr-url call when message not delivered

---
 mbuni/ChangeLog          | 2 ++
 mbuni/configure.ac       | 4 ++--
 mbuni/mmsbox/bearerbox.c | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index 51f4b00..928e922 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,5 @@
+2011-01-03 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* Don't forget to call dlr URL even for failed transmit (with no retry). Thanks to  Piotr Isajew (pki at ex.com.pl)
 2010-12-09 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* Changes to mmsbox to allow it send multiple recipients per MM7 transaction
 2010-11-30 P. A. Bagyenda <bagyenda@dsmagic.com>
diff --git a/mbuni/configure.ac b/mbuni/configure.ac
index aa290c7..8c53553 100644
--- a/mbuni/configure.ac
+++ b/mbuni/configure.ac
@@ -1,6 +1,6 @@
 dnl  Mbuni - Open  Source MMS Gateway 
 dnl
-dnl Copyright (C) 2003 - 2008, Digital Solutions Ltd. - http://www.dsmagic.com
+dnl Copyright (C) 2003 - 2011, Digital Solutions Ltd. - http://www.dsmagic.com
 dnl
 dnl Paul Bagyenda <bagyenda@dsmagic.com>
 dnl 
@@ -368,7 +368,7 @@ cat<<X
 License: 
   Mbuni (version $M_VERSION) - Open  Source MMS Gateway  - http://www.mbuni.org/
 
- Copyright (C) 2003 - 2008, Digital Solutions Ltd. - http://www.dsmagic.com
+ Copyright (C) 2003 - 2011, Digital Solutions Ltd. - http://www.dsmagic.com
 
  This program is free software, distributed under the terms of
  the GNU General Public License, with a few exceptions granted (see LICENSE)
diff --git a/mbuni/mmsbox/bearerbox.c b/mbuni/mmsbox/bearerbox.c
index 633f114..71f41d5 100644
--- a/mbuni/mmsbox/bearerbox.c
+++ b/mbuni/mmsbox/bearerbox.c
@@ -1563,9 +1563,11 @@ static int mms_sendtommsc(MmscGrp *mmc, MmsEnvelope *e,
 	  if (rr_url)
 	       mms_dlr_url_put(id, "read-report", groupid, rr_url, orig_transid);	  
 	  ret = MMS_SEND_OK;
-     } else 
+     } else {
 	  ret = retry ? MMS_SEND_ERROR_TRANSIENT : MMS_SEND_ERROR_FATAL; 
-     
+	  if (!retry && dlr_url)
+	       mms_dlr_url_put(e->msgId, "delivery-report", groupid, dlr_url, orig_transid);	  
+     }
      *new_msgid = id;
           
      octstr_destroy(groupid);