[systemd-commits] 3 commits - src/network TODO
Tom Gundersen
tomegun at kemper.freedesktop.org
Thu Mar 20 12:21:27 PDT 2014
TODO | 3
src/network/networkd-link.c | 147 ++++++++++++++++++++++-------------------
src/network/networkd-manager.c | 4 -
3 files changed, 84 insertions(+), 70 deletions(-)
New commits:
commit 155e8b9adce60eff5aa5cdeb16fac7b6530e3e3f
Author: Tom Gundersen <teg at jklm.no>
Date: Thu Mar 20 20:19:59 2014 +0100
TODO
diff --git a/TODO b/TODO
index ff5935b..682569d 100644
--- a/TODO
+++ b/TODO
@@ -665,6 +665,9 @@ Features:
- change LL address generation and make it predictable like get_mac() (link-config.c)
- have smooth transition from LL to routable address, without disconnecting clients.
+* sd-network:
+ - make sure ipv4ll and dhcp clients can handle changing mac addresses while running
+
External:
* dbus:
commit eb34d4af3fd2ddfaa4bdb591a1549d203e2d8ac8
Author: Tom Gundersen <teg at jklm.no>
Date: Thu Mar 20 19:57:19 2014 +0100
networkd: link - create dhcp and ipv4ll eagerly
Make sure the client objects exist for the lifetime of the Link.
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index e60ba9d..a7ba466 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -883,27 +883,7 @@ static int link_acquire_conf(Link *link) {
assert(link->manager->event);
if (link->network->ipv4ll) {
- if (!link->ipv4ll) {
- r = sd_ipv4ll_new(&link->ipv4ll);
- if (r < 0)
- return r;
-
- r = sd_ipv4ll_attach_event(link->ipv4ll, NULL, 0);
- if (r < 0)
- return r;
-
- r = sd_ipv4ll_set_index(link->ipv4ll, link->ifindex);
- if (r < 0)
- return r;
-
- r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac);
- if (r < 0)
- return r;
-
- r = sd_ipv4ll_set_callback(link->ipv4ll, ipv4ll_handler, link);
- if (r < 0)
- return r;
- }
+ assert(link->ipv4ll);
log_debug_link(link, "acquiring IPv4 link-local address");
@@ -913,33 +893,7 @@ static int link_acquire_conf(Link *link) {
}
if (link->network->dhcp) {
- if (!link->dhcp_client) {
- r = sd_dhcp_client_new(&link->dhcp_client);
- if (r < 0)
- return r;
-
- r = sd_dhcp_client_attach_event(link->dhcp_client, NULL, 0);
- if (r < 0)
- return r;
-
- r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex);
- if (r < 0)
- return r;
-
- r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac);
- if (r < 0)
- return r;
-
- r = sd_dhcp_client_set_callback(link->dhcp_client, dhcp_handler, link);
- if (r < 0)
- return r;
-
- if (link->network->dhcp_mtu) {
- r = sd_dhcp_client_set_request_option(link->dhcp_client, 26);
- if (r < 0)
- return r;
- }
- }
+ assert(link->dhcp_client);
log_debug_link(link, "acquiring DHCPv4 lease");
@@ -1303,6 +1257,48 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) {
if (r < 0)
return r;
+ if (link->network->ipv4ll) {
+ r = sd_ipv4ll_new(&link->ipv4ll);
+ if (r < 0)
+ return r;
+
+ r = sd_ipv4ll_attach_event(link->ipv4ll, NULL, 0);
+ if (r < 0)
+ return r;
+
+ r = sd_ipv4ll_set_index(link->ipv4ll, link->ifindex);
+ if (r < 0)
+ return r;
+
+ r = sd_ipv4ll_set_callback(link->ipv4ll, ipv4ll_handler, link);
+ if (r < 0)
+ return r;
+ }
+
+ if (link->network->dhcp) {
+ r = sd_dhcp_client_new(&link->dhcp_client);
+ if (r < 0)
+ return r;
+
+ r = sd_dhcp_client_attach_event(link->dhcp_client, NULL, 0);
+ if (r < 0)
+ return r;
+
+ r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex);
+ if (r < 0)
+ return r;
+
+ r = sd_dhcp_client_set_callback(link->dhcp_client, dhcp_handler, link);
+ if (r < 0)
+ return r;
+
+ if (link->network->dhcp_mtu) {
+ r = sd_dhcp_client_set_request_option(link->dhcp_client, 26);
+ if (r < 0)
+ return r;
+ }
+ }
+
r = link_configure(link);
if (r < 0)
return r;
commit c49b33aca6fd6a66e2bc43dad4a12701b7df8472
Author: Tom Gundersen <teg at jklm.no>
Date: Thu Mar 20 19:20:55 2014 +0100
networkd: update mac address in clients when it changes
Pass the mac address on to ipv4ll and dhcp clients so they always have
up-to-date information, and may react appropriately to the change.
Also drop setting the mac address from uevent, and only log when the
address actually changes.
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 275ad97..e60ba9d 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -32,8 +32,6 @@
int link_new(Manager *manager, struct udev_device *device, Link **ret) {
_cleanup_link_free_ Link *link = NULL;
- const char *mac;
- struct ether_addr *mac_addr;
const char *ifname;
int r;
@@ -58,13 +56,6 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) {
if (r < 0)
return -ENOMEM;
- mac = udev_device_get_sysattr_value(device, "address");
- if (mac) {
- mac_addr = ether_aton(mac);
- if (mac_addr)
- memcpy(&link->mac, mac_addr, sizeof(struct ether_addr));
- }
-
ifname = udev_device_get_sysname(device);
link->ifname = strdup(ifname);
@@ -972,6 +963,9 @@ static int link_update_flags(Link *link, unsigned flags) {
if (link->flags == flags)
return 0;
+ log_debug_link(link, "link status updated: %#.8x -> %#.8x",
+ link->flags, flags);
+
if ((link->flags & IFF_UP) != (flags & IFF_UP))
log_info_link(link,
"link is %s", flags & IFF_UP ? "up": "down");
@@ -1011,9 +1005,6 @@ static int link_update_flags(Link *link, unsigned flags) {
}
}
- log_debug_link(link, "link status updated: %#.8x -> %#.8x",
- link->flags, flags);
-
link->flags = flags;
return 0;
@@ -1321,6 +1312,7 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) {
int link_update(Link *link, sd_rtnl_message *m) {
unsigned flags;
+ struct ether_addr mac;
int r;
assert(link);
@@ -1338,16 +1330,39 @@ int link_update(Link *link, sd_rtnl_message *m) {
PRIu16, link->original_mtu);
}
- r = sd_rtnl_message_read_ether_addr(m, IFLA_ADDRESS, &link->mac);
- if (r >= 0) {
+ r = sd_rtnl_message_read_ether_addr(m, IFLA_ADDRESS, &mac);
+ if (r >= 0 && memcmp(&link->mac.ether_addr_octet, &mac.ether_addr_octet, ETH_ALEN)) {
+
+ memcpy(&link->mac.ether_addr_octet, &mac.ether_addr_octet, ETH_ALEN);
+
log_debug_link(link, "MAC address: "
"%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
- link->mac.ether_addr_octet[0],
- link->mac.ether_addr_octet[1],
- link->mac.ether_addr_octet[2],
- link->mac.ether_addr_octet[3],
- link->mac.ether_addr_octet[4],
- link->mac.ether_addr_octet[5]);
+ mac.ether_addr_octet[0],
+ mac.ether_addr_octet[1],
+ mac.ether_addr_octet[2],
+ mac.ether_addr_octet[3],
+ mac.ether_addr_octet[4],
+ mac.ether_addr_octet[5]);
+
+ if (link->ipv4ll) {
+ r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac);
+ if (r < 0) {
+ log_warning_link(link, "Could not update MAC "
+ "address in IPv4LL client: %s",
+ strerror(-r));
+ return r;
+ }
+ }
+
+ if (link->dhcp_client) {
+ r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac);
+ if (r < 0) {
+ log_warning_link(link, "Could not update MAC "
+ "address in DHCP client: %s",
+ strerror(-r));
+ return r;
+ }
+ }
}
r = sd_rtnl_message_link_get_flags(m, &flags);
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index ea414b1..46815e0 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -312,13 +312,13 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
if (r < 0 || ifindex <= 0) {
- log_debug("received RTM_NEWLINK message without valid ifindex");
+ log_warning("received RTM_NEWLINK message without valid ifindex");
return 0;
}
r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &name);
if (r < 0)
- log_debug("received RTM_NEWLINK message without valid IFLA_IFNAME");
+ log_warning("received RTM_NEWLINK message without valid ifname");
else {
NetDev *netdev;
More information about the systemd-commits
mailing list