***/
#include <ctype.h>
+#include <net/if.h>
#include "networkd.h"
#include "network-internal.h"
if (!network->routes_by_section)
return log_oom();
- network->dns = set_new(NULL, NULL);
- if (!network->dns)
- return log_oom();
-
network->filename = strdup(filename);
if (!network->filename)
return log_oom();
+ network->dhcp_ntp = true;
network->dhcp_dns = true;
network->dhcp_hostname = true;
network->dhcp_domainname = true;
LIST_PREPEND(networks, manager->networks, network);
- LIST_FOREACH(static_routes, route, network->static_routes) {
+ LIST_FOREACH(routes, route, network->static_routes) {
if (!route->family) {
log_warning("Route section without Gateway field configured in %s. "
"Ignoring", filename);
}
}
- LIST_FOREACH(static_addresses, address, network->static_addresses) {
+ LIST_FOREACH(addresses, address, network->static_addresses) {
if (!address->family) {
log_warning("Address section without Address field configured in %s. "
"Ignoring", filename);
free(network->description);
- SET_FOREACH(address, network->dns, i)
+ while ((address = network->ntp)) {
+ LIST_REMOVE(addresses, network->ntp, address);
address_free(address);
+ }
- set_free(network->dns);
+ while ((address = network->dns)) {
+ LIST_REMOVE(addresses, network->dns, address);
+ address_free(address);
+ }
netdev_unref(network->bridge);
udev_device_get_property_value(device, "ID_NET_DRIVER"),
udev_device_get_devtype(device),
ifname)) {
- log_debug("%s: found matching network '%s'", ifname,
+ log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname,
network->filename);
*ret = network;
return 0;
link->network = network;
- if (network->dns) {
- r = manager_update_resolv_conf(manager);
+ if (network->dns || network->ntp) {
+ r = link_save(link);
if (r < 0)
return r;
}
break;
case NETDEV_KIND_MACVLAN:
- r = hashmap_put(network->macvlans, netdev->name, netdev);
+ r = hashmap_put(network->macvlans, netdev->ifname, netdev);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Can not add MACVLAN to network: %s", rvalue);
if (netdev->kind != NETDEV_KIND_IPIP &&
netdev->kind != NETDEV_KIND_SIT &&
- netdev->kind != NETDEV_KIND_GRE) {
+ netdev->kind != NETDEV_KIND_GRE &&
+ netdev->kind != NETDEV_KIND_VTI) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"NetDev is not a tunnel, ignoring assignment: %s", rvalue);
return 0;