ba6aaf5727
During handshake and TLS session closing, messages needs to be exchanged. Therefore this patch overrides the requested IO events for the TCP stream when the TLS is waiting for sending or receiving of messages during theses periods. This fixes issues with correctly closing the TLS stream and prevents the handshake from hanging in rare cases (not seen yet).
90 lines
2.5 KiB
C
90 lines
2.5 KiB
C
/* SPDX-License-Identifier: LGPL-2.1+ */
|
|
#pragma once
|
|
|
|
#include "socket-util.h"
|
|
|
|
typedef struct DnsStream DnsStream;
|
|
|
|
#include "resolved-dns-packet.h"
|
|
#include "resolved-dns-transaction.h"
|
|
#include "resolved-manager.h"
|
|
#if ENABLE_DNS_OVER_TLS
|
|
#include "resolved-dnstls.h"
|
|
#endif
|
|
|
|
#define DNS_STREAM_WRITE_TLS_DATA 1
|
|
|
|
/* Streams are used by three subsystems:
|
|
*
|
|
* 1. The normal transaction logic when doing a DNS or LLMNR lookup via TCP
|
|
* 2. The LLMNR logic when accepting a TCP-based lookup
|
|
* 3. The DNS stub logic when accepting a TCP-based lookup
|
|
*/
|
|
|
|
struct DnsStream {
|
|
Manager *manager;
|
|
int n_ref;
|
|
|
|
DnsProtocol protocol;
|
|
|
|
int fd;
|
|
union sockaddr_union peer;
|
|
socklen_t peer_salen;
|
|
union sockaddr_union local;
|
|
socklen_t local_salen;
|
|
int ifindex;
|
|
uint32_t ttl;
|
|
bool identified;
|
|
|
|
/* only when using TCP fast open */
|
|
union sockaddr_union tfo_address;
|
|
socklen_t tfo_salen;
|
|
|
|
#if ENABLE_DNS_OVER_TLS
|
|
DnsTlsStreamData dnstls_data;
|
|
int dnstls_events;
|
|
#endif
|
|
|
|
sd_event_source *io_event_source;
|
|
sd_event_source *timeout_event_source;
|
|
|
|
be16_t write_size, read_size;
|
|
DnsPacket *write_packet, *read_packet;
|
|
size_t n_written, n_read;
|
|
OrderedSet *write_queue;
|
|
|
|
int (*on_connection)(DnsStream *s);
|
|
int (*on_packet)(DnsStream *s);
|
|
int (*complete)(DnsStream *s, int error);
|
|
|
|
LIST_HEAD(DnsTransaction, transactions); /* when used by the transaction logic */
|
|
DnsServer *server; /* when used by the transaction logic */
|
|
DnsQuery *query; /* when used by the DNS stub logic */
|
|
|
|
/* used when DNS-over-TLS is enabled */
|
|
bool encrypted:1;
|
|
|
|
LIST_FIELDS(DnsStream, streams);
|
|
};
|
|
|
|
int dns_stream_new(Manager *m, DnsStream **s, DnsProtocol protocol, int fd, const union sockaddr_union *tfo_address);
|
|
#if ENABLE_DNS_OVER_TLS
|
|
int dns_stream_connect_tls(DnsStream *s, void *tls_session);
|
|
#endif
|
|
DnsStream *dns_stream_unref(DnsStream *s);
|
|
DnsStream *dns_stream_ref(DnsStream *s);
|
|
|
|
DEFINE_TRIVIAL_CLEANUP_FUNC(DnsStream*, dns_stream_unref);
|
|
|
|
int dns_stream_write_packet(DnsStream *s, DnsPacket *p);
|
|
ssize_t dns_stream_writev(DnsStream *s, const struct iovec *iov, size_t iovcnt, int flags);
|
|
|
|
static inline bool DNS_STREAM_QUEUED(DnsStream *s) {
|
|
assert(s);
|
|
|
|
if (s->fd < 0) /* already stopped? */
|
|
return false;
|
|
|
|
return !!s->write_packet;
|
|
}
|