hwelte
/
mbuni
1
0
Fork 0
Code Releases Activity

added default-vasid param

This commit is contained in:
bagyenda 2008-09-11 19:06:49 +00:00
parent 335682874b
commit 04037fbb64
6 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mbuni/ChangeLog
View File

@ -1,6 +1,7 @@
2008-09-11 P. A. Bagyenda <bagyenda@dsmagic.com>
* MMSBox HTTP MMSC type added, for inter-mmsbox message relay
* MM5 support, basic infrastructure on the MMSC side.
* Added default-vasid config param to mmsbox 'mmsc' group
2008-09-08 P. A. Bagyenda <bagyenda@dsmagic.com>
* MMSC admin interface added (start/stop/status of each VASP connection)
* MMSC VASP can now have multiple short codes

18
mbuni/doc/userguide.shtml
View File

@ -1869,14 +1869,14 @@ vasp-url
<tr>
<td valign=top >
<tt>short-code</tt>
<tt>short-codes</tt>
</td>
<td valign=top >
Number
</td>
<td valign=top >
Short number for this VASP: Messages received by Mbuni to this
number are routed to the VASP via MM7.
Semi-colon separated list of short numbers for this VASP: Messages
received by Mbuni to any of these numbers are routed to the VASP via MM7.
</td>
</tr>
@ -2312,6 +2312,18 @@ Supported configuration parameters are:
</td>
</tr>
<tr>
<td valign=top >
<tt>default-vasid</tt>
</td>
<td valign=top >
String
</td>
<td valign=top >
Optional. The default VAS ID for this connection. Only valid for MM7/SOAP.
</td>
</tr>
<tr>
<td valign=top >
<tt>mmsc-url</tt>

1
mbuni/mmlib/mms_cfg.def
View File

@ -180,6 +180,7 @@ MULTI_GROUP(mmsc,
OCTSTR(custom-settings)
OCTSTR(no-sender-address)
OCTSTR(default-vasid)
)
MULTI_GROUP(mms-service,

6
mbuni/mmsbox/bearerbox.c
View File

@ -893,7 +893,9 @@ static Octstr *mm7soap_send(MmscGrp *mmc, Octstr *from, Octstr *to,
List *rh = NULL, *ph = NULL;
Octstr *body = NULL, *rbody = NULL, *url = NULL;
Octstr *s, *distrib = NULL;
char *xvasid = vasid ? vasid :
(mmc->default_vasid ? octstr_get_cstr(mmc->default_vasid) : NULL);
mms_info(0, "MM7", mmc->id, "MMSBox: Send[soap] to MMSC[%s], msg type [%s], from %s, to %s",
mmc->id ? octstr_get_cstr(mmc->id) : "",
mms_message_type_to_cstr(mtype),
@ -907,7 +909,7 @@ static Octstr *mm7soap_send(MmscGrp *mmc, Octstr *from, Octstr *to,
xto, transid,
service_code,
linkedid,
1, octstr_get_cstr(mmc->id), vasid, NULL, 0,/* UA N/A on this side. */
1, octstr_get_cstr(mmc->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));

2
mbuni/mmsbox/mmsbox_cfg.c
View File

@ -590,6 +590,8 @@ MmscGrp *start_mmsc_from_conf(mCfg *cfg, mCfgGrp *x, gwthread_func_t *mmsc_handl
m->ver.use_mm7_namespace = 1;
mms_cfg_get_bool(cfg, x, octstr_imm("use-mm7-soap-namespace-prefix"), &m->ver.use_mm7_namespace);
m->default_vasid = mms_cfg_get(cfg, x, octstr_imm("default-vasid"));
octstr_destroy(xver);
octstr_destroy(type);

2
mbuni/mmsbox/mmsbox_cfg.h
View File

@ -43,6 +43,8 @@ typedef struct MmscGrp {
MM7Version_t ver; /* supported MM7/SOAP version. */
int use_mt_filter; /* whether to use MT filter on this connection. */
Mutex *mutex;
Octstr *default_vasid; /* default vasid for mm7/soap */
MmsBoxMmscFuncs *fns; /* pointer to functions for handling this mmsc connection type */
Octstr *settings; /* settings for the above module. */