network: also read BSSID

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 7f00337f137f43c9766a64f1f3948ed5e9109e81..1c0ae0184c257930cd26fb2605123b22e1aa2566 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -2954,7 +2954,7 @@ static int link_initialized_and_synced(Link *link) {
                 return r;
 
         if (!link->network) {
-                r = wifi_get_ssid(link);
+                r = wifi_get_info(link);
                 if (r < 0)
                         return r;
 
@@ -3333,7 +3333,7 @@ static int link_carrier_gained(Link *link) {
 
         assert(link);
 
-        r = wifi_get_ssid(link);
+        r = wifi_get_info(link);
         if (r < 0)
                 return r;
         if (r > 0) {

diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index fd01387895f30c1dd320e33d19549d7ff40ef807..8a96da90b284560f379ad0848db61dc113393333 100644 (file)
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -57,6 +57,7 @@ typedef struct Link {
 
         /* wlan */
         char *ssid;
+        struct ether_addr bssid;
 
         unsigned flags;
         uint8_t kernel_operstate;

diff --git a/src/network/networkd-wifi.c b/src/network/networkd-wifi.c
index 252985db49a16589bac94222583a4e13bd7445bc..94195d778ffb15d8d3f32aeef10001c4425ba74b 100644 (file)
--- a/src/network/networkd-wifi.c
+++ b/src/network/networkd-wifi.c
@@ -13,25 +13,12 @@
 #include "networkd-wifi.h"
 #include "string-util.h"
 
-int wifi_get_ssid(Link *link) {
+static int wifi_get_ssid(Link *link) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL, *reply = NULL;
         _cleanup_free_ char *ssid = NULL;
         sd_genl_family family;
-        const char *type;
         int r;
 
-        if (!link->sd_device)
-                return 0;
-
-        r = sd_device_get_devtype(link->sd_device, &type);
-        if (r == -ENOENT)
-                return 0;
-        else if (r < 0)
-                return r;
-
-        if (!streq(type, "wlan"))
-                return 0;
-
         r = sd_genl_message_new(link->manager->genl, SD_GENL_NL80211, NL80211_CMD_GET_INTERFACE, &m);
         if (r < 0)
                 return log_link_error_errno(link, r, "Failed to create generic netlink message: %m");
@@ -63,8 +50,93 @@ int wifi_get_ssid(Link *link) {
                 return log_link_warning_errno(link, r, "Failed to get NL80211_ATTR_SSID attribute: %m");
 
         free_and_replace(link->ssid, ssid);
-        if (link->ssid)
-                log_link_info(link, "Connected SSID: %s", link->ssid);
+        return r == -ENODATA ? 0 : 1;
+}
+
+static int wifi_get_bssid(Link *link) {
+        _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL, *reply = NULL;
+        struct ether_addr mac = {};
+        sd_genl_family family;
+        int r;
+
+        assert(link);
+        assert(link->manager);
+        assert(link->manager->genl);
+
+        r = sd_genl_message_new(link->manager->genl, SD_GENL_NL80211, NL80211_CMD_GET_STATION, &m);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Failed to create generic netlink message: %m");
+
+        r = sd_netlink_message_set_flags(m, NLM_F_REQUEST | NLM_F_ACK | NLM_F_DUMP);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Failed to set dump flag: %m");
+
+        r = sd_netlink_message_append_u32(m, NL80211_ATTR_IFINDEX, link->ifindex);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not append NL80211_ATTR_IFINDEX attribute: %m");
+
+        r = sd_netlink_call(link->manager->genl, m, 0, &reply);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Failed to request information about wifi station: %m");
+        if (!reply)
+                return 0;
+
+        r = sd_netlink_message_get_errno(reply);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Failed to get information about wifi station: %m");
+
+        r = sd_genl_message_get_family(link->manager->genl, reply, &family);
+        if (r < 0)
+                return log_link_warning_errno(link, r, "Failed to determine genl family: %m");
+        if (family != SD_GENL_NL80211) {
+                log_link_debug(link, "Received message of unexpected genl family %u, ignoring.", family);
+                return 0;
+        }
+
+        r = sd_netlink_message_read_ether_addr(reply, NL80211_ATTR_MAC, &mac);
+        if (r < 0 && r != -ENODATA)
+                return log_link_warning_errno(link, r, "Failed to get NL80211_ATTR_MAC attribute: %m");
+
+        r = memcmp(&link->bssid, &mac, sizeof(mac));
+        if (r == 0)
+                return 0;
+
+        memcpy(&link->bssid, &mac, sizeof(mac));
+        return 1;
+}
+
+int wifi_get_info(Link *link) {
+        char buf[ETHER_ADDR_TO_STRING_MAX];
+        const char *type;
+        int r, s;
+
+        assert(link);
 
-        return r;
+        if (!link->sd_device)
+                return 0;
+
+        r = sd_device_get_devtype(link->sd_device, &type);
+        if (r == -ENOENT)
+                return 0;
+        else if (r < 0)
+                return r;
+
+        if (!streq(type, "wlan"))
+                return 0;
+
+        r = wifi_get_ssid(link);
+        if (r < 0)
+                return r;
+
+        s = wifi_get_bssid(link);
+        if (s < 0)
+                return s;
+
+        if (r > 0 || s > 0) {
+                if (link->ssid)
+                        log_link_info(link, "Connected WiFi access point: %s (%s)",
+                                      link->ssid, ether_addr_to_string(&link->bssid, buf));
+                return 1;
+        }
+        return 0;
 }

diff --git a/src/network/networkd-wifi.h b/src/network/networkd-wifi.h
index 4789427ba43ef408d74a0d02b08588c0fe742874..57aa1533704125a1d07eb0cb17d599e826004362 100644 (file)
--- a/src/network/networkd-wifi.h
+++ b/src/network/networkd-wifi.h
@@ -5,4 +5,4 @@
 
 typedef struct Link Link;
 
-int wifi_get_ssid(Link *link);
+int wifi_get_info(Link *link);