X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Femailer.cc;h=71b29db1e06acb42c0fc359ced67bd589197bfee;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hp=9f15df5dcf5bbf4aa5ad5690435ae41da634b475;hpb=1c601e4a63d19c75e6bd4438ba4b885b23e81de4;p=dcpomatic.git diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc index 9f15df5dc..71b29db1e 100644 --- a/src/lib/emailer.cc +++ b/src/lib/emailer.cc @@ -1,25 +1,24 @@ /* Copyright (C) 2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "compose.hpp" -#include "job.h" -#include "data.h" #include "config.h" #include "emailer.h" #include "exceptions.h" @@ -31,12 +30,12 @@ #include "i18n.h" using std::string; -using std::stringstream; using std::min; using std::list; using std::cout; using std::pair; using boost::shared_ptr; +using dcp::Data; Emailer::Emailer (string from, list to, string subject, string body) : _from (from) @@ -46,6 +45,7 @@ Emailer::Emailer (string from, list to, string subject, string body) , _offset (0) { boost::algorithm::replace_all (_body, "\n", "\r\n"); + boost::algorithm::replace_all (_body, "\0", " "); } void @@ -86,13 +86,13 @@ size_t Emailer::get_data (void* ptr, size_t size, size_t nmemb) { size_t const t = min (_email.length() - _offset, size * nmemb); - memcpy (ptr, _email.substr(_offset, size * nmemb).c_str(), size * nmemb); + memcpy (ptr, _email.substr (_offset, t).c_str(), t); _offset += t; return t; } void -Emailer::send (shared_ptr job) +Emailer::send (string server, int port, string user, string password) { char date_buffer[32]; time_t now = time (0); @@ -103,18 +103,18 @@ Emailer::send (shared_ptr job) boost::posix_time::time_duration offset = local_now - utc_now; sprintf (date_buffer + strlen(date_buffer), "%s%02d%02d", (offset.hours() >= 0 ? "+" : "-"), abs (offset.hours()), offset.minutes()); - stringstream email; + locked_stringstream email; email << "Date: " << date_buffer << "\r\n" << "To: " << address_list (_to) << "\r\n" << "From: " << _from << "\r\n"; if (!_cc.empty ()) { - email << "Cc: " << address_list (_cc); + email << "Cc: " << address_list (_cc) << "\r\n"; } if (!_bcc.empty ()) { - email << "Bcc: " << address_list (_bcc); + email << "Bcc: " << address_list (_bcc) << "\r\n"; } string const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; @@ -174,22 +174,13 @@ Emailer::send (shared_ptr job) throw NetworkError ("Could not initialise libcurl"); } - CURLM* mcurl = curl_multi_init (); - if (!mcurl) { - throw NetworkError ("Could not initialise libcurl"); - } - - curl_easy_setopt (curl, CURLOPT_URL, String::compose ( - "smtp://%1:%2", - Config::instance()->mail_server().c_str(), - Config::instance()->mail_port() - ).c_str()); + curl_easy_setopt (curl, CURLOPT_URL, String::compose ("smtp://%1:%2", server.c_str(), port).c_str()); - if (!Config::instance()->mail_user().empty ()) { - curl_easy_setopt (curl, CURLOPT_USERNAME, Config::instance()->mail_user().c_str()); + if (!user.empty ()) { + curl_easy_setopt (curl, CURLOPT_USERNAME, user.c_str ()); } - if (!Config::instance()->mail_password().empty ()) { - curl_easy_setopt (curl, CURLOPT_PASSWORD, Config::instance()->mail_password().c_str()); + if (!password.empty ()) { + curl_easy_setopt (curl, CURLOPT_PASSWORD, password.c_str()); } curl_easy_setopt (curl, CURLOPT_MAIL_FROM, _from.c_str()); @@ -218,91 +209,12 @@ Emailer::send (shared_ptr job) curl_easy_setopt (curl, CURLOPT_DEBUGFUNCTION, curl_debug_shim); curl_easy_setopt (curl, CURLOPT_DEBUGDATA, this); - curl_multi_add_handle (mcurl, curl); - - time_t start = time (0); - - int still_running = 1; - curl_multi_perform (mcurl, &still_running); - - while (still_running) { - - fd_set fdread; - fd_set fdwrite; - fd_set fdexcep; - - FD_ZERO (&fdread); - FD_ZERO (&fdwrite); - FD_ZERO (&fdexcep); - - struct timeval timeout; - timeout.tv_sec = 1; - timeout.tv_usec = 0; - - long curl_timeout = -1; - curl_multi_timeout (mcurl, &curl_timeout); - if (curl_timeout >= 0) { - timeout.tv_sec = curl_timeout / 1000; - if (timeout.tv_sec > 1) { - timeout.tv_sec = 1; - } else { - timeout.tv_usec = (curl_timeout % 1000) * 1000; - } - } - - int maxfd = -1; - CURLMcode mc = curl_multi_fdset (mcurl, &fdread, &fdwrite, &fdexcep, &maxfd); - - if (mc != CURLM_OK) { - throw KDMError (String::compose ("Failed to send KDM email to %1", address_list (_to))); - } - - int rc; - if (maxfd == -1) { -#ifdef DCPOMATIC_WINDOWS - Sleep (100); - rc = 0; -#else - struct timeval wait = { 0, 100 * 1000}; - rc = select (0, 0, 0, 0, &wait); -#endif - } else { - rc = select (maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout); - } - - if (rc < 0) { - throw KDMError ("Failed to send KDM email"); - } - - mc = curl_multi_perform (mcurl, &still_running); - if (mc != CURLM_OK) { - throw KDMError (String::compose ("Failed to send KDM email (%1)", curl_multi_strerror (mc))); - } - - if (job) { - job->set_progress_unknown (); - } - - if ((time(0) - start) > 10) { - throw KDMError (_("Failed to send KDM email (timed out)")); - } + CURLcode const r = curl_easy_perform (curl); + if (r != CURLE_OK) { + throw KDMError (String::compose (_("Failed to send email (%1)"), curl_easy_strerror (r))); } - int messages; - do { - CURLMsg* m = curl_multi_info_read (mcurl, &messages); - if (m && m->data.result != CURLE_OK) { - throw KDMError (String::compose ("Failed to send KDM email (%1)", curl_easy_strerror (m->data.result))); - } - } while (messages > 0); - - /* XXX: we should do this stuff when an exception is thrown, but curl_multi_remove_handle - seems to hang if we try that. - */ - curl_slist_free_all (recipients); - curl_multi_remove_handle (mcurl, curl); - curl_multi_cleanup (mcurl); curl_easy_cleanup (curl); curl_global_cleanup (); }