chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: introduce vxlan
[elogind.git]
/
src
/
network
/
networkd-network.c
diff --git
a/src/network/networkd-network.c
b/src/network/networkd-network.c
index 048017e22968f000882c7716cccb31cbcc1bf123..45c1ab0f4c9a1346a53a10fd9f917d998958b019 100644
(file)
--- a/
src/network/networkd-network.c
+++ b/
src/network/networkd-network.c
@@
-19,6
+19,9
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <ctype.h>
+#include <net/if.h>
+
#include "networkd.h"
#include "network-internal.h"
#include "path-util.h"
#include "networkd.h"
#include "network-internal.h"
#include "path-util.h"
@@
-44,6
+47,11
@@
static int network_load_one(Manager *manager, const char *filename) {
return -errno;
}
return -errno;
}
+ if (null_or_empty_path(filename)) {
+ log_debug("skipping empty file: %s", filename);
+ return 0;
+ }
+
network = new0(Network, 1);
if (!network)
return log_oom();
network = new0(Network, 1);
if (!network)
return log_oom();
@@
-61,6
+69,10
@@
static int network_load_one(Manager *manager, const char *filename) {
if (!network->macvlans)
return log_oom();
if (!network->macvlans)
return log_oom();
+ network->vxlans = hashmap_new(uint64_hash_func, uint64_compare_func);
+ if (!network->vxlans)
+ return log_oom();
+
network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
if (!network->addresses_by_section)
return log_oom();
network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
if (!network->addresses_by_section)
return log_oom();
@@
-69,14
+81,11
@@
static int network_load_one(Manager *manager, const char *filename) {
if (!network->routes_by_section)
return log_oom();
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->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;
network->dhcp_dns = true;
network->dhcp_hostname = true;
network->dhcp_domainname = true;
@@
-90,7
+99,7
@@
static int network_load_one(Manager *manager, const char *filename) {
LIST_PREPEND(networks, manager->networks, network);
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);
if (!route->family) {
log_warning("Route section without Gateway field configured in %s. "
"Ignoring", filename);
@@
-98,7
+107,7
@@
static int network_load_one(Manager *manager, const char *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);
if (!address->family) {
log_warning("Address section without Address field configured in %s. "
"Ignoring", filename);
@@
-138,6
+147,7
@@
int network_load(Manager *manager) {
}
void network_free(Network *network) {
}
void network_free(Network *network) {
+ NetDev *netdev;
Route *route;
Address *address;
Iterator i;
Route *route;
Address *address;
Iterator i;
@@
-155,15
+165,32
@@
void network_free(Network *network) {
free(network->description);
free(network->description);
- SET_FOREACH(address, network->dns, i)
+ while ((address = network->ntp)) {
+ LIST_REMOVE(addresses, network->ntp, address);
address_free(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);
+
+ netdev_unref(network->bond);
+
+ HASHMAP_FOREACH(netdev, network->vlans, i)
+ netdev_unref(netdev);
hashmap_free(network->vlans);
hashmap_free(network->vlans);
+ HASHMAP_FOREACH(netdev, network->macvlans, i)
+ netdev_unref(netdev);
hashmap_free(network->macvlans);
hashmap_free(network->macvlans);
+ HASHMAP_FOREACH(netdev, network->vxlans, i)
+ netdev_unref(netdev);
+ hashmap_free(network->vxlans);
+
while ((route = network->static_routes))
route_free(route);
while ((route = network->static_routes))
route_free(route);
@@
-204,7
+231,7
@@
int network_get(Manager *manager, struct udev_device *device,
udev_device_get_property_value(device, "ID_NET_DRIVER"),
udev_device_get_devtype(device),
ifname)) {
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;
network->filename);
*ret = network;
return 0;
@@
-221,8
+248,8
@@
int network_apply(Manager *manager, Network *network, Link *link) {
link->network = network;
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;
}
if (r < 0)
return r;
}
@@
-230,7
+257,7
@@
int network_apply(Manager *manager, Network *network, Link *link) {
return 0;
}
return 0;
}
-int config_parse_
bridge
(const char *unit,
+int config_parse_
netdev
(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
@@
-241,7
+268,10
@@
int config_parse_bridge(const char *unit,
void *data,
void *userdata) {
Network *network = userdata;
void *data,
void *userdata) {
Network *network = userdata;
+ _cleanup_free_ char *kind_string = NULL;
+ char *p;
NetDev *netdev;
NetDev *netdev;
+ NetDevKind kind;
int r;
assert(filename);
int r;
assert(filename);
@@
-249,113
+279,89
@@
int config_parse_bridge(const char *unit,
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- r = netdev_get(network->manager, rvalue, &netdev);
- if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "Bridge is invalid, ignoring assignment: %s", rvalue);
- return 0;
- }
+ kind_string = strdup(lvalue);
+ if (!kind_string)
+ return log_oom();
- if (netdev->kind != NETDEV_KIND_BRIDGE) {
+ /* the keys are CamelCase versions of the kind */
+ for (p = kind_string; *p; p++)
+ *p = tolower(*p);
+
+ kind = netdev_kind_from_string(kind_string);
+ if (kind == _NETDEV_KIND_INVALID) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "
NetDev is not a bridge, ignoring assignment: %s", r
value);
+ "
Invalid NetDev kind: %s", l
value);
return 0;
}
return 0;
}
- network->bridge = netdev;
-
- return 0;
-}
-
-int config_parse_bond(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) {
- Network *network = userdata;
- NetDev *netdev;
- int r;
-
- assert(filename);
- assert(lvalue);
- assert(rvalue);
- assert(data);
-
r = netdev_get(network->manager, rvalue, &netdev);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
r = netdev_get(network->manager, rvalue, &netdev);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "
Bond is invalid, ignoring assignment: %s"
, rvalue);
+ "
%s could not be found, ignoring assignment: %s", lvalue
, rvalue);
return 0;
}
return 0;
}
- if (netdev->kind !=
NETDEV_KIND_BOND
) {
+ if (netdev->kind !=
kind
) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "NetDev is not a
bond, ignoring assignment: %s"
, rvalue);
+ "NetDev is not a
%s, ignoring assignment: %s", lvalue
, rvalue);
return 0;
}
return 0;
}
- network->bond = netdev;
+ switch (kind) {
+ case NETDEV_KIND_BRIDGE:
+ network->bridge = netdev;
- return 0;
-}
+ break;
+ case NETDEV_KIND_BOND:
+ network->bond = netdev;
-int config_parse_vlan(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) {
- Network *network = userdata;
- NetDev *netdev;
- int r;
+ break;
+ case NETDEV_KIND_VLAN:
+ r = hashmap_put(network->vlans, &netdev->vlanid, netdev);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Can not add VLAN to network: %s", rvalue);
+ return 0;
+ }
- assert(filename);
- assert(lvalue);
- assert(rvalue);
- assert(data);
+ break;
+ case NETDEV_KIND_MACVLAN:
+ 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);
+ return 0;
+ }
- r = netdev_get(network->manager, rvalue, &netdev);
- if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "VLAN is invalid, ignoring assignment: %s", rvalue);
- return 0;
- }
+ break;
+ case NETDEV_KIND_VXLAN:
+ r = hashmap_put(network->vxlans, netdev->ifname, netdev);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Can not add VXLAN to network: %s", rvalue);
+ return 0;
+ }
- if (netdev->kind != NETDEV_KIND_VLAN) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "NetDev is not a VLAN, ignoring assignment: %s", rvalue);
- return 0;
+ break;
+ default:
+ assert_not_reached("Can not parse NetDev");
}
}
- r = hashmap_put(network->vlans, &netdev->vlanid, netdev);
- if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "Can not add VLAN to network: %s", rvalue);
- return 0;
- }
+ netdev_ref(netdev);
return 0;
}
return 0;
}
-int config_parse_
macvlan
(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) {
+int config_parse_
tunnel
(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) {
Network *network = userdata;
NetDev *netdev;
int r;
Network *network = userdata;
NetDev *netdev;
int r;
@@
-368,22
+374,20
@@
int config_parse_macvlan(const char *unit,
r = netdev_get(network->manager, rvalue, &netdev);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
r = netdev_get(network->manager, rvalue, &netdev);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "
MACVLAN
is invalid, ignoring assignment: %s", rvalue);
+ "
Tunnel
is invalid, ignoring assignment: %s", rvalue);
return 0;
}
return 0;
}
- if (netdev->kind != NETDEV_KIND_MACVLAN) {
+ if (netdev->kind != NETDEV_KIND_IPIP &&
+ netdev->kind != NETDEV_KIND_SIT &&
+ netdev->kind != NETDEV_KIND_GRE &&
+ netdev->kind != NETDEV_KIND_VTI) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "NetDev is not a
MACVLAN
, ignoring assignment: %s", rvalue);
+ "NetDev is not a
tunnel
, ignoring assignment: %s", rvalue);
return 0;
}
return 0;
}
- r = hashmap_put(network->macvlans, netdev->name, netdev);
- if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "Can not add MACVLAN to network: %s", rvalue);
- return 0;
- }
+ network->tunnel = netdev;
return 0;
}
return 0;
}