|
 |
708deb9 |
From 51d18171529dcdad1366e422e42d538434af0ff6 Mon Sep 17 00:00:00 2001
|
|
|
708deb9 |
From: Tom Gundersen <teg@jklm.no>
|
|
|
708deb9 |
Date: Thu, 4 Sep 2014 14:10:43 +0200
|
|
|
708deb9 |
Subject: [PATCH] networkd: link - save link flags when the link is added
|
|
|
708deb9 |
|
|
|
708deb9 |
Don't wait for the link to be fully synchronised.
|
|
|
708deb9 |
---
|
|
|
708deb9 |
src/network/networkd-link.c | 162 +++++++++++++++++++++++---------------------
|
|
|
708deb9 |
1 file changed, 83 insertions(+), 79 deletions(-)
|
|
|
708deb9 |
|
|
|
708deb9 |
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
|
|
|
708deb9 |
index 57e719478a..1b7b1898c4 100644
|
|
|
708deb9 |
--- a/src/network/networkd-link.c
|
|
|
708deb9 |
+++ b/src/network/networkd-link.c
|
|
|
708deb9 |
@@ -35,6 +35,85 @@
|
|
|
708deb9 |
|
|
|
708deb9 |
#include "dhcp-lease-internal.h"
|
|
|
708deb9 |
|
|
|
708deb9 |
+#define FLAG_STRING(string, flag, old, new) \
|
|
|
708deb9 |
+ (((old ^ new) & flag) \
|
|
|
708deb9 |
+ ? ((old & flag) ? (" -" string) : (" +" string)) \
|
|
|
708deb9 |
+ : "")
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+static int link_update_flags(Link *link, sd_rtnl_message *m) {
|
|
|
708deb9 |
+ unsigned flags, unknown_flags_added, unknown_flags_removed, unknown_flags;
|
|
|
708deb9 |
+ uint8_t operstate;
|
|
|
708deb9 |
+ int r;
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ assert(link);
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ r = sd_rtnl_message_link_get_flags(m, &flags);
|
|
|
708deb9 |
+ if (r < 0) {
|
|
|
708deb9 |
+ log_warning_link(link, "Could not get link flags");
|
|
|
708deb9 |
+ return r;
|
|
|
708deb9 |
+ }
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ r = sd_rtnl_message_read_u8(m, IFLA_OPERSTATE, &operstate);
|
|
|
708deb9 |
+ if (r < 0)
|
|
|
708deb9 |
+ /* if we got a message without operstate, take it to mean
|
|
|
708deb9 |
+ the state was unchanged */
|
|
|
708deb9 |
+ operstate = link->kernel_operstate;
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ if ((link->flags == flags) && (link->kernel_operstate == operstate))
|
|
|
708deb9 |
+ return 0;
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ if (link->flags != flags) {
|
|
|
708deb9 |
+ log_debug_link(link, "flags change:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
|
|
|
708deb9 |
+ FLAG_STRING("LOOPBACK", IFF_LOOPBACK, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("MASTER", IFF_MASTER, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("SLAVE", IFF_SLAVE, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("UP", IFF_UP, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("DORMANT", IFF_DORMANT, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("LOWER_UP", IFF_LOWER_UP, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("RUNNING", IFF_RUNNING, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("MULTICAST", IFF_MULTICAST, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("BROADCAST", IFF_BROADCAST, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("POINTOPOINT", IFF_POINTOPOINT, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("PROMISC", IFF_PROMISC, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("ALLMULTI", IFF_ALLMULTI, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("PORTSEL", IFF_PORTSEL, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("AUTOMEDIA", IFF_AUTOMEDIA, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("DYNAMIC", IFF_DYNAMIC, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("NOARP", IFF_NOARP, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("NOTRAILERS", IFF_NOTRAILERS, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("DEBUG", IFF_DEBUG, link->flags, flags),
|
|
|
708deb9 |
+ FLAG_STRING("ECHO", IFF_ECHO, link->flags, flags));
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ unknown_flags = ~(IFF_LOOPBACK | IFF_MASTER | IFF_SLAVE | IFF_UP |
|
|
|
708deb9 |
+ IFF_DORMANT | IFF_LOWER_UP | IFF_RUNNING |
|
|
|
708deb9 |
+ IFF_MULTICAST | IFF_BROADCAST | IFF_POINTOPOINT |
|
|
|
708deb9 |
+ IFF_PROMISC | IFF_ALLMULTI | IFF_PORTSEL |
|
|
|
708deb9 |
+ IFF_AUTOMEDIA | IFF_DYNAMIC | IFF_NOARP |
|
|
|
708deb9 |
+ IFF_NOTRAILERS | IFF_DEBUG | IFF_ECHO);
|
|
|
708deb9 |
+ unknown_flags_added = ((link->flags ^ flags) & flags & unknown_flags);
|
|
|
708deb9 |
+ unknown_flags_removed = ((link->flags ^ flags) & link->flags & unknown_flags);
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ /* link flags are currently at most 18 bits, let's align to
|
|
|
708deb9 |
+ * printing 20 */
|
|
|
708deb9 |
+ if (unknown_flags_added)
|
|
|
708deb9 |
+ log_debug_link(link,
|
|
|
708deb9 |
+ "unknown link flags gained: %#.5x (ignoring)",
|
|
|
708deb9 |
+ unknown_flags_added);
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ if (unknown_flags_removed)
|
|
|
708deb9 |
+ log_debug_link(link,
|
|
|
708deb9 |
+ "unknown link flags lost: %#.5x (ignoring)",
|
|
|
708deb9 |
+ unknown_flags_removed);
|
|
|
708deb9 |
+ }
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ link->flags = flags;
|
|
|
708deb9 |
+ link->kernel_operstate = operstate;
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ link_save(link);
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ return 0;
|
|
|
708deb9 |
+}
|
|
|
708deb9 |
+
|
|
|
708deb9 |
static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
|
|
|
708deb9 |
_cleanup_link_unref_ Link *link = NULL;
|
|
|
708deb9 |
uint16_t type;
|
|
|
708deb9 |
@@ -95,6 +174,10 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
|
|
|
708deb9 |
if (r < 0)
|
|
|
708deb9 |
return r;
|
|
|
708deb9 |
|
|
|
708deb9 |
+ r = link_update_flags(link, message);
|
|
|
708deb9 |
+ if (r < 0)
|
|
|
708deb9 |
+ return r;
|
|
|
708deb9 |
+
|
|
|
708deb9 |
*ret = link;
|
|
|
708deb9 |
link = NULL;
|
|
|
708deb9 |
|
|
|
708deb9 |
@@ -877,85 +960,6 @@ bool link_has_carrier(Link *link) {
|
|
|
708deb9 |
return false;
|
|
|
708deb9 |
}
|
|
|
708deb9 |
|
|
|
708deb9 |
-#define FLAG_STRING(string, flag, old, new) \
|
|
|
708deb9 |
- (((old ^ new) & flag) \
|
|
|
708deb9 |
- ? ((old & flag) ? (" -" string) : (" +" string)) \
|
|
|
708deb9 |
- : "")
|
|
|
708deb9 |
-
|
|
|
708deb9 |
-static int link_update_flags(Link *link, sd_rtnl_message *m) {
|
|
|
708deb9 |
- unsigned flags, unknown_flags_added, unknown_flags_removed, unknown_flags;
|
|
|
708deb9 |
- uint8_t operstate;
|
|
|
708deb9 |
- int r;
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- assert(link);
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- r = sd_rtnl_message_link_get_flags(m, &flags);
|
|
|
708deb9 |
- if (r < 0) {
|
|
|
708deb9 |
- log_warning_link(link, "Could not get link flags");
|
|
|
708deb9 |
- return r;
|
|
|
708deb9 |
- }
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- r = sd_rtnl_message_read_u8(m, IFLA_OPERSTATE, &operstate);
|
|
|
708deb9 |
- if (r < 0)
|
|
|
708deb9 |
- /* if we got a message without operstate, take it to mean
|
|
|
708deb9 |
- the state was unchanged */
|
|
|
708deb9 |
- operstate = link->kernel_operstate;
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- if ((link->flags == flags) && (link->kernel_operstate == operstate))
|
|
|
708deb9 |
- return 0;
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- if (link->flags != flags) {
|
|
|
708deb9 |
- log_debug_link(link, "flags change:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
|
|
|
708deb9 |
- FLAG_STRING("LOOPBACK", IFF_LOOPBACK, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("MASTER", IFF_MASTER, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("SLAVE", IFF_SLAVE, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("UP", IFF_UP, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("DORMANT", IFF_DORMANT, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("LOWER_UP", IFF_LOWER_UP, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("RUNNING", IFF_RUNNING, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("MULTICAST", IFF_MULTICAST, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("BROADCAST", IFF_BROADCAST, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("POINTOPOINT", IFF_POINTOPOINT, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("PROMISC", IFF_PROMISC, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("ALLMULTI", IFF_ALLMULTI, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("PORTSEL", IFF_PORTSEL, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("AUTOMEDIA", IFF_AUTOMEDIA, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("DYNAMIC", IFF_DYNAMIC, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("NOARP", IFF_NOARP, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("NOTRAILERS", IFF_NOTRAILERS, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("DEBUG", IFF_DEBUG, link->flags, flags),
|
|
|
708deb9 |
- FLAG_STRING("ECHO", IFF_ECHO, link->flags, flags));
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- unknown_flags = ~(IFF_LOOPBACK | IFF_MASTER | IFF_SLAVE | IFF_UP |
|
|
|
708deb9 |
- IFF_DORMANT | IFF_LOWER_UP | IFF_RUNNING |
|
|
|
708deb9 |
- IFF_MULTICAST | IFF_BROADCAST | IFF_POINTOPOINT |
|
|
|
708deb9 |
- IFF_PROMISC | IFF_ALLMULTI | IFF_PORTSEL |
|
|
|
708deb9 |
- IFF_AUTOMEDIA | IFF_DYNAMIC | IFF_NOARP |
|
|
|
708deb9 |
- IFF_NOTRAILERS | IFF_DEBUG | IFF_ECHO);
|
|
|
708deb9 |
- unknown_flags_added = ((link->flags ^ flags) & flags & unknown_flags);
|
|
|
708deb9 |
- unknown_flags_removed = ((link->flags ^ flags) & link->flags & unknown_flags);
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- /* link flags are currently at most 18 bits, let's align to
|
|
|
708deb9 |
- * printing 20 */
|
|
|
708deb9 |
- if (unknown_flags_added)
|
|
|
708deb9 |
- log_debug_link(link,
|
|
|
708deb9 |
- "unknown link flags gained: %#.5x (ignoring)",
|
|
|
708deb9 |
- unknown_flags_added);
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- if (unknown_flags_removed)
|
|
|
708deb9 |
- log_debug_link(link,
|
|
|
708deb9 |
- "unknown link flags lost: %#.5x (ignoring)",
|
|
|
708deb9 |
- unknown_flags_removed);
|
|
|
708deb9 |
- }
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- link->flags = flags;
|
|
|
708deb9 |
- link->kernel_operstate = operstate;
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- link_save(link);
|
|
|
708deb9 |
-
|
|
|
708deb9 |
- return 0;
|
|
|
708deb9 |
-}
|
|
|
708deb9 |
-
|
|
|
708deb9 |
static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
|
|
|
708deb9 |
_cleanup_link_unref_ Link *link = userdata;
|
|
|
708deb9 |
int r;
|