mirror of
https://github.com/systemd/systemd.git
synced 2026-08-03 22:50:29 +00:00
839a70c353
In commit 2aaf6bb6e9, an issue was fixed where
systemd-resolved could get stuck for multiple seconds waiting for incoming data,
since GnuTLS/OpenSSL can buffer a TLS record, so data could be available, but
no EPOLLIN event would be generated.
To fix this, a somewhat elaborate logic consisting on asking the TLS library
whether it had buffered data, then "faking" an EPOLLIN event was implemented.
However, there is a much simpler solution: Always read as much data as available
(i.e. until we get an event like EAGAIN when trying to read) from the stream
when we get an EPOLLIN event, instead of at most a single packet per event.
This approach does not require asking the TLS library whether it has buffered
data, and the logic is exactly the same for both the TCP and TLS case.
test-resolved-stream is fixed to avoid a latent double free bug.
39 lines
1.2 KiB
C
39 lines
1.2 KiB
C
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
#pragma once
|
|
|
|
#if ENABLE_DNS_OVER_TLS
|
|
|
|
#include <stdint.h>
|
|
#include <sys/uio.h>
|
|
|
|
typedef struct DnsServer DnsServer;
|
|
typedef struct DnsStream DnsStream;
|
|
typedef struct DnsTlsManagerData DnsTlsManagerData;
|
|
typedef struct DnsTlsServerData DnsTlsServerData;
|
|
typedef struct DnsTlsStreamData DnsTlsStreamData;
|
|
typedef struct Manager Manager;
|
|
|
|
#if DNS_OVER_TLS_USE_GNUTLS
|
|
#include "resolved-dnstls-gnutls.h"
|
|
#elif DNS_OVER_TLS_USE_OPENSSL
|
|
#include "resolved-dnstls-openssl.h"
|
|
#else
|
|
#error Unknown dependency for supporting DNS-over-TLS
|
|
#endif
|
|
|
|
#define DNSTLS_STREAM_CLOSED 1
|
|
|
|
int dnstls_stream_connect_tls(DnsStream *stream, DnsServer *server);
|
|
void dnstls_stream_free(DnsStream *stream);
|
|
int dnstls_stream_on_io(DnsStream *stream, uint32_t revents);
|
|
int dnstls_stream_shutdown(DnsStream *stream, int error);
|
|
ssize_t dnstls_stream_writev(DnsStream *stream, const struct iovec *iov, size_t iovcnt);
|
|
ssize_t dnstls_stream_read(DnsStream *stream, void *buf, size_t count);
|
|
|
|
void dnstls_server_free(DnsServer *server);
|
|
|
|
int dnstls_manager_init(Manager *manager);
|
|
void dnstls_manager_free(Manager *manager);
|
|
|
|
#endif /* ENABLE_DNS_OVER_TLS */
|