1
0
Fork 0

vasp-id added

This commit is contained in:
bagyenda 2008-10-02 13:49:07 +00:00
parent 5cd0188e94
commit c26a3d3e24
6 changed files with 25 additions and 2 deletions

View File

@ -1,3 +1,5 @@
2008-10-02 P. A. Bagyenda <bagyenda@dsmagic.com>
* Added vasp-id param to mmsbox mmsc config (thanks to Christian Theil Have <christiantheilhave@gmail.com>)
2008-09-30 P. A. Bagyenda <bagyenda@dsmagic.com>
* Fix in mbuni management interface XML output
2008-09-29 P. A. Bagyenda <bagyenda@dsmagic.com>

View File

@ -2270,7 +2270,21 @@ Supported configuration parameters are:
</td>
<td valign=top >
Mandatory:
Identifying name for this connection (used in logs for instance). For MM7 connections it also used as the VASP ID parameter
Identifying name for this connection (used in logs for instance). For MM7 connections it also used as the VASP ID parameter, when vasp-id is not specified.
</td>
</tr>
<tr>
<td valign=top >
<tt>vasp-id</tt>
</td>
<td valign=top >
String
</td>
<td valign=top >
Optional:
For MM7 connections it is used to explicitly set the VASP ID parameter. If left unspecified, the id is used instead.
</td>
</tr>

View File

@ -159,6 +159,7 @@ MULTI_GROUP(send-mms-user,
MULTI_GROUP(mmsc,
OCTSTR(id)
OCTSTR(group-id)
OCTSTR(vasp-id)
OCTSTR(mmsc-url)
OCTSTR(incoming-username)
OCTSTR(incoming-password)

View File

@ -1016,7 +1016,7 @@ static Octstr *mm7soap_send(MmscGrp *mmc, Octstr *from, Octstr *to,
xto, transid,
service_code,
linkedid,
1, octstr_get_cstr(mmc->id), xvasid, NULL, 0,/* UA N/A on this side. */
1, octstr_get_cstr(mmc->vasp_id), xvasid, NULL, 0,/* UA N/A on this side. */
distrib)) == NULL) {
*error = octstr_format("Failed to convert Msg[%S] 2 SOAP message!",
mms_message_type_to_string(mtype));

View File

@ -528,6 +528,10 @@ MmscGrp *start_mmsc_from_conf(mCfg *cfg, mCfgGrp *x, gwthread_func_t *mmsc_handl
m->group_id = mms_cfg_get(cfg, x, octstr_imm("group-id"));
if (m->group_id == NULL)
m->group_id = octstr_duplicate(m->id);
m->vasp_id = mms_cfg_get(cfg, x, octstr_imm("vasp-id"));
if (m->vasp_id == NULL)
m->vasp_id = octstr_duplicate(m->id);
m->mmsc_url = _mms_cfg_getx(cfg, x, octstr_imm("mmsc-url"));
@ -1094,6 +1098,7 @@ static void free_mmsc_struct (MmscGrp *m)
octstr_destroy(m->id);
octstr_destroy(m->group_id);
octstr_destroy(m->vasp_id);
octstr_destroy(m->mmsc_url);
octstr_destroy(m->incoming.user);

View File

@ -23,6 +23,7 @@
typedef struct MmscGrp {
Octstr *id; /* MMSC id (for logging). */
Octstr *group_id; /* GROUP MMSC id (used for qf). */
Octstr *vasp_id; /* vasp id for SOAP mmsc */
Octstr *mmsc_url; /* URL at which MMSC can be reached. */
struct {
Octstr *user, *pass;