X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved.h;h=34eb7b5c5abca5815fcf0963ac636c6860c40180;hp=35ef8bdea104b592a24c57c35f7efb1e23e33a12;hb=eb60f9cd4e93ff5016dc1b5486fd1b7e1565fd92;hpb=0dd25fb9f005d8ab7ac4bc10a609d00569f8c56a diff --git a/src/resolve/resolved.h b/src/resolve/resolved.h index 35ef8bdea..34eb7b5c5 100644 --- a/src/resolve/resolved.h +++ b/src/resolve/resolved.h @@ -34,6 +34,7 @@ typedef struct Manager Manager; #include "resolved-dns-query.h" #include "resolved-dns-server.h" #include "resolved-dns-scope.h" +#include "resolved-dns-stream.h" struct Manager { sd_event *event; @@ -50,10 +51,13 @@ struct Manager { sd_event_source *network_event_source; /* DNS query management */ - Hashmap *dns_query_transactions; + Hashmap *dns_transactions; LIST_HEAD(DnsQuery, dns_queries); unsigned n_dns_queries; + LIST_HEAD(DnsStream, dns_streams); + unsigned n_dns_streams; + /* Unicast dns */ int dns_ipv4_fd; int dns_ipv6_fd; @@ -70,15 +74,26 @@ struct Manager { /* LLMNR */ int llmnr_ipv4_udp_fd; int llmnr_ipv6_udp_fd; - /* int llmnr_ipv4_tcp_fd; */ - /* int llmnr_ipv6_tcp_fd; */ + int llmnr_ipv4_tcp_fd; + int llmnr_ipv6_tcp_fd; sd_event_source *llmnr_ipv4_udp_event_source; sd_event_source *llmnr_ipv6_udp_event_source; + sd_event_source *llmnr_ipv4_tcp_event_source; + sd_event_source *llmnr_ipv6_tcp_event_source; /* dbus */ sd_bus *bus; sd_event_source *bus_retry_event_source; + + /* The hostname we publish on LLMNR and mDNS */ + char *hostname; + DnsResourceKey *host_ipv4_key; + DnsResourceKey *host_ipv6_key; + + /* Watch the system hostname */ + int hostname_fd; + sd_event_source *hostname_event_source; }; /* Manager */ @@ -89,22 +104,35 @@ Manager* manager_free(Manager *m); int manager_parse_config_file(Manager *m); int manager_write_resolv_conf(Manager *m); -DnsServer* manager_find_dns_server(Manager *m, int family, union in_addr_union *in_addr); +DnsServer* manager_find_dns_server(Manager *m, int family, const union in_addr_union *in_addr); DnsServer *manager_get_dns_server(Manager *m); void manager_next_dns_server(Manager *m); + uint32_t manager_find_mtu(Manager *m); -int manager_send(Manager *m, int fd, int ifindex, int family, union in_addr_union *addr, uint16_t port, DnsPacket *p); +int manager_send(Manager *m, int fd, int ifindex, int family, const union in_addr_union *addr, uint16_t port, DnsPacket *p); int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret); int manager_dns_ipv4_fd(Manager *m); int manager_dns_ipv6_fd(Manager *m); int manager_llmnr_ipv4_udp_fd(Manager *m); int manager_llmnr_ipv6_udp_fd(Manager *m); +int manager_llmnr_ipv4_tcp_fd(Manager *m); +int manager_llmnr_ipv6_tcp_fd(Manager *m); +int manager_ifindex_is_loopback(Manager *m, int ifindex); +int manager_find_ifindex(Manager *m, int family, const union in_addr_union *in_addr); +LinkAddress* manager_find_address(Manager *m, int family, const union in_addr_union *in_addr); + +void manager_refresh_rrs(Manager *m); +int manager_next_hostname(Manager *m); + +int manager_our_packet(Manager *m, DnsPacket *p); int manager_connect_bus(Manager *m); DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, unsigned length); int config_parse_dnsv(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); + +#define EXTRA_CMSG_SPACE 1024