diff options
author | Tharanga Gamaethige <tgamaethige@netflix.com> | 2018-11-30 17:44:33 -0800 |
---|---|---|
committer | dormando <dormando@rydia.net> | 2019-04-15 21:36:18 -0700 |
commit | ee1cfe3bf9384d1a93545fc942e25bed6437d910 (patch) | |
tree | 2e880ddd3d263b85f2cf6de73b8eb15d14d02e37 /logger.c | |
parent | d2dcfff7edd28baf3587ab103d6fbac322335a68 (diff) | |
download | memcached-ee1cfe3bf9384d1a93545fc942e25bed6437d910.tar.gz |
Basic implementation of TLS for memcached.1.5.13
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.
Diffstat (limited to 'logger.c')
-rw-r--r-- | logger.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; } |