1
0
Fork 0

minor change to mm7/soap parameters

This commit is contained in:
bagyenda 2008-04-11 07:01:35 +00:00
parent 2179aa0b3c
commit ee5c86878d
7 changed files with 24 additions and 5 deletions

View File

@ -1,3 +1,6 @@
2008-04-11 P. A. Bagyenda <bagyenda@dsmagic.com>
* Added no-sender-address config to mmsc section: Allows you to
* suppress SenderAddress SOAP/XML tag
2008-03-26 P. A. Bagyenda <bagyenda@dsmagic.com>
* Minor fix: mmsbox mms-service handling of POST parameters where no % spec given
2008-02-17 P. A. Bagyenda <bagyenda@dsmagic.com>

View File

@ -2454,6 +2454,19 @@ string
</td>
</tr>
<tr>
<td valign=top >
<tt>no-sender-address</tt>
</td>
<td valign=top >
Boolean
</td>
<td valign=top >
If set to <tt>true</tt> Mbuni will not set
the <tt>SenderAddress</tt> tag in the SOAP Message Submit XML packet
</td>
</tr>
</table>

View File

@ -147,6 +147,7 @@ MULTI_GROUP(mmsc,
OCTSTR(reroute-add-sender-to-subject)
OCTSTR(mmsc-library)
OCTSTR(custom-settings)
OCTSTR(no-sender-address)
)
MULTI_GROUP(mms-service,

View File

@ -1029,10 +1029,10 @@ MSoapMsg_t *mm7_mmsmsg_to_soap(MmsMsg *msg, Octstr *from, List *xto,
switch(mtype) {
case MMS_MSGTYPE_SEND_REQ:
case MMS_MSGTYPE_RETRIEVE_CONF:
m = mm7_soap_create(isclientside ? MM7_TAG_SubmitReq : MM7_TAG_DeliverReq,
transid);
m = mm7_soap_create(isclientside ? MM7_TAG_SubmitReq : MM7_TAG_DeliverReq,
transid);
m->msg = mms_tomime(msg,1);
strip_non_essential_headers(m->msg);
for (i = 0, n = xto ? gwlist_len(xto) : 0; i < n; i++) { /* Add recipients. */

View File

@ -666,7 +666,8 @@ static Octstr *mm7soap_send(MmscGrp *mmc, Octstr *from, Octstr *to,
if (hdrs)
distrib = http_header_value(hdrs, octstr_imm("X-Mbuni-DistributionIndicator"));
if ((mreq = mm7_mmsmsg_to_soap(m, from, xto, transid,
if ((mreq = mm7_mmsmsg_to_soap(m, (mmc == NULL || mmc->no_senderaddress == 0) ? from : NULL,
xto, transid,
service_code,
linkedid,
1, octstr_get_cstr(mmc->id), vasid, NULL, 0,/* UA N/A on this side. */

View File

@ -283,6 +283,7 @@ int mms_load_mmsbox_settings(mCfg *cfg, gwthread_func_t *mmsc_handler_func)
if (m->reroute_mmsc_id != NULL && m->reroute == 0)
warning(0, "MMSBox: reroute-mmsc-id parameter set but reroute=false!");
mms_cfg_get_bool(x, octstr_imm("no-sender-address"), &m->no_senderaddress);
m->mutex = mutex_create();
/* finally start the thingie. */

View File

@ -37,7 +37,7 @@ typedef struct MmscGrp {
int reroute; /* whether messages from this mmsc are re-routed outwards. */
Octstr *reroute_mmsc_id;
int no_senderaddress; /* used by SOAP interface: Don't add a sender address. */
int reroute_mod_subject; /* Set to true if we'll change subject line on reroute. */
MM7Version_t ver; /* supported MM7/SOAP version. */
int use_mt_filter; /* whether to use MT filter on this connection. */