diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog index 7031975..90eb750 100644 --- a/mbuni/ChangeLog +++ b/mbuni/ChangeLog @@ -1,12 +1,14 @@ -Mbuni 0.9.6 - 2005-02-05 +2005-02-05 P. A. Bagyenda * Initial release 0.9.6 -Mbuni 0.9.7 - 2005-02-20 - * Added support for sending from/to IP addresses - * Applied Soren's patch to generalise determination of local vs non-local recipients. - * New config directives: mms-client-ip-addr, resolver-module-parameters, resolver-library +2005-02-20 P. A. Bagyenda + * Added support for sending from/to IP addresses, new mms-client-ip-addr param + * Generalised determination of local vs non-local recipients. * Fixed bug with message forwarding on MM1 * Fixed bug in mmsproxy when message fetched but fetch not confirmed. * Added access.log * various minor bug fixes -Mbuni 0.9.8 - +2005-02-20 Soren Hansen + * New config directives: resolver-module-parameters, resolver-library +2005-04-13 P. A. Bagyenda * Added mmbox support + * Added MM7/SOAP support diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c index 85757a3..ffd13ad 100644 --- a/mbuni/mmlib/mms_util.c +++ b/mbuni/mmlib/mms_util.c @@ -52,7 +52,7 @@ static void *load_module(CfgGroup *grp, char *config_key, char *symbolname) char sbuf[512]; sprintf(sbuf, "_%s", symbolname); -#endif; +#endif if (x == NULL || ((y = dlsym(x, symbolname)) == NULL #ifdef __APPLE__ /* fink version of dlsym has issues it seems. */ && (y = dlsym(x, sbuf)) == NULL diff --git a/mbuni/mmsc/mmsglobalsender.c b/mbuni/mmsc/mmsglobalsender.c index 8bca54b..4b1c581 100644 --- a/mbuni/mmsc/mmsglobalsender.c +++ b/mbuni/mmsc/mmsglobalsender.c @@ -313,7 +313,7 @@ static void cdr_thread(void *unused) } } -void mbuni_global_queue_runner(void *unused) +void mbuni_global_queue_runner(int *rstop) { mms_setmobile_queuedir(octstr_get_cstr(settings->mm1_queuedir)); @@ -330,7 +330,7 @@ void mbuni_global_queue_runner(void *unused) gwthread_create(cdr_thread, NULL); - mms_queue_run(qdir, sendMsg, settings->queue_interval, settings->maxthreads, &rstop); + mms_queue_run(qdir, sendMsg, settings->queue_interval, settings->maxthreads, rstop); /* When it ends, wait a little for other stuff to stop... */ sleep(2); list_remove_producer(cdr_list); /* Stop CDR thread. */ diff --git a/mbuni/mmsc/mmsmobilesender.c b/mbuni/mmsc/mmsmobilesender.c index 83a4b8f..13ce979 100644 --- a/mbuni/mmsc/mmsmobilesender.c +++ b/mbuni/mmsc/mmsmobilesender.c @@ -453,7 +453,7 @@ static int sendNotify(MmsEnvelope *e) return 1; } -void mbuni_mm1_queue_runner(void *unused) +void mbuni_mm1_queue_runner(int *rstop) { httpcaller = http_caller_create(); if (gwthread_create((gwthread_func_t *)receive_push_reply, httpcaller) < 0) { /* Listener thread. */ @@ -463,7 +463,7 @@ void mbuni_mm1_queue_runner(void *unused) } mms_queue_run(octstr_get_cstr(settings->mm1_queuedir), - sendNotify, settings->queue_interval, settings->maxthreads, &rstop); + sendNotify, settings->queue_interval, settings->maxthreads, rstop); sleep(2); /* Wait for it to die. */ http_caller_signal_shutdown(httpcaller); sleep(2); diff --git a/mbuni/mmsc/mmsproxy.c b/mbuni/mmsc/mmsproxy.c index 82eada1..a69d90b 100644 --- a/mbuni/mmsc/mmsproxy.c +++ b/mbuni/mmsc/mmsproxy.c @@ -1060,8 +1060,9 @@ static void sendmms_proxy(MmsHTTPClientInfo *h) x = mms_queue_add(from, to, NULL, NULL, NULL, time(NULL), time(NULL) + settings->default_msgexpiry, - m, NULL, 0, + m, NULL, NULL, NULL, + 0, octstr_get_cstr(settings->global_queuedir), settings->host_alias); diff --git a/mbuni/mmsc/mmsrelay.c b/mbuni/mmsc/mmsrelay.c index 5f77b92..3af20b1 100644 --- a/mbuni/mmsc/mmsrelay.c +++ b/mbuni/mmsc/mmsrelay.c @@ -17,7 +17,7 @@ MmsBoxSettings *settings; List *proxyrelays; -int rstop = 0; /* Set to 1 to stop relay. */ +static int rstop = 0; /* Set to 1 to stop relay. */ static void quit_now(int notused) { rstop = 1; @@ -91,11 +91,11 @@ int main(int argc, char *argv[]) /* Start global queue runner. */ info(0, "Starting Global Queue Runner..."); - qthread = gwthread_create(mbuni_global_queue_runner, NULL); + qthread = gwthread_create((gwthread_func_t *)mbuni_global_queue_runner, &rstop); /* Start the local queue runner. */ info(0, "Starting Local Queue Runner..."); - mbuni_mm1_queue_runner(NULL); + mbuni_mm1_queue_runner(&rstop); gwthread_join(qthread); /* Wait for it to die... */ diff --git a/mbuni/mmsc/mmsrelay.h b/mbuni/mmsc/mmsrelay.h index 59e48b9..da27fbc 100644 --- a/mbuni/mmsc/mmsrelay.h +++ b/mbuni/mmsc/mmsrelay.h @@ -21,9 +21,8 @@ #include "mms_util.h" #include "mms_mm7soap.h" -extern void mbuni_global_queue_runner(void *unused); -extern void mbuni_mm1_queue_runner(void *unused); +extern void mbuni_global_queue_runner(int *stopflag); +extern void mbuni_mm1_queue_runner(int *stopflag); extern MmsBoxSettings *settings; extern List *proxyrelays; -extern int rstop; #endif diff --git a/mbuni/mmsc/mmssend.c b/mbuni/mmsc/mmssend.c index 9204729..b741cb8 100644 --- a/mbuni/mmsc/mmssend.c +++ b/mbuni/mmsc/mmssend.c @@ -161,8 +161,9 @@ int main(int argc, char *argv[]) s = mms_queue_add(from, to, NULL, NULL, NULL, time(NULL), time(NULL) + settings->default_msgexpiry, m, - NULL, 0, + NULL, NULL, NULL, + 0, octstr_get_cstr(settings->global_queuedir), settings->host_alias);