1
0
Fork 0

MM4_delivery_report.RES handling fix

This commit is contained in:
bagyenda 2011-09-23 06:27:37 +00:00
parent 5cd58210fe
commit 61ff6817fa
4 changed files with 13 additions and 9 deletions

View File

@ -1,5 +1,7 @@
2011-09-23 P. A. Bagyenda <bagyenda@dsmagic.com>
* Fixed handling of received MM4_delivery_report.RES in mmsc code (thanks to Franz Schwartau (franzi at eletromail.org)
2011-09-20 P. A. Bagyenda <bagyenda@dsmagic.com> 2011-09-20 P. A. Bagyenda <bagyenda@dsmagic.com>
* Fix: MM4_Forward.RES should include original msg ID (thanks to Franz Schwartau (franz@eletromail.org) * Fix: MM4_Forward.RES should include original msg ID (thanks to Franz Schwartau (franz at eletromail.org)
2011-09-08 P. A. Bagyenda <bagyenda@dsmagic.com> 2011-09-08 P. A. Bagyenda <bagyenda@dsmagic.com>
* Exposed more functions in lib (get_stripped_param_value) * Exposed more functions in lib (get_stripped_param_value)
* Minor changes to mms_msg module * Minor changes to mms_msg module

View File

@ -1,4 +1,4 @@
noinst_LIBRARIES = libmms.a lib_LTLIBRARIES = libmms.la
libmms_a_SOURCES = charmibenum.def mms_eventlogger.c mms_mmbox.c mms_msg.c mms_queue.c mms_strings.c mms_uaprof.c mms_util.c mms_mm7soap.c mms_cfg.c libmms_la_SOURCES = charmibenum.def mms_eventlogger.c mms_mmbox.c mms_msg.c mms_queue.c mms_strings.c mms_uaprof.c mms_util.c mms_mm7soap.c mms_cfg.c
EXTRA_DIST=mms_strings.def mms_eventlogger.h mms_mm7soap.h mms_mmbox.h mms_msg.h mms_queue.h mms_strings.h mms_uaprof.h mms_util.h mms_cfg.h mms_cfg.def mms_cfg-impl.h EXTRA_DIST=mms_strings.def mms_eventlogger.h mms_mm7soap.h mms_mmbox.h mms_msg.h mms_queue.h mms_strings.h mms_uaprof.h mms_util.h mms_cfg.h mms_cfg.def mms_cfg-impl.h

View File

@ -1,6 +1,6 @@
libmms = $(top_builddir)/mmlib/libmms.a libmms = $(top_builddir)/mmlib/libmms.a
noinst_LIBRARIES = libmmsbox.a lib_LTLIBRARIES = libmmsbox.la
libmmsbox_a_SOURCES = mmsbox_cdr.c mmsbox_cfg.c dlr.c bearerbox.c mmsbox_resolve.c mmsbox_resolve_shell.c libmmsbox_la_SOURCES = mmsbox_cdr.c mmsbox_cfg.c dlr.c bearerbox.c mmsbox_resolve.c mmsbox_resolve_shell.c
bin_PROGRAMS = mmsbox bin_PROGRAMS = mmsbox
mmsbox_SOURCES = mmsbox.c mmsbox_SOURCES = mmsbox.c
mmsbox_LDADD = libmmsbox.a $(libmms) mmsbox_LDADD = libmmsbox.a $(libmms)

View File

@ -219,7 +219,7 @@ int main(int argc, char *argv[])
} }
} }
if (mm4_type == NULL) { /* else assume a normal send message. */ if (mm4_type == NULL && mtype < 0) { /* else assume a normal send message. */
http_header_add(headers, "X-Mms-Message-Type", "m-send-req"); http_header_add(headers, "X-Mms-Message-Type", "m-send-req");
mm1_type = MMS_MSGTYPE_SEND_REQ; mm1_type = MMS_MSGTYPE_SEND_REQ;
mtype = MM4_FORWARD_REQ; mtype = MM4_FORWARD_REQ;
@ -273,10 +273,12 @@ int main(int argc, char *argv[])
octstr_get_cstr(settings->global_queuedir), octstr_get_cstr(settings->global_queuedir),
mm4_type ? "MM4" : "MM3", mm4_type ? "MM4" : "MM3",
settings->host_alias); settings->host_alias);
newmsgid = msgid ? octstr_duplicate(msgid) :
qf ? mms_make_msgid(octstr_get_cstr(qf),
settings->host_alias) : NULL;
if (qf) { if (qf) {
newmsgid = msgid ? octstr_duplicate(msgid) :
mms_make_msgid(octstr_get_cstr(qf),
settings->host_alias);
mms_info(0, "mmsfromemail", NULL, "%s Queued message to %s from %s (via %s) => %s", mms_info(0, "mmsfromemail", NULL, "%s Queued message to %s from %s (via %s) => %s",
mm4_type ? "MM4 Incoming" : "Email2MMS", mm4_type ? "MM4 Incoming" : "Email2MMS",
octstr_get_cstr(xto), octstr_get_cstr(xfrom), octstr_get_cstr(xto), octstr_get_cstr(xfrom),