#include "network-util.h"
#include "dhcp-lease-internal.h"
-static int ipv4ll_address_update(Link *link, bool deprecate);
-static bool ipv4ll_is_bound(sd_ipv4ll *ll);
-
static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
_cleanup_link_unref_ Link *link = NULL;
uint16_t type;
if (!link->network)
return 0;
- if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) {
- assert(link->dhcp_client);
-
+ if (link->dhcp_client) {
k = sd_dhcp_client_stop(link->dhcp_client);
if (k < 0) {
log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r));
}
}
- if (link->network->ipv4ll) {
- assert(link->ipv4ll);
-
+ if (link->ipv4ll) {
k = sd_ipv4ll_stop(link->ipv4ll);
if (k < 0) {
log_warning_link(link, "Could not stop IPv4 link-local: %s", strerror(-r));
}
}
- if (link->network->dhcp_server) {
- assert(link->dhcp_server);
-
+ if (link->dhcp_server) {
k = sd_dhcp_server_stop(link->dhcp_server);
if (k < 0) {
log_warning_link(link, "Could not stop DHCPv4 server: %s", strerror(-r));
}
}
- if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) {
- assert(link->icmp6_router_discovery);
+ if(link->icmp6_router_discovery) {
if (link->dhcp6_client) {
k = sd_dhcp6_client_stop(link->dhcp6_client);
if (address->family != AF_INET)
continue;
- if (in_addr_null(address->family, &address->in_addr))
+ if (in_addr_is_null(address->family, &address->in_addr))
continue;
return address;
return 0;
}
+static bool ipv4ll_is_bound(sd_ipv4ll *ll) {
+ int r;
+ struct in_addr addr;
+
+ if (!ll)
+ return false;
+
+ r = sd_ipv4ll_get_address(ll, &addr);
+ if (r < 0)
+ return false;
+
+ return true;
+}
+
static int link_enter_set_routes(Link *link) {
Route *rt;
int r;
link->state = LINK_STATE_SETTING_ROUTES;
- if (!link->network->static_routes && !link->dhcp_lease &&
- (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false))
+ if (!link->network->static_routes &&
+ !link->dhcp_lease &&
+ !ipv4ll_is_bound(link->ipv4ll))
return link_enter_configured(link);
log_debug_link(link, "setting routes");
link->route_messages ++;
}
- if (link->ipv4ll && !link->dhcp_lease) {
+ if (ipv4ll_is_bound(link->ipv4ll)) {
_cleanup_route_free_ Route *route = NULL;
- if (r != -ENOENT) {
- r = route_new_dynamic(&route, RTPROT_STATIC);
- if (r < 0) {
- log_error_link(link, "Could not allocate route: %s",
- strerror(-r));
- return r;
- }
-
- route->family = AF_INET;
- route->scope = RT_SCOPE_LINK;
- route->metrics = IPV4LL_ROUTE_METRIC;
+ r = route_new_dynamic(&route, RTPROT_STATIC);
+ if (r < 0) {
+ log_error_link(link, "Could not allocate route: %s",
+ strerror(-r));
+ return r;
+ }
- r = route_configure(route, link, &route_handler);
- if (r < 0) {
- log_warning_link(link,
- "could not set routes: %s", strerror(-r));
- link_enter_failed(link);
- return r;
- }
+ route->family = AF_INET;
+ route->scope = RT_SCOPE_LINK;
+ route->metrics = IPV4LL_ROUTE_METRIC;
- link->route_messages ++;
+ r = route_configure(route, link, &route_handler);
+ if (r < 0) {
+ log_warning_link(link,
+ "could not set routes: %s", strerror(-r));
+ link_enter_failed(link);
+ return r;
}
+
+ link->route_messages ++;
}
if (link->dhcp_lease) {
link->state = LINK_STATE_SETTING_ADDRESSES;
- if (!link->network->static_addresses && !link->dhcp_lease &&
- (!link->ipv4ll || ipv4ll_is_bound(link->ipv4ll) == false))
+ if (!link->network->static_addresses &&
+ !link->dhcp_lease &&
+ !ipv4ll_is_bound(link->ipv4ll))
return link_enter_set_routes(link);
log_debug_link(link, "setting addresses");
link->addr_messages ++;
}
- if (link->ipv4ll && !link->dhcp_lease) {
+ if (link->ipv4ll) {
_cleanup_address_free_ Address *ll_addr = NULL;
struct in_addr addr;
return 0;
}
-static int address_update_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
- _cleanup_link_unref_ Link *link = userdata;
- int r;
-
- assert(m);
- assert(link);
- assert(link->ifname);
-
- if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
- return 1;
-
- r = sd_rtnl_message_get_errno(m);
- if (r < 0 && r != -ENOENT)
- log_struct_link(LOG_WARNING, link,
- "MESSAGE=%-*s: could not update address: %s",
- IFNAMSIZ,
- link->ifname, strerror(-r),
- "ERRNO=%d", -r,
- NULL);
-
- return 1;
-}
-
static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
_cleanup_link_unref_ Link *link = userdata;
int r;
}
}
- if (event == DHCP_EVENT_EXPIRED && link->network->ipv4ll) {
- if (!sd_ipv4ll_is_running(link->ipv4ll))
- r = sd_ipv4ll_start(link->ipv4ll);
- else if (ipv4ll_is_bound(link->ipv4ll))
- r = ipv4ll_address_update(link, false);
- if (r < 0) {
- link_enter_failed(link);
- return;
- }
- }
-
break;
case DHCP_EVENT_RENEW:
r = dhcp_lease_renew(client, link);
link_enter_failed(link);
return;
}
- if (link->ipv4ll) {
- if (ipv4ll_is_bound(link->ipv4ll))
- r = ipv4ll_address_update(link, true);
- else
- r = sd_ipv4ll_stop(link->ipv4ll);
- if (r < 0) {
- link_enter_failed(link);
- return;
- }
- }
break;
default:
if (event < 0)
return;
}
-static int ipv4ll_address_update(Link *link, bool deprecate) {
- int r;
- struct in_addr addr;
-
- assert(link);
-
- r = sd_ipv4ll_get_address(link->ipv4ll, &addr);
- if (r >= 0) {
- _cleanup_address_free_ Address *address = NULL;
-
- log_debug_link(link, "IPv4 link-local %s %u.%u.%u.%u",
- deprecate ? "deprecate" : "approve",
- ADDRESS_FMT_VAL(addr));
-
- r = address_new_dynamic(&address);
- if (r < 0) {
- log_error_link(link, "Could not allocate address: %s", strerror(-r));
- return r;
- }
-
- address->family = AF_INET;
- address->in_addr.in = addr;
- address->prefixlen = 16;
- address->scope = RT_SCOPE_LINK;
- address->cinfo.ifa_prefered = deprecate ? 0 : CACHE_INFO_INFINITY_LIFE_TIME;
- address->broadcast.s_addr = address->in_addr.in.s_addr | htonl(0xfffffffflu >> address->prefixlen);
-
- address_update(address, link, &address_update_handler);
- }
-
- return 0;
-
-}
-
static int ipv4ll_address_lost(Link *link) {
int r;
struct in_addr addr;
return 0;
}
-static bool ipv4ll_is_bound(sd_ipv4ll *ll) {
- int r;
- struct in_addr addr;
-
- assert(ll);
-
- r = sd_ipv4ll_get_address(ll, &addr);
- if (r < 0)
- return false;
- return true;
-}
-
static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) {
struct in_addr address;
int r;
assert(link->state == LINK_STATE_ENSLAVING);
assert(link->network);
- log_debug_link(link, "joined netdev");
-
if (!(link->flags & IFF_UP)) {
r = link_up(link);
if (r < 0) {
NULL);
link_enter_failed(link);
return 1;
- }
+ } else
+ log_debug_link(link, "joined netdev");
if (link->enslaving <= 0)
link_joined(link);
if (r < 0)
return r;
+ if (link->mtu) {
+ r = sd_dhcp_client_set_mtu(link->dhcp_client, link->mtu);
+ if (r < 0)
+ return r;
+ }
+
if (link->network->dhcp_mtu) {
- r = sd_dhcp_client_set_request_option(link->dhcp_client, 26);
+ r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_INTERFACE_MTU);
if (r < 0)
return r;
}
sprintf(ifindex_str, "n%d", link->ifindex);
device = udev_device_new_from_device_id(m->udev, ifindex_str);
if (!device) {
- log_warning_link(link, "could not find udev device");
+ log_warning_link(link, "could not find udev device: %m");
return -errno;
}
int link_update(Link *link, sd_rtnl_message *m) {
struct ether_addr mac;
const char *ifname;
+ uint32_t mtu;
int r;
assert(link);
return -ENOMEM;
}
- if (!link->original_mtu) {
- r = sd_rtnl_message_read_u16(m, IFLA_MTU, &link->original_mtu);
- if (r >= 0)
+ r = sd_rtnl_message_read_u32(m, IFLA_MTU, &mtu);
+ if (r >= 0 && mtu > 0) {
+ link->mtu = mtu;
+ if (!link->original_mtu) {
+ link->original_mtu = mtu;
log_debug_link(link, "saved original MTU: %"
- PRIu16, link->original_mtu);
+ PRIu32, link->original_mtu);
+ }
+
+ if (link->dhcp_client) {
+ r = sd_dhcp_client_set_mtu(link->dhcp_client, link->mtu);
+ if (r < 0) {
+ log_warning_link(link, "Could not update MTU in DHCP client: %s",
+ strerror(-r));
+ return r;
+ }
+ }
}
/* The kernel may broadcast NEWLINK messages without the MAC address
(address + 1 ? " " : ""));
fputs("\n", f);
+
+ fprintf(f, "LLMNR=%s\n", llmnr_support_to_string(link->network->llmnr));
}
if (link->dhcp_lease) {
};
DEFINE_STRING_TABLE_LOOKUP(link_operstate, LinkOperationalState);
-
-static const char* const dhcp_support_table[_DHCP_SUPPORT_MAX] = {
- [DHCP_SUPPORT_NONE] = "none",
- [DHCP_SUPPORT_BOTH] = "both",
- [DHCP_SUPPORT_V4] = "v4",
- [DHCP_SUPPORT_V6] = "v6",
-};
-
-DEFINE_STRING_TABLE_LOOKUP(dhcp_support, DHCPSupport);
-
-int config_parse_dhcp(
- 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) {
-
- DHCPSupport *dhcp = data;
- int k;
-
- assert(filename);
- assert(lvalue);
- assert(rvalue);
- assert(data);
-
- /* Our enum shall be a superset of booleans, hence first try
- * to parse as boolean, and then as enum */
-
- k = parse_boolean(rvalue);
- if (k > 0)
- *dhcp = DHCP_SUPPORT_BOTH;
- else if (k == 0)
- *dhcp = DHCP_SUPPORT_NONE;
- else {
- DHCPSupport s;
-
- s = dhcp_support_from_string(rvalue);
- if (s < 0){
- log_syntax(unit, LOG_ERR, filename, line, -s, "Failed to parse DHCP option, ignoring: %s", rvalue);
- return 0;
- }
-
- *dhcp = s;
- }
-
- return 0;
-}
~ianmdlvl / elogind.git / blobdiff