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: link - drop assert from _free()
[elogind.git]
/
src
/
network
/
networkd-network.c
diff --git
a/src/network/networkd-network.c
b/src/network/networkd-network.c
index 91b1e3c7bdbc20ee31a21cecd8680abedc2b5529..f60f7c812cc7eae5ce848974ac95ae6e64296130 100644
(file)
--- a/
src/network/networkd-network.c
+++ b/
src/network/networkd-network.c
@@
-20,6
+20,7
@@
***/
#include <ctype.h>
***/
#include <ctype.h>
+#include <net/if.h>
#include "networkd.h"
#include "network-internal.h"
#include "networkd.h"
#include "network-internal.h"
@@
-68,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();
@@
-76,17
+81,15
@@
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;
+ network->dhcp_routes = true;
r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCPv4\0", config_item_perf_lookup,
(void*) network_network_gperf_lookup, false, false, network);
r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCPv4\0", config_item_perf_lookup,
(void*) network_network_gperf_lookup, false, false, network);
@@
-97,7
+100,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);
@@
-105,7
+108,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);
@@
-163,15
+166,22
@@
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);
netdev_unref(network->bridge);
netdev_unref(network->bond);
+ netdev_unref(network->tunnel);
+
HASHMAP_FOREACH(netdev, network->vlans, i)
netdev_unref(netdev);
hashmap_free(network->vlans);
HASHMAP_FOREACH(netdev, network->vlans, i)
netdev_unref(netdev);
hashmap_free(network->vlans);
@@
-180,6
+190,10
@@
void network_free(Network *network) {
netdev_unref(netdev);
hashmap_free(network->macvlans);
netdev_unref(netdev);
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);
@@
-220,7
+234,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;
@@
-237,8
+251,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;
}
@@
-322,6
+336,15
@@
int config_parse_netdev(const char *unit,
return 0;
}
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;
+ }
+
break;
default:
assert_not_reached("Can not parse NetDev");
break;
default:
assert_not_reached("Can not parse NetDev");
@@
-360,7
+383,8
@@
int config_parse_tunnel(const char *unit,
if (netdev->kind != NETDEV_KIND_IPIP &&
netdev->kind != NETDEV_KIND_SIT &&
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;
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"NetDev is not a tunnel, ignoring assignment: %s", rvalue);
return 0;