1
0
Fork 0

*** empty log message ***

This commit is contained in:
bagyenda 2008-04-20 08:11:40 +00:00
parent 232351d5ce
commit 72ea4e45f0
3 changed files with 11 additions and 9 deletions

View File

@ -34,7 +34,9 @@ Octstr *_mms_cfg_getx(mCfgGrp *grp, Octstr *item)
{
Octstr *v = mms_cfg_get(grp, item);
return v ? v : octstr_create("");
void *x = v ? v : octstr_create("");
return x;
}

View File

@ -128,8 +128,8 @@ MmscSettings *mms_load_mmsc_settings(mCfg *cfg, List **proxyrelays)
if (!s || (m->queue_interval = atof(octstr_get_cstr(s))) <= 0)
m->queue_interval = QUEUERUN_INTERVAL;
if (s)
octstr_destroy(s);
octstr_destroy(s);
if (mms_cfg_get_int(grp, octstr_imm("send-attempt-back-off"), &m->send_back_off) == -1)
m->send_back_off = BACKOFF_FACTOR;
@ -137,8 +137,8 @@ MmscSettings *mms_load_mmsc_settings(mCfg *cfg, List **proxyrelays)
/* Make send sms url. */
m->sendsms_url = _mms_cfg_getx(grp, octstr_imm("sendsms-url"));
user = _mms_cfg_getx(grp, octstr_imm("sendsms-username"));
pass = _mms_cfg_getx(grp, octstr_imm("sendsms-password"));
user = mms_cfg_get(grp, octstr_imm("sendsms-username"));
pass = mms_cfg_get(grp, octstr_imm("sendsms-password"));
from = mms_cfg_get(grp, octstr_imm("sendsms-global-sender"));
i = octstr_search_char(m->sendsms_url, '?', 0); /* If ? is in there, omit below. */
@ -252,8 +252,8 @@ MmscSettings *mms_load_mmsc_settings(mCfg *cfg, List **proxyrelays)
if (mms_cfg_get_bool(grp, octstr_imm("send-dlr-on-fetch"), &m->dlr_on_fetch) < 0)
m->dlr_on_fetch = 0;
if (qdir)
octstr_destroy(qdir);
octstr_destroy(qdir);
/* Now load the VASP list. */
l = mms_cfg_get_multi(cfg, octstr_imm("mms-vasp"));
@ -284,7 +284,7 @@ MmscSettings *mms_load_mmsc_settings(mCfg *cfg, List **proxyrelays)
octstr_destroy(s);
mv->ver.major = mv->ver.minor1 = mv->ver.minor2 = 0;
if ((s = _mms_cfg_getx(grp, octstr_imm("mm7-version"))) != NULL &&
if ((s = mms_cfg_get(grp, octstr_imm("mm7-version"))) != NULL &&
octstr_len(s) > 0)
sscanf(octstr_get_cstr(s), "%d.%d.%d", &mv->ver.major, &mv->ver.minor1, &mv->ver.minor2);
else {

View File

@ -382,7 +382,7 @@ static int sendMsg(MmsEnvelope *e)
gwlist_produce(cdr_list, cdr); /* Put it on list so sending thread sends it. */
}
octstr_destroy(err);
/* Update queue entry so that we know which ones have been processed. */
e->lasttry = tnow;
if (settings->qfs->mms_queue_update(e) == 1) {