Re: the use of DLR_IS_ENABLED macro on smsbox.c

[adi]

On Fri, Sep 26, 2003 at 11:32:01AM +0200, Alexander Malysh wrote:
> Can you please send clean unified patch against 
> cvs? Thanks... (like: cvs diff -Nau )

Ok. File attached.

Regards,

P.Y. Adi Prasaja

Index: gw/smsbox.c
===================================================================
RCS file: /home/cvs/gateway/gw/smsbox.c,v
retrieving revision 1.231
diff -a -u -r1.231 smsbox.c
--- gw/smsbox.c 23 Aug 2003 22:30:11 -0000      1.231
+++ gw/smsbox.c 26 Sep 2003 10:02:05 -0000
@@ -302,6 +302,7 @@
        /* to remember if it's a DLR http get */
     
     receiver->trans = trans;
+    receiver->msg->sms.sms_type = msg->sms.sms_type;
 
     /* remember the HTTP request if we need to queue this */
     receiver->method = method;
@@ -1068,14 +1069,12 @@
         if (reply_body == NULL)
             reply_body = octstr_imm("");
 
-        if (!DLR_IS_ENABLED(msg->sms.dlr_mask)) {
             alog("SMS HTTP-request sender:%s request: '%s' "
                  "url: '%s' reply: %d '%s'",
                  octstr_get_cstr(msg->sms.receiver),
                  (msg->sms.msgdata != NULL) ? octstr_get_cstr(msg->sms.msgdata) : "",
                  octstr_get_cstr(final_url), status,   
                  (status == HTTP_OK) ? "<< successful >>" : 
octstr_get_cstr(reply_body));
-        }
 
 requeued:
         octstr_destroy(final_url);
@@ -1085,7 +1084,7 @@
         http_destroy_headers(req_headers);
         octstr_destroy(req_body);
     
-        if (!DLR_IS_ENABLED(msg->sms.dlr_mask) && !queued) {
+        if (msg->sms.sms_type != report && !queued) {
             if (send_message(trans, msg) < 0)
                 error(0, "failed to send message to phone");
         }