*** empty log message ***

mbuni/ChangeLog

@@ -1,3 +1,5 @@
+2009-05-05 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* added mmsbox-maximum-request-attempts config param
 2009-05-05 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* MMSC fix: don't send subject in notification if size optimisation turned on
 	* Added mm1-queue-run-interval config option, so that MM1 queue can be processed at different interval

mbuni/doc/userguide.shtml

@@ -958,6 +958,28 @@ lists all the configuration directives. The column <b>Mode</b>
   message on the MM1 interface, before giving up. Defaults to <tt>maximum-send-attempts</tt>
   &nbsp; &nbsp;</td>
  </tr>
+
+ <tr>
+  <td  valign=top >
+  <tt>mmsbox-maximum-request-attempts
+  </tt>
+  &nbsp; &nbsp;</td>
+
+  <td valign=top >
+  <i>VAS GW</i>
+  &nbsp; &nbsp;
+</td>
+
+  <td  valign=top >
+  integer
+  &nbsp; &nbsp;</td>
+  <td  valign=top >
+  Maximum number
+  of attempts VAS Gateway must make to fetich a MMS service URL before
+  giving up. Defaults to <tt>maximum-send-attempts</tt> 
+  &nbsp; &nbsp;</td>
+ </tr>
+
  <tr>
 
   <td  valign=top >

mbuni/mmlib/mms_cfg.def

@@ -63,6 +63,7 @@ SINGLE_GROUP(mbuni,
 	OCTSTR(strip-prefixes)
 	OCTSTR(maximum-send-attempts)
 	OCTSTR(mm1-maximum-notify-attempts)
+	OCTSTR(mmsbox-maximum-request-attempts)
 	OCTSTR(default-message-expiry)
 	OCTSTR(max-message-expiry)
 	OCTSTR(queue-run-interval)

mbuni/mmsbox/bearerbox.c

@@ -1397,11 +1397,11 @@ static int sendMsg(MmsEnvelope *e)
                res = MMS_SEND_ERROR_FATAL;
 	       
                goto done;
-          } else if (e->attempts >= mmsbox_maxsendattempts) {
+          } else if (e->attempts >= maxsendattempts) {
                err = octstr_format("MMSBox error: Failed to deliver to "
 				   "%S after %ld attempts. (max attempts allowed is %ld)!", 
                                    to->rcpt, e->attempts, 
-                                   mmsbox_maxsendattempts);
+                                   maxsendattempts);
                res = MMS_SEND_ERROR_FATAL;
                goto done;
           }

mbuni/mmsbox/mmsbox.c

@@ -596,11 +596,11 @@ static int mmsbox_service_dispatch(MmsEnvelope *e)
 	  res = -1;
 	  
 	  goto done;
-     } else if (e->attempts >= mmsbox_maxsendattempts) {
+     } else if (e->attempts >= svc_maxsendattempts) {
 	  err = octstr_format("Failed to deliver [msgid=%S,mmc_id=%S] "
 			      "after %ld attempts. (max attempts allowed is %ld)!", 
 			      e->msgId, e->fromproxy, e->attempts, 
-			      mmsbox_maxsendattempts);
+			      svc_maxsendattempts);
 	  res = -1;
 	  goto done;
      } 

mbuni/mmsbox/mmsbox_cfg.c

@@ -29,7 +29,7 @@
 List   *sendmms_users = NULL; /* list of SendMmsUser structs */
 List   *mms_services = NULL;  /* list of MMS Services */
 Octstr *incoming_qdir, *outgoing_qdir, *dlr_dir;
-long   mmsbox_maxsendattempts, mmsbox_send_back_off, default_msgexpiry, max_msgexpiry = -1;
+long   svc_maxsendattempts, maxsendattempts, mmsbox_send_back_off, default_msgexpiry, max_msgexpiry = -1;
 long   maxthreads = 0;
 double queue_interval = -1;
 Octstr *unified_prefix = NULL;
@@ -108,8 +108,12 @@ int mms_load_mmsbox_settings(Octstr *fname, gwthread_func_t *mmsc_handler_func)
      }
 
      if (mms_cfg_get_int(cfg, grp, 
-			 octstr_imm("maximum-send-attempts"), &mmsbox_maxsendattempts) < 0)
+			 octstr_imm("maximum-send-attempts"), &maxsendattempts) < 0)
-	  mmsbox_maxsendattempts = MAXQTRIES;
+	  maxsendattempts = MAXQTRIES;
+
+     if (mms_cfg_get_int(cfg, grp, 
+			 octstr_imm("mmsbox-maximum-request-attempts"), &svc_maxsendattempts) < 0)
+	  svc_maxsendattempts = maxsendattempts;
      
      if (mms_cfg_get_int(cfg, grp, 
 		     octstr_imm("send-attempt-back-off"), &mmsbox_send_back_off) == -1)

mbuni/mmsbox/mmsbox_cfg.h

@@ -126,7 +126,7 @@ extern Octstr *unified_prefix;
 extern Octstr *sendmail_cmd;
 extern Octstr *myhostname;
 extern List *strip_prefixes;
-extern long mmsbox_maxsendattempts, mmsbox_send_back_off, default_msgexpiry, max_msgexpiry;
+extern long svc_maxsendattempts, maxsendattempts, mmsbox_send_back_off, default_msgexpiry, max_msgexpiry;
 extern long  maxthreads;
 extern double queue_interval;
 extern struct SendMmsPortInfo {