From 11c50d621703f479a8552f4628cca95074e8aafc Mon Sep 17 00:00:00 2001 From: bagyenda <> Date: Mon, 30 May 2011 05:03:12 +0000 Subject: [PATCH] mmsc_cfg.c fix --- mbuni/ChangeLog | 3 +++ mbuni/mmsc/mmsc_cfg.c | 7 ++++--- mbuni/mmsc/mmsproxy.c | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog index deb3bba..2d426d8 100644 --- a/mbuni/ChangeLog +++ b/mbuni/ChangeLog @@ -1,5 +1,8 @@ +2011-05-30 P. A. Bagyenda + * Fixed mm5 parameters usage in mmsc_cfg.c 2011-05-05 P. A. Bagyenda * Further fixes for RFC 2047 + * Optimize notification size by default 2011-05-04 P. A. Bagyenda * Fixed parsing of encoded-string-value that contains RFC 2047 text (e.g. To, Cc, Bcc fields) 2011-03-28 P. A. Bagyenda diff --git a/mbuni/mmsc/mmsc_cfg.c b/mbuni/mmsc/mmsc_cfg.c index 410b30a..0b3aab2 100644 --- a/mbuni/mmsc/mmsc_cfg.c +++ b/mbuni/mmsc/mmsc_cfg.c @@ -94,7 +94,7 @@ MmscSettings *mms_load_mmsc_settings(Octstr *fname, List **proxyrelays, int skip } if ((m->mm5 = _mms_load_module(cfg, grp, "mm5-module", "mm5_funcs", shell_mm5)) != NULL) { - Octstr *s = mms_cfg_get(cfg, grp, octstr_imm("mm5-module")); + Octstr *s = mms_cfg_get(cfg, grp, octstr_imm("mm5-module-parameters")); if (m->mm5->init(octstr_get_cstr(s)) != 0) panic(0, "Mmsc: Failed to initialise MM5 module!"); @@ -356,8 +356,9 @@ MmscSettings *mms_load_mmsc_settings(Octstr *fname, List **proxyrelays, int skip if (mms_cfg_get_bool(cfg, grp, octstr_imm("allow-ip-type"), &m->allow_ip_type) < 0) m->allow_ip_type = 1; - mms_cfg_get_bool(cfg, grp, octstr_imm("optimize-notification-size"), - &m->optimize_notification_size); + if (mms_cfg_get_bool(cfg, grp, octstr_imm("optimize-notification-size"), + &m->optimize_notification_size) < 0) + m->optimize_notification_size = 1; if (mms_cfg_get_bool(cfg, grp, octstr_imm("content-adaptation"), &m->content_adaptation) < 0) m->content_adaptation = 1; diff --git a/mbuni/mmsc/mmsproxy.c b/mbuni/mmsc/mmsproxy.c index 295afdf..64f3309 100644 --- a/mbuni/mmsc/mmsproxy.c +++ b/mbuni/mmsc/mmsproxy.c @@ -395,7 +395,7 @@ void fetchmms_proxy(MmsHTTPClientInfo *h) http_header_add(rh, "Content-Type", "application/vnd.wap.mms-message"); http_send_reply(h->client, HTTP_OK, rh, s); -#if 1 +#if 0 debug("proxy.fetchinterface", 0, " $$$$$$ fetch message replying with [type=%s,content_len=%ld]: ", mr ? mms_message_type_to_cstr(mms_messagetype(mr)) : (unsigned char *)"none", @@ -411,7 +411,7 @@ void fetchmms_proxy(MmsHTTPClientInfo *h) goto free_stuff; /* Skip to end. */ failed: -#if 1 +#if 0 debug("proxy.fetchinterface", 0, " $$$$$$ fetch message [fail] replying with [type=%s,content_len=%ld]: ", mr ? mms_message_type_to_cstr(mms_messagetype(mr)) : (unsigned char *)"none",