hwelte
/
mbuni
1
0
Fork 0
Code Releases Activity

Added Soren's changes for optimising size of notification.ind

This commit is contained in:
bagyenda 2005-03-16 05:16:09 +00:00
parent 05a5863013
commit 148892ef80
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mbuni/mmlib/mms_msg.c
View File

@ -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,
Octstr *transactionid, time_t expiryt)
Octstr *transactionid, time_t expiryt, int optimizesize)
{
MmsMsg *m = gw_malloc(sizeof *m);
char buf[10];
@ -1360,9 +1360,10 @@ MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize, Octstr *url,
} else if (d) \
http_header_add(m->headers, #h, d); \
} while(0)
HX(From,NULL);
HX(Subject,NULL);
if (!optimizesize) {
HX(From,NULL);
HX(Subject,NULL);
}
HX(X-Mms-Message-Class, "Personal");
#undef HX

2
mbuni/mmlib/mms_msg.h
View File

@ -44,7 +44,7 @@ extern List *mms_message_headers(MmsMsg *msg);
/* Make a notification message out of this one and the url given. */
extern MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize,
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);
int mms_remove_headers(MmsMsg *m, char *name);

2
mbuni/mmlib/mms_util.c
View File

@ -201,7 +201,7 @@ MmsBoxSettings *mms_load_mmsbox_settings(Cfg *cfg)
m->mms_detokenizefuncs = NULL;
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;
}

4
mbuni/mmlib/mms_util.h
View File

@ -68,8 +68,10 @@ typedef struct MmsBoxSettings {
MmsDetokenizerFuncStruct *mms_detokenizefuncs; /* Link to detokenizer funcs. */
void *mms_detokenizer_module_data;
int allow_ip_type;
int allow_ip_type;
int optimize_notification_size;
Octstr *prov_notify;
Octstr *prov_notify_arg;
Octstr *prov_getstatus;

3
mbuni/mmsc/mmsmobilesender.c
View File

@ -395,7 +395,8 @@ static int sendNotify(MmsEnvelope *e)
smsg = mms_notification(msg, e->msize, url, transid,
e->expiryt ? e->expiryt :
tnow + settings->default_msgexpiry);
tnow + settings->default_msgexpiry,
settings->optimize_notification_size);
octstr_destroy(transid);
octstr_destroy(url);
} else if (mtype == MMS_MSGTYPE_DELIVERY_IND ||