Update wifi stats to support multiple stations (#977) (#980)

Signed-off-by: neiledgar <neil.edgar@btinternet.com>

5 files changed, 46 insertions, 34 deletions

diff --git a/vendor/github.com/mdlayher/wifi/client.go b/vendor/github.com/mdlayher/wifi/client.go
index 735843d..ff79a54 100644
--- a/vendor/github.com/mdlayher/wifi/client.go
+++ b/vendor/github.com/mdlayher/wifi/client.go
@@ -45,8 +45,8 @@ func (c *Client) BSS(ifi *Interface) (*BSS, error) {
         return c.c.BSS(ifi)
 }
 
-// StationInfo retrieves station statistics about a WiFi interface.
-func (c *Client) StationInfo(ifi *Interface) (*StationInfo, error) {
+// StationInfo retrieves all station statistics about a WiFi interface.
+func (c *Client) StationInfo(ifi *Interface) ([]*StationInfo, error) {
         return c.c.StationInfo(ifi)
 }
 
@@ -55,5 +55,5 @@ type osClient interface {
         Close() error
         Interfaces() ([]*Interface, error)
         BSS(ifi *Interface) (*BSS, error)
-        StationInfo(ifi *Interface) (*StationInfo, error)
+        StationInfo(ifi *Interface) ([]*StationInfo, error)
 }
diff --git a/vendor/github.com/mdlayher/wifi/client_linux.go b/vendor/github.com/mdlayher/wifi/client_linux.go
index 5a4055b..4edb9bc 100644
--- a/vendor/github.com/mdlayher/wifi/client_linux.go
+++ b/vendor/github.com/mdlayher/wifi/client_linux.go
@@ -18,7 +18,6 @@ import (
 
 // Errors which may occur when interacting with generic netlink.
 var (
-        errMultipleMessages     = errors.New("expected only one generic netlink message")
         errInvalidCommand       = errors.New("invalid generic netlink response command")
         errInvalidFamilyVersion = errors.New("invalid generic netlink response family version")
 )
@@ -120,9 +119,9 @@ func (c *client) BSS(ifi *Interface) (*BSS, error) {
         return parseBSS(msgs)
 }
 
-// StationInfo requests that nl80211 return station info for the specified
+// StationInfo requests that nl80211 return all station info for the specified
 // Interface.
-func (c *client) StationInfo(ifi *Interface) (*StationInfo, error) {
+func (c *client) StationInfo(ifi *Interface) ([]*StationInfo, error) {
         b, err := netlink.MarshalAttributes(ifi.idAttrs())
         if err != nil {
                 return nil, err
@@ -147,22 +146,25 @@ func (c *client) StationInfo(ifi *Interface) (*StationInfo, error) {
                 return nil, err
         }
 
-        switch len(msgs) {
-        case 0:
+        if len(msgs) == 0 {
                 return nil, os.ErrNotExist
-        case 1:
-                break
-        default:
-                return nil, errMultipleMessages
         }
 
-        if err := c.checkMessages(msgs, nl80211.CmdNewStation); err != nil {
-                return nil, err
+        stations := make([]*StationInfo, len(msgs))
+        for i := range msgs {
+                if err := c.checkMessages(msgs, nl80211.CmdNewStation); err != nil {
+                        return nil, err
+                }
+
+                if stations[i], err = parseStationInfo(msgs[i].Data); err != nil {
+                        return nil, err
+                }
         }
 
-        return parseStationInfo(msgs[0].Data)
+        return stations, nil
 }
 
+
 // checkMessages verifies that response messages from generic netlink contain
 // the command and family version we expect.
 func (c *client) checkMessages(msgs []genetlink.Message, command uint8) error {
@@ -323,25 +325,32 @@ func parseStationInfo(b []byte) (*StationInfo, error) {
                 return nil, err
         }
 
+        var info StationInfo
         for _, a := range attrs {
-                // The other attributes that are returned here appear to indicate the
-                // interface index and MAC address, which is information we already
-                // possess.  No need to parse them for now.
-                if a.Type != nl80211.AttrStaInfo {
-                        continue
-                }
 
-                nattrs, err := netlink.UnmarshalAttributes(a.Data)
-                if err != nil {
-                        return nil, err
-                }
+                switch a.Type {
+                case nl80211.AttrMac:
+                        info.HardwareAddr = net.HardwareAddr(a.Data)
 
-                var info StationInfo
-                if err := (&info).parseAttributes(nattrs); err != nil {
-                        return nil, err
-                }
+                case nl80211.AttrStaInfo:
+                        nattrs, err := netlink.UnmarshalAttributes(a.Data)
+                        if err != nil {
+                                return nil, err
+                        }
 
-                return &info, nil
+                        if err := (&info).parseAttributes(nattrs); err != nil {
+                                return nil, err
+                        }
+
+                        // nl80211.AttrStaInfo is last attibute we are interested in
+                        return &info, nil
+
+                default:
+                        // The other attributes that are returned here appear
+                        // nl80211.AttrIfindex, nl80211.AttrGeneration
+                        // No need to parse them for now.
+                        continue
+                }
         }
 
         // No station info found
diff --git a/vendor/github.com/mdlayher/wifi/client_others.go b/vendor/github.com/mdlayher/wifi/client_others.go
index 1848b88..0cbc728 100644
--- a/vendor/github.com/mdlayher/wifi/client_others.go
+++ b/vendor/github.com/mdlayher/wifi/client_others.go
@@ -28,6 +28,6 @@ func (c *client) BSS(ifi *Interface) (*BSS, error) {
 }
 
 // StationInfo always returns an error.
-func (c *client) StationInfo(ifi *Interface) (*StationInfo, error) {
+func (c *client) StationInfo(ifi *Interface) ([]*StationInfo, error) {
         return nil, errUnimplemented
 }
diff --git a/vendor/github.com/mdlayher/wifi/wifi.go b/vendor/github.com/mdlayher/wifi/wifi.go
index e16bcc4..83aed17 100644
--- a/vendor/github.com/mdlayher/wifi/wifi.go
+++ b/vendor/github.com/mdlayher/wifi/wifi.go
@@ -128,6 +128,9 @@ type Interface struct {
 // StationInfo contains statistics about a WiFi interface operating in
 // station mode.
 type StationInfo struct {
+        // The hardware address of the station.
+        HardwareAddr net.HardwareAddr
+
         // The time since the station last connected.
         Connected time.Duration
 
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 983a378..8dbff89 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -103,10 +103,10 @@
                         "revisionTime": "2017-12-14T18:12:53Z"
                 },
                 {
-                        "checksumSHA1": "6HM95OVqE3M27obRphrlXgXIHNw=",
+                        "checksumSHA1": "Y7cjrOeOvA/ic+B8WCp2JyLEuvs=",
                         "path": "github.com/mdlayher/wifi",
-                        "revision": "ebeb58da4bc660b4882176fedcd10015f44af89c",
-                        "revisionTime": "2018-06-01T12:43:32Z"
+                        "revision": "9a2549315201616119128afe421d1601ef3506f9",
+                        "revisionTime": "2018-06-15T12:49:15Z"
                 },
                 {
                         "checksumSHA1": "VzutdH69PUqRqhrDVv6F91ebQd4=",