hwelte
/
mbuni
1
0
Fork 0
Code Releases Activity

*** empty log message ***

This commit is contained in:
bagyenda 2008-08-28 09:40:52 +00:00
parent fb68ed198e
commit bf9218da78
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mbuni/mmlib/mms_cfg.c
View File

@ -115,7 +115,7 @@ static void check_and_add_field(mCfgGrp *grp, Octstr *field, Octstr *value, int
info(0, "field `%s' is not expected within group `%s' at line %d in conf file - skipped", info(0, "field `%s' is not expected within group `%s' at line %d in conf file - skipped",
octstr_get_cstr(field), octstr_get_cstr(grp->name), lineno); octstr_get_cstr(field), octstr_get_cstr(grp->name), lineno);
else if (dict_put_once(grp->fields, field, octstr_duplicate(value)) == 0) else if (dict_put_once(grp->fields, field, octstr_duplicate(value)) == 0)
panic(0, "Duplicate field `%s' at line %d in conf file", error(0, "Duplicate field `%s' at line %d in conf file, ignored",
octstr_get_cstr(field), lineno); octstr_get_cstr(field), lineno);
} }

20
mbuni/mmsbox/mmsbox.c
View File

@ -354,9 +354,14 @@ static int fetch_serviceurl(MmsEnvelope *e,
http_header_add(rh, "X-Mbuni-Message-ID", octstr_get_cstr(e->msgId)); http_header_add(rh, "X-Mbuni-Message-ID", octstr_get_cstr(e->msgId));
if (e->fromproxy) if (e->fromproxy)
http_header_add(rh, "X-Mbuni-MMSC-ID", octstr_get_cstr(e->fromproxy)); http_header_add(rh, "X-Mbuni-MMSC-ID", octstr_get_cstr(e->fromproxy));
if (e->from) if (e->from) {
http_header_add(rh, "X-Mbuni-From", octstr_get_cstr(e->from)); Octstr *xfrom = octstr_duplicate(e->from);
_mms_fixup_address(&xfrom, unified_prefix ? octstr_get_cstr(unified_prefix) : NULL,
strip_prefixes, 0);
http_header_add(rh, "X-Mbuni-From", octstr_get_cstr(xfrom));
octstr_destroy(xfrom);
}
if (e->subject) if (e->subject)
http_header_add(rh, "X-Mbuni-Subject", octstr_get_cstr(e->subject)); http_header_add(rh, "X-Mbuni-Subject", octstr_get_cstr(e->subject));
@ -365,8 +370,13 @@ static int fetch_serviceurl(MmsEnvelope *e,
for (i = 0, n = gwlist_len(e->to); i < n; i++) { for (i = 0, n = gwlist_len(e->to); i < n; i++) {
MmsEnvelopeTo *r = gwlist_get(e->to, i); MmsEnvelopeTo *r = gwlist_get(e->to, i);
if (r && r->rcpt) if (r && r->rcpt) {
http_header_add(rh, "X-Mbuni-To", octstr_get_cstr(r->rcpt)); Octstr *xto = octstr_duplicate(r->rcpt);
_mms_fixup_address(&xto, unified_prefix ? octstr_get_cstr(unified_prefix) : NULL,
strip_prefixes, 0);
http_header_add(rh, "X-Mbuni-To", octstr_get_cstr(xto));
octstr_destroy(xto);
}
} }
if ((s = http_header_value(e->hdrs, octstr_imm("X-Mbuni-UAProf"))) != NULL) { /* add UAProf info, if any. */ if ((s = http_header_value(e->hdrs, octstr_imm("X-Mbuni-UAProf"))) != NULL) { /* add UAProf info, if any. */