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.
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user