From fbd5e3526cbf5dd956d6cb8996f257e63183eb81 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 25 Dec 2015 12:58:07 +0100 Subject: resolved: don't set TCP_NODELAY twice for TCP sockets We previously set it once in the scope code and once in the stream code. Remove it from the latter, as all other socket options are set in the former. --- src/resolve/resolved-dns-stream.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c index 1c501182fb..180f8e0877 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -347,7 +347,6 @@ DnsStream *dns_stream_free(DnsStream *s) { DEFINE_TRIVIAL_CLEANUP_FUNC(DnsStream*, dns_stream_free); int dns_stream_new(Manager *m, DnsStream **ret, DnsProtocol protocol, int fd) { - static const int one = 1; _cleanup_(dns_stream_freep) DnsStream *s = NULL; int r; @@ -364,10 +363,6 @@ int dns_stream_new(Manager *m, DnsStream **ret, DnsProtocol protocol, int fd) { s->fd = -1; s->protocol = protocol; - r = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one)); - if (r < 0) - return -errno; - r = sd_event_add_io(m->event, &s->io_event_source, fd, EPOLLIN, on_stream_io, s); if (r < 0) return r; -- cgit v1.2.3-54-g00ecf