hwelte
/
mbuni
1
0
Fork 0
Code Releases Activity

*** empty log message ***

This commit is contained in:
bagyenda 2009-05-06 07:51:53 +00:00
parent 6b35184a7e
commit 3d663b90a9
7 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mbuni/ChangeLog
View File

@ -2,6 +2,8 @@
* 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
* Fixed: When MM1 notification attempts exceed maximum, do not delete message, rather wait for expiry
* Added mm1-maximum-notify-attempts config option, so that number of MM1 notifications can be controlled
separately from other delivery attempts
2009-03-28 P. A. Bagyenda <bagyenda@dsmagic.com>
* Improved pgsql-queue module: re-connect to db if connections die, only allocate as many connections as needed
2009-03-05 P. A. Bagyenda <bagyenda@dsmagic.com>

1
mbuni/doc/examples/mmsc.conf
View File

@ -13,6 +13,7 @@ max-send-threads = 5
send-mail-prog = /usr/sbin/sendmail -f '%f' '%t'
unified-prefix = "+25637,037,37"
maximum-send-attempts = 50
mm1-maximum-notify-attempts = 1
default-message-expiry = 360000
max-message-expiry = 720000
mmsc-services = Relay,MM1

24
mbuni/doc/userguide.shtml
View File

@ -936,6 +936,30 @@ lists all the configuration directives. The column <b>Mode</b>
&nbsp; &nbsp;</td>
</tr>
<tr>
<tr>
<td valign=top >
<tt>mm1-maximum-notify-attempts
</tt>
&nbsp; &nbsp;</td>
<td valign=top >
<i>MMSC</i>
&nbsp; &nbsp;
</td>
<td valign=top >
integer
&nbsp; &nbsp;</td>
<td valign=top >
Maximum number
of attempts gateway must make to notify a device of a pending
message on the MM1 interface, before giving up. Defaults to <tt>maximum-send-attempts</tt>
&nbsp; &nbsp;</td>
</tr>
<tr>
<td valign=top >
<tt>default-message-expiry</tt>

1
mbuni/mmlib/mms_cfg.def
View File

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

3
mbuni/mmsc/mmsc_cfg.c
View File

@ -201,6 +201,9 @@ MmscSettings *mms_load_mmsc_settings(Octstr *fname, List **proxyrelays, int skip
if (mms_cfg_get_int(cfg, grp, octstr_imm("maximum-send-attempts"), &m->maxsendattempts) == -1)
m->maxsendattempts = MAXQTRIES;
if (mms_cfg_get_int(cfg, grp, octstr_imm("mm1-maximum-notify-attempts"), &m->mm1_maxsendattempts) == -1)
m->mm1_maxsendattempts = m->maxsendattempts;
if (mms_cfg_get_int(cfg, grp, octstr_imm("default-message-expiry"), &m->default_msgexpiry) == -1)
m->default_msgexpiry = DEFAULT_EXPIRE;

2
mbuni/mmsc/mmsc_cfg.h
View File

@ -68,7 +68,7 @@ typedef struct MmscSettings {
Octstr *ua_profile_cache_dir;
long maxthreads;
long maxsendattempts;
long maxsendattempts, mm1_maxsendattempts;
long default_msgexpiry;
long max_msgexpiry;
double queue_interval, mm1_queue_interval;

2
mbuni/mmsc/mmsmobilesender.c
View File

@ -180,7 +180,7 @@ static int sendNotify(MmsEnvelope *e)
prov_notify_event = "failedfetch";
rtype = "Expired";
goto done;
} else if (e->attempts >= settings->maxsendattempts) {
} else if (e->attempts >= settings->mm1_maxsendattempts) {
err = octstr_format("MM1: Maximum delivery attempts [%d] to %S reached. Delivery suspended!",
e->attempts, to);
res = MMS_SEND_OK;