From ee1cfe3bf9384d1a93545fc942e25bed6437d910 Mon Sep 17 00:00:00 2001 From: Tharanga Gamaethige Date: Fri, 30 Nov 2018 17:44:33 -0800 Subject: Basic implementation of TLS for memcached. Most of the work done by Tharanga. Some commits squashed in by dormando. Also reviewed by dormando. Tested, working, but experimental implementation of TLS for memcached. Enable with ./configure --enable-tls Requires OpenSSL 1.1.0 or better. See `memcached -h` output for usage. --- logger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'logger.c') diff --git a/logger.c b/logger.c index 1322d7d..a8a6c23 100644 --- a/logger.c +++ b/logger.c @@ -443,7 +443,7 @@ static int logger_thread_poll_watchers(int force_poll, int watcher) { */ if (watchers_pollfds[nfd].revents & POLLIN) { char buf[1]; - int res = read(w->sfd, buf, 1); + int res = ((conn*)w->c)->read(w->c, buf, 1); if (res == 0 || (res == -1 && (errno != EAGAIN && errno != EWOULDBLOCK))) { L_DEBUG("LOGGER: watcher closed remotely\n"); logger_thread_close_watcher(w); @@ -464,7 +464,7 @@ static int logger_thread_poll_watchers(int force_poll, int watcher) { total = fwrite(data, 1, data_size, stderr); break; case LOGGER_WATCHER_CLIENT: - total = write(w->sfd, data, data_size); + total = ((conn*)w->c)->write(w->c, data, data_size); break; } -- cgit v1.2.1