From 82d5a85805e3a4be531936d22ee30f799d27b15f Mon Sep 17 00:00:00 2001 From: bagyenda <> Date: Tue, 24 Jun 2008 10:50:23 +0000 Subject: [PATCH] *** empty log message *** --- mbuni/ChangeLog | 1 + mbuni/mmlib/mms_util.c | 6 +++++- mbuni/mmlib/mms_util.h | 8 ++++---- mbuni/mmsc/mmsglobalsender.c | 11 ++++++----- mbuni/mmsc/mmsproxy.c | 6 ++++-- mbuni/mmsc/mmssend.c | 8 ++++---- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog index c2cc76d..c63f858 100644 --- a/mbuni/ChangeLog +++ b/mbuni/ChangeLog @@ -1,5 +1,6 @@ 2008-06-24 P. A. Bagyenda * Improved queue information: Included source interface + * Extra identifying headers on MMS2Email interface 2008-06-18 P. A. Bagyenda * added qcelp file extension to mime type mapping 2008-05-30 P. A. Bagyenda diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c index 9c5b471..edafa71 100644 --- a/mbuni/mmlib/mms_util.c +++ b/mbuni/mmlib/mms_util.c @@ -673,7 +673,8 @@ int mms_sendtoemail(Octstr *from, Octstr *to, int trans_msg, int trans_smil, char *txt, char *html, int mm4, - char *transid) + char *transid, + List *extra_headers) { MIMEEntity *m = NULL; @@ -701,6 +702,9 @@ int mms_sendtoemail(Octstr *from, Octstr *to, base64_mimeparts(m,0); /* make sure parts are base64 formatted. */ + if (extra_headers) /* add any other headers into the mix. */ + http_header_combine(newhdrs, extra_headers); + headers = mime_entity_headers(m); /* Before we send it, we insert some email friendly headers if they are missing. */ diff --git a/mbuni/mmlib/mms_util.h b/mbuni/mmlib/mms_util.h index 94e6aa4..4180be5 100644 --- a/mbuni/mmlib/mms_util.h +++ b/mbuni/mmlib/mms_util.h @@ -106,13 +106,13 @@ int mms_sendtoemail(Octstr *from, Octstr *to, char *sendmail_cmd, Octstr *myhostname, int trans_msg, int trans_smil, char *txt, char *html, int mm4, - char *transid); + char *transid, List *extra_headers); /* Send directly to email. */ int mm_send_to_email(Octstr *to, Octstr *from, Octstr *subject, - Octstr *msgid, - MIMEEntity *m, int append_hostname, Octstr **error, - char *sendmail_cmd, Octstr *myhostname); + Octstr *msgid, + MIMEEntity *m, int append_hostname, Octstr **error, + char *sendmail_cmd, Octstr *myhostname); /* log to access log. */ void mms_log(char *logmsg, Octstr *from, List *to, diff --git a/mbuni/mmsc/mmsglobalsender.c b/mbuni/mmsc/mmsglobalsender.c index 2101faf..711ccf5 100644 --- a/mbuni/mmsc/mmsglobalsender.c +++ b/mbuni/mmsc/mmsglobalsender.c @@ -46,7 +46,7 @@ static int mms_sendtoproxy(Octstr *from, Octstr *to, Octstr *subject, Octstr *proxy, char *transid, Octstr *msgid, time_t expires, MmsMsg *msg, - int dlr, Octstr *proxy_sendmail_cmd, Octstr **error); + int dlr, Octstr *proxy_sendmail_cmd, List *extra_headers, Octstr **error); static int mms_sendtovasp(MmsVasp *vasp, Octstr *from, Octstr *to, Octstr *msgId, List *qh, @@ -180,7 +180,8 @@ static int sendMsg(MmsEnvelope *e) e->msgId, msg, 0, &err, sendmail_cmd, settings->hostname, 1, 1, octstr_get_cstr(settings->mms_email_txt), - octstr_get_cstr(settings->mms_email_html), 0, e->xqfname); + octstr_get_cstr(settings->mms_email_html), 0, e->xqfname, + e->hdrs); if (res == MMS_SEND_QUEUED) res = MMS_SEND_OK; /* queued to email treated same as sent. * XXX - this means DLR requests for emailed messages not supported! @@ -306,7 +307,7 @@ static int sendMsg(MmsEnvelope *e) e->subject, mp->host, octstr_get_cstr(xtransid), e->msgId, e->expiryt, msg, - mp->confirmed_mm4, mp->sendmail, &err); + mp->confirmed_mm4, mp->sendmail, e->hdrs, &err); sent = 1; octstr_destroy(xtransid); octstr_destroy(xfrom); @@ -532,7 +533,7 @@ static int mms_sendtoproxy(Octstr *from, Octstr *to, Octstr *subject, Octstr *proxy, char *transid, Octstr *msgid, time_t expires, MmsMsg *msg, - int dlr, Octstr *proxy_sendmail_cmd, Octstr **error) + int dlr, Octstr *proxy_sendmail_cmd, List *extra_headers, Octstr **error) { Octstr *pto, *pfrom; @@ -561,7 +562,7 @@ static int mms_sendtoproxy(Octstr *from, Octstr *to, subject ? subject : settings->mms_email_subject, msgid, msg, dlr, error, proxy_sendmail_cmd ? octstr_get_cstr(proxy_sendmail_cmd) : sendmail_cmd, - settings->hostname, 0, 0,NULL,NULL,1, octstr_get_cstr(xtransid)); + settings->hostname, 0, 0,NULL,NULL,1, octstr_get_cstr(xtransid), extra_headers); octstr_destroy(xtransid); if (x == MMS_SEND_QUEUED && !dlr) /* No confirmed sending, and message was queued successfully... */ diff --git a/mbuni/mmsc/mmsproxy.c b/mbuni/mmsc/mmsproxy.c index 6051dfa..0c88341 100644 --- a/mbuni/mmsc/mmsproxy.c +++ b/mbuni/mmsc/mmsproxy.c @@ -515,8 +515,10 @@ static void sendmms_proxy(MmsHTTPClientInfo *h) goto done; } - m = mms_frombinary_ex(h->body, h->client_addr ? h->client_addr : octstr_imm("anon@anon"), - octstr_get_cstr(settings->unified_prefix), settings->strip_prefixes); + m = mms_frombinary_ex(h->body, + h->client_addr ? h->client_addr : octstr_imm("anon@anon"), + octstr_get_cstr(settings->unified_prefix), + settings->strip_prefixes); if (!m) { http_header_add(rh, "Content-Type", "text/plain"); diff --git a/mbuni/mmsc/mmssend.c b/mbuni/mmsc/mmssend.c index fcb991b..474715d 100644 --- a/mbuni/mmsc/mmssend.c +++ b/mbuni/mmsc/mmssend.c @@ -149,11 +149,11 @@ int main(int argc, char *argv[]) if (!m) panic(0, "No Message supplied, or failed to decode binary data!"); -#if DEBUG + h = http_create_empty_headers(); - http_header_add(h, "X-Mms-Tool", "mmssend"); - http_header_add(h, "X-Mms-CalledFrom", "Terminal"); -#endif + http_header_add(h, "X-Mbuni-Tool", "mmssend"); + http_header_add(h, "X-Mbuni-CalledFrom", "Terminal"); + s = settings->qfs->mms_queue_add(from, to, NULL, NULL, NULL, time(NULL), time(NULL) + settings->default_msgexpiry, m, NULL,