diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2020-07-15 22:06:06 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2020-07-15 22:06:06 +0300 |
| commit | a0f754eb818dd2561ba825f1ff80df0f61652f40 (patch) | |
| tree | ee59c162a683d278121761e09b845563888e6c03 /include | |
| parent | 34119a423cd4ff37ee9d6140e8dd2a32f48ff3b9 (diff) | |
| download | mailutils-a0f754eb818dd2561ba825f1ff80df0f61652f40.tar.gz mailutils-a0f754eb818dd2561ba825f1ff80df0f61652f40.tar.bz2 | |
smtp mailer: fix multiple open/close on the same mailer
This fixes the operation of the smtp(s) mailer in the following
context
while (cond)
{
mu_mailer_open (mailer, ...);
mu_mailer_send_message (mailer, msg, ...);
mu_mailer_close (mailer);
}
* include/mailutils/mailer.h (mu_mailer_get_streamref)
(mu_mailer_set_stream): Remove.
* include/mailutils/sys/mailer.h (struct _mu_mailer): Remove stream.
* libmailutils/mailer/mailer.c (mu_mailer_create): Don't reference
stream.
(mu_mailer_set_stream,mu_mailer_get_streamref): Remove.
* libproto/mailer/smtp.c (struct _smtp_mailer): New members: tls
and auth.
(smtp_open): Open the stream and assign it.
(_mailer_smtp_init): Create the struct _smtp_mailer object and
save it in the mailer.
(smtp_close): Close and destroy the carrier.
* libproto/mailer/smtp_carrier.c (mu_smtp_set_carrier): Accept
NULL as the carrier argument.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mailutils/mailer.h | 2 | ||||
| -rw-r--r-- | include/mailutils/sys/mailer.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/mailutils/mailer.h b/include/mailutils/mailer.h index 1a8d7104a..10161136a 100644 --- a/include/mailutils/mailer.h +++ b/include/mailutils/mailer.h @@ -51,8 +51,6 @@ extern int mu_mailer_get_url_default (const char** url); extern int mu_mailer_get_property (mu_mailer_t, mu_property_t *); int mu_mailer_set_property (mu_mailer_t, mu_property_t); -extern int mu_mailer_get_streamref (mu_mailer_t, mu_stream_t *); -extern int mu_mailer_set_stream (mu_mailer_t, mu_stream_t); extern int mu_mailer_get_observable (mu_mailer_t, mu_observable_t *); extern int mu_mailer_get_url (mu_mailer_t, mu_url_t *); diff --git a/include/mailutils/sys/mailer.h b/include/mailutils/sys/mailer.h index 9d6d5788a..d52fc54dc 100644 --- a/include/mailutils/sys/mailer.h +++ b/include/mailutils/sys/mailer.h @@ -34,7 +34,6 @@ extern "C" { struct _mu_mailer { - mu_stream_t stream; mu_observable_t observable; mu_url_t url; int flags; |