Added Soren's changes for optimising size of notification.ind
This commit is contained in:
parent
05a5863013
commit
148892ef80
|
@ -1333,7 +1333,7 @@ MmsMsg *mms_deliveryreport(Octstr *msgid, Octstr *to, time_t date, Octstr *statu
|
||||||
}
|
}
|
||||||
|
|
||||||
MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize, Octstr *url,
|
MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize, Octstr *url,
|
||||||
Octstr *transactionid, time_t expiryt)
|
Octstr *transactionid, time_t expiryt, int optimizesize)
|
||||||
{
|
{
|
||||||
MmsMsg *m = gw_malloc(sizeof *m);
|
MmsMsg *m = gw_malloc(sizeof *m);
|
||||||
char buf[10];
|
char buf[10];
|
||||||
|
@ -1360,9 +1360,10 @@ MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize, Octstr *url,
|
||||||
} else if (d) \
|
} else if (d) \
|
||||||
http_header_add(m->headers, #h, d); \
|
http_header_add(m->headers, #h, d); \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
if (!optimizesize) {
|
||||||
HX(From,NULL);
|
HX(From,NULL);
|
||||||
HX(Subject,NULL);
|
HX(Subject,NULL);
|
||||||
|
}
|
||||||
HX(X-Mms-Message-Class, "Personal");
|
HX(X-Mms-Message-Class, "Personal");
|
||||||
#undef HX
|
#undef HX
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ extern List *mms_message_headers(MmsMsg *msg);
|
||||||
/* Make a notification message out of this one and the url given. */
|
/* Make a notification message out of this one and the url given. */
|
||||||
extern MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize,
|
extern MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize,
|
||||||
Octstr *url,
|
Octstr *url,
|
||||||
Octstr *transactionid, time_t expiryt);
|
Octstr *transactionid, time_t expiryt, int optimizesize);
|
||||||
|
|
||||||
MmsMsg *mms_retrieveconf(MmsMsg *msg, Octstr *transactionid, char *err, char *errtxt, Octstr *opt_from);
|
MmsMsg *mms_retrieveconf(MmsMsg *msg, Octstr *transactionid, char *err, char *errtxt, Octstr *opt_from);
|
||||||
int mms_remove_headers(MmsMsg *m, char *name);
|
int mms_remove_headers(MmsMsg *m, char *name);
|
||||||
|
|
|
@ -201,7 +201,7 @@ MmsBoxSettings *mms_load_mmsbox_settings(Cfg *cfg)
|
||||||
m->mms_detokenizefuncs = NULL;
|
m->mms_detokenizefuncs = NULL;
|
||||||
|
|
||||||
cfg_get_bool(&m->allow_ip_type, grp, octstr_imm("allow-ip-type"));
|
cfg_get_bool(&m->allow_ip_type, grp, octstr_imm("allow-ip-type"));
|
||||||
|
cfg_get_bool(&m->optimize_notification_size, grp, octstr_imm("optimize-notification-size"));
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,9 @@ typedef struct MmsBoxSettings {
|
||||||
MmsDetokenizerFuncStruct *mms_detokenizefuncs; /* Link to detokenizer funcs. */
|
MmsDetokenizerFuncStruct *mms_detokenizefuncs; /* Link to detokenizer funcs. */
|
||||||
void *mms_detokenizer_module_data;
|
void *mms_detokenizer_module_data;
|
||||||
|
|
||||||
int allow_ip_type;
|
int allow_ip_type;
|
||||||
|
|
||||||
|
int optimize_notification_size;
|
||||||
|
|
||||||
Octstr *prov_notify;
|
Octstr *prov_notify;
|
||||||
Octstr *prov_notify_arg;
|
Octstr *prov_notify_arg;
|
||||||
|
|
|
@ -395,7 +395,8 @@ static int sendNotify(MmsEnvelope *e)
|
||||||
|
|
||||||
smsg = mms_notification(msg, e->msize, url, transid,
|
smsg = mms_notification(msg, e->msize, url, transid,
|
||||||
e->expiryt ? e->expiryt :
|
e->expiryt ? e->expiryt :
|
||||||
tnow + settings->default_msgexpiry);
|
tnow + settings->default_msgexpiry,
|
||||||
|
settings->optimize_notification_size);
|
||||||
octstr_destroy(transid);
|
octstr_destroy(transid);
|
||||||
octstr_destroy(url);
|
octstr_destroy(url);
|
||||||
} else if (mtype == MMS_MSGTYPE_DELIVERY_IND ||
|
} else if (mtype == MMS_MSGTYPE_DELIVERY_IND ||
|
||||||
|
|
Loading…
Reference in New Issue