*** empty log message ***
This commit is contained in:
parent
e1c18c07a4
commit
fbbec2877b
|
@ -885,7 +885,8 @@ int mm_lockfile(int fd, char *fname, int shouldblock)
|
||||||
void mms_collect_envdata_from_msgheaders(List *mh, List **xto,
|
void mms_collect_envdata_from_msgheaders(List *mh, List **xto,
|
||||||
Octstr **subject,
|
Octstr **subject,
|
||||||
Octstr **otransid, time_t *expiryt,
|
Octstr **otransid, time_t *expiryt,
|
||||||
time_t *deliveryt, long default_msgexpiry)
|
time_t *deliveryt, long default_msgexpiry,
|
||||||
|
char *unified_prefix, List *strip_prefixes)
|
||||||
{
|
{
|
||||||
|
|
||||||
Octstr *s;
|
Octstr *s;
|
||||||
|
@ -895,9 +896,9 @@ void mms_collect_envdata_from_msgheaders(List *mh, List **xto,
|
||||||
for (i = 0, n = gwlist_len(l); i<n; i++) {
|
for (i = 0, n = gwlist_len(l); i<n; i++) {
|
||||||
Octstr *name, *value;
|
Octstr *name, *value;
|
||||||
http_header_get(l, i, &name, &value);
|
http_header_get(l, i, &name, &value);
|
||||||
|
_mms_fixup_address(&value, unified_prefix, strip_prefixes, 1);
|
||||||
gwlist_append(*xto, value);
|
gwlist_append(*xto, value);
|
||||||
octstr_destroy(name);
|
octstr_destroy(name);
|
||||||
|
|
||||||
}
|
}
|
||||||
http_destroy_headers(l);
|
http_destroy_headers(l);
|
||||||
}
|
}
|
||||||
|
@ -908,6 +909,7 @@ void mms_collect_envdata_from_msgheaders(List *mh, List **xto,
|
||||||
for (i = 0, n = gwlist_len(l); i<n; i++) {
|
for (i = 0, n = gwlist_len(l); i<n; i++) {
|
||||||
Octstr *name, *value;
|
Octstr *name, *value;
|
||||||
http_header_get(l, i, &name, &value);
|
http_header_get(l, i, &name, &value);
|
||||||
|
_mms_fixup_address(&value, unified_prefix, strip_prefixes, 1);
|
||||||
gwlist_append(*xto, value);
|
gwlist_append(*xto, value);
|
||||||
octstr_destroy(name);
|
octstr_destroy(name);
|
||||||
|
|
||||||
|
@ -923,6 +925,7 @@ void mms_collect_envdata_from_msgheaders(List *mh, List **xto,
|
||||||
for (i = 0, n = gwlist_len(l); i<n; i++) {
|
for (i = 0, n = gwlist_len(l); i<n; i++) {
|
||||||
Octstr *name, *value;
|
Octstr *name, *value;
|
||||||
http_header_get(l, i, &name, &value);
|
http_header_get(l, i, &name, &value);
|
||||||
|
_mms_fixup_address(&value, unified_prefix, strip_prefixes, 1);
|
||||||
gwlist_append(*xto, value);
|
gwlist_append(*xto, value);
|
||||||
octstr_destroy(name);
|
octstr_destroy(name);
|
||||||
|
|
||||||
|
|
|
@ -146,7 +146,8 @@ Octstr *_mms_cfg_getx(mCfgGrp *grp, Octstr *item);
|
||||||
void mms_collect_envdata_from_msgheaders(List *mh, List **xto,
|
void mms_collect_envdata_from_msgheaders(List *mh, List **xto,
|
||||||
Octstr **subject,
|
Octstr **subject,
|
||||||
Octstr **otransid, time_t *expiryt,
|
Octstr **otransid, time_t *expiryt,
|
||||||
time_t *deliveryt, long default_msgexpiry);
|
time_t *deliveryt, long default_msgexpiry,
|
||||||
|
char *unified_prefix, List *strip_prefixes);
|
||||||
|
|
||||||
/* Simple hash function */
|
/* Simple hash function */
|
||||||
unsigned long _mshash(char *s);
|
unsigned long _mshash(char *s);
|
||||||
|
|
|
@ -390,7 +390,9 @@ static void mm7eaif_receive(MmsHTTPClientInfo *h)
|
||||||
*/
|
*/
|
||||||
mms_collect_envdata_from_msgheaders(mh, &to, &subject,
|
mms_collect_envdata_from_msgheaders(mh, &to, &subject,
|
||||||
&otransid, &expiryt, &deliveryt,
|
&otransid, &expiryt, &deliveryt,
|
||||||
DEFAULT_EXPIRE);
|
DEFAULT_EXPIRE,
|
||||||
|
octstr_get_cstr(unified_prefix),
|
||||||
|
strip_prefixes);
|
||||||
|
|
||||||
|
|
||||||
if ((hto = http_header_find_all(h->headers, "X-NOKIA-MMSC-To")) != NULL &&
|
if ((hto = http_header_find_all(h->headers, "X-NOKIA-MMSC-To")) != NULL &&
|
||||||
|
|
|
@ -79,7 +79,9 @@ static int sendMsg(MmsEnvelope *e)
|
||||||
MmsEnvelopeTo *to = gwlist_get(e->to, i);
|
MmsEnvelopeTo *to = gwlist_get(e->to, i);
|
||||||
Octstr *s = octstr_duplicate(to->rcpt);
|
Octstr *s = octstr_duplicate(to->rcpt);
|
||||||
|
|
||||||
_mms_fixup_address(&s, octstr_get_cstr(settings->unified_prefix), settings->strip_prefixes, 1);
|
_mms_fixup_address(&s,
|
||||||
|
octstr_get_cstr(settings->unified_prefix),
|
||||||
|
settings->strip_prefixes, 1);
|
||||||
gwlist_append(l, s);
|
gwlist_append(l, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -555,7 +555,9 @@ static void sendmms_proxy(MmsHTTPClientInfo *h)
|
||||||
Octstr *sdf = NULL;
|
Octstr *sdf = NULL;
|
||||||
|
|
||||||
mms_collect_envdata_from_msgheaders(mh, &to, &subject, &otransid, &expiryt,
|
mms_collect_envdata_from_msgheaders(mh, &to, &subject, &otransid, &expiryt,
|
||||||
&deliveryt, settings->default_msgexpiry);
|
&deliveryt, settings->default_msgexpiry,
|
||||||
|
octstr_get_cstr(settings->unified_prefix),
|
||||||
|
settings->strip_prefixes);
|
||||||
|
|
||||||
if (!h->client_addr) {
|
if (!h->client_addr) {
|
||||||
mresp = mms_sendconf("Error-sending-address-unresolved", "None",
|
mresp = mms_sendconf("Error-sending-address-unresolved", "None",
|
||||||
|
@ -678,7 +680,9 @@ static void sendmms_proxy(MmsHTTPClientInfo *h)
|
||||||
|
|
||||||
|
|
||||||
mms_collect_envdata_from_msgheaders(mh, &to, &subject, &otransid, &expiryt,
|
mms_collect_envdata_from_msgheaders(mh, &to, &subject, &otransid, &expiryt,
|
||||||
&deliveryt, settings->default_msgexpiry);
|
&deliveryt, settings->default_msgexpiry,
|
||||||
|
octstr_get_cstr(settings->unified_prefix),
|
||||||
|
settings->strip_prefixes);
|
||||||
|
|
||||||
if (!h->client_addr) {
|
if (!h->client_addr) {
|
||||||
mresp = mms_sendconf("Error-sending-address-unresolved", "None", octstr_get_cstr(otransid),1,
|
mresp = mms_sendconf("Error-sending-address-unresolved", "None", octstr_get_cstr(otransid),1,
|
||||||
|
@ -1032,7 +1036,9 @@ static void sendmms_proxy(MmsHTTPClientInfo *h)
|
||||||
goto mdone2;
|
goto mdone2;
|
||||||
|
|
||||||
mms_collect_envdata_from_msgheaders(mh, &to, NULL, NULL, NULL, NULL,
|
mms_collect_envdata_from_msgheaders(mh, &to, NULL, NULL, NULL, NULL,
|
||||||
settings->default_msgexpiry);
|
settings->default_msgexpiry,
|
||||||
|
octstr_get_cstr(settings->unified_prefix),
|
||||||
|
settings->strip_prefixes);
|
||||||
|
|
||||||
x = settings->qfs->mms_queue_add(from, to, NULL, NULL, NULL, time(NULL),
|
x = settings->qfs->mms_queue_add(from, to, NULL, NULL, NULL, time(NULL),
|
||||||
time(NULL) + settings->default_msgexpiry,
|
time(NULL) + settings->default_msgexpiry,
|
||||||
|
@ -1785,7 +1791,9 @@ static void mm7eaif_dispatch(MmsHTTPClientInfo *h)
|
||||||
* for now we ignore adaptation flags.
|
* for now we ignore adaptation flags.
|
||||||
*/
|
*/
|
||||||
mms_collect_envdata_from_msgheaders(mh, &to, &subject, &otransid, &expiryt,
|
mms_collect_envdata_from_msgheaders(mh, &to, &subject, &otransid, &expiryt,
|
||||||
&deliveryt, settings->default_msgexpiry);
|
&deliveryt, settings->default_msgexpiry,
|
||||||
|
octstr_get_cstr(settings->unified_prefix),
|
||||||
|
settings->strip_prefixes);
|
||||||
|
|
||||||
|
|
||||||
if ((hto = http_header_find_all(h->headers, "X-NOKIA-MMSC-To")) != NULL &&
|
if ((hto = http_header_find_all(h->headers, "X-NOKIA-MMSC-To")) != NULL &&
|
||||||
|
|
Loading…
Reference in New Issue