chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolved: enable LLMNR
[elogind.git]
/
src
/
resolve
/
resolved-link.c
diff --git
a/src/resolve/resolved-link.c
b/src/resolve/resolved-link.c
index ed176ab417574c6b17f1da4348adddcc422e7a57..8ec180d3a4902aad376d7f5019705c770601fe45 100644
(file)
--- a/
src/resolve/resolved-link.c
+++ b/
src/resolve/resolved-link.c
@@
-93,7
+93,9
@@
static void link_allocate_scopes(Link *l) {
} else
l->unicast_scope = dns_scope_free(l->unicast_scope);
} else
l->unicast_scope = dns_scope_free(l->unicast_scope);
- if (link_relevant(l, AF_INET) && l->llmnr_support != SUPPORT_NO && l->manager->llmnr_support != SUPPORT_NO) {
+ if (link_relevant(l, AF_INET) &&
+ l->llmnr_support != SUPPORT_NO &&
+ l->manager->llmnr_support != SUPPORT_NO) {
if (!l->llmnr_ipv4_scope) {
r = dns_scope_new(l->manager, &l->llmnr_ipv4_scope, l, DNS_PROTOCOL_LLMNR, AF_INET);
if (r < 0)
if (!l->llmnr_ipv4_scope) {
r = dns_scope_new(l->manager, &l->llmnr_ipv4_scope, l, DNS_PROTOCOL_LLMNR, AF_INET);
if (r < 0)
@@
-102,7
+104,10
@@
static void link_allocate_scopes(Link *l) {
} else
l->llmnr_ipv4_scope = dns_scope_free(l->llmnr_ipv4_scope);
} else
l->llmnr_ipv4_scope = dns_scope_free(l->llmnr_ipv4_scope);
- if (link_relevant(l, AF_INET6) && l->llmnr_support != SUPPORT_NO && l->manager->llmnr_support != SUPPORT_NO) {
+ if (link_relevant(l, AF_INET6) &&
+ l->llmnr_support != SUPPORT_NO &&
+ l->manager->llmnr_support != SUPPORT_NO &&
+ socket_ipv6_is_supported()) {
if (!l->llmnr_ipv6_scope) {
r = dns_scope_new(l->manager, &l->llmnr_ipv6_scope, l, DNS_PROTOCOL_LLMNR, AF_INET6);
if (r < 0)
if (!l->llmnr_ipv6_scope) {
r = dns_scope_new(l->manager, &l->llmnr_ipv6_scope, l, DNS_PROTOCOL_LLMNR, AF_INET6);
if (r < 0)
@@
-151,7
+156,7
@@
static int link_update_dns_servers(Link *l) {
assert(l);
assert(l);
- r = sd_network_
get_link
_dns(l->ifindex, &nameservers);
+ r = sd_network_
link_get
_dns(l->ifindex, &nameservers);
if (r < 0)
goto clear;
if (r < 0)
goto clear;
@@
-195,7
+200,7
@@
static int link_update_llmnr_support(Link *l) {
assert(l);
assert(l);
- r = sd_network_
get_link
_llmnr(l->ifindex, &b);
+ r = sd_network_
link_get
_llmnr(l->ifindex, &b);
if (r < 0)
goto clear;
if (r < 0)
goto clear;
@@
-245,7
+250,7
@@
bool link_relevant(Link *l, int family) {
if ((l->flags & (IFF_UP|IFF_LOWER_UP|IFF_MULTICAST)) != (IFF_UP|IFF_LOWER_UP|IFF_MULTICAST))
return false;
if ((l->flags & (IFF_UP|IFF_LOWER_UP|IFF_MULTICAST)) != (IFF_UP|IFF_LOWER_UP|IFF_MULTICAST))
return false;
- sd_network_
get_link
_operational_state(l->ifindex, &state);
+ sd_network_
link_get
_operational_state(l->ifindex, &state);
if (state && !STR_IN_SET(state, "unknown", "degraded", "routable"))
return false;
if (state && !STR_IN_SET(state, "unknown", "degraded", "routable"))
return false;