diff --git a/modules/events_stream/events_view_wifi.go b/modules/events_stream/events_view_wifi.go index 28dcc3f6..23463d99 100644 --- a/modules/events_stream/events_view_wifi.go +++ b/modules/events_stream/events_view_wifi.go @@ -60,7 +60,7 @@ func (mod *EventsStream) viewWiFiClientProbeEvent(e session.Event) { fmt.Fprintf(mod.output, "[%s] [%s] station %s%s is probing for SSID %s%s\n", e.Time.Format(mod.timeFormat), tui.Green(e.Tag), - probe.FromAddr.String(), + probe.FromAddr, tui.Dim(desc), tui.Bold(probe.SSID), tui.Yellow(rssi)) diff --git a/modules/wifi/wifi_events.go b/modules/wifi/wifi_events.go index d455c9e7..66ae528f 100644 --- a/modules/wifi/wifi_events.go +++ b/modules/wifi/wifi_events.go @@ -12,11 +12,11 @@ type ClientEvent struct { } type ProbeEvent struct { - FromAddr net.HardwareAddr - FromVendor string - FromAlias string - SSID string - RSSI int8 + FromAddr string `json:"mac"` + FromVendor string `json:"vendor"` + FromAlias string `json:"alias"` + SSID string `json:"essid"` + RSSI int8 `json:"rssi"` } type HandshakeEvent struct { diff --git a/modules/wifi/wifi_recon.go b/modules/wifi/wifi_recon.go index 03bda3fe..6e62d0d9 100644 --- a/modules/wifi/wifi_recon.go +++ b/modules/wifi/wifi_recon.go @@ -108,7 +108,7 @@ func (mod *WiFiModule) discoverProbes(radiotap *layers.RadioTap, dot11 *layers.D } mod.Session.Events.Add("wifi.client.probe", ProbeEvent{ - FromAddr: dot11.Address2, + FromAddr: dot11.Address2.String(), FromVendor: network.ManufLookup(dot11.Address2.String()), FromAlias: mod.Session.Lan.GetAlias(dot11.Address2.String()), SSID: string(req.Contents[2 : 2+size]),