github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-14 02:36:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: improve consistency and add rssi to logs

Browse source
This commit is contained in:
Neal Patel 2018-02-26 14:40:58 -08:00
commit b9cf32573f
4 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/events_view.go
View file

@ -29,14 +29,19 @@ func (s EventsStream) viewWiFiEvent(e session.Event) {
if ap.Vendor != "" {
vend = fmt.Sprintf(" (%s)", ap.Vendor)
}
rssi := ""
if ap.RSSI != 0 {
rssi = fmt.Sprintf(" (%d dBm)", ap.RSSI)
}
if e.Tag == "wifi.ap.new" {
fmt.Printf("[%s] [%s] WiFi access point %s detected as %s%s.\n",
fmt.Printf("[%s] [%s] WiFi access point %s%s detected as %s%s.\n",
e.Time.Format(eventTimeFormat),
core.Green(e.Tag),
core.Bold(ap.ESSID()),
core.Dim(core.Yellow(rssi)),
core.Green(ap.BSSID()),
vend)
core.Dim(vend))
} else if e.Tag == "wifi.ap.lost" {
fmt.Printf("[%s] [%s] WiFi access point %s (%s) lost.\n",
e.Time.Format(eventTimeFormat),
@ -51,11 +56,24 @@ func (s EventsStream) viewWiFiEvent(e session.Event) {
}
} else if e.Tag == "wifi.client.probe" {
probe := e.Data.(WiFiProbe)
fmt.Printf("[%s] [%s] Station %s is probing for SSID %s\n",
desc := ""
if probe.FromAlias != "" {
desc = fmt.Sprintf(" (%s)", probe.FromAlias)
} else if probe.FromVendor != "" {
desc = fmt.Sprintf(" (%s)", probe.FromVendor)
}
rssi := ""
if probe.RSSI != 0 {
rssi = fmt.Sprintf(" (%d dBm)", probe.RSSI)
}
fmt.Printf("[%s] [%s] Station %s%s is probing for SSID %s%s\n",
e.Time.Format(eventTimeFormat),
core.Green(e.Tag),
probe.From.String(),
core.Bold(probe.SSID))
probe.FromAddr.String(),
core.Dim(desc),
core.Bold(probe.SSID),
core.Yellow(rssi))
}
}
@ -87,7 +105,7 @@ func (s EventsStream) viewEndpointEvent(e session.Event) {
e.Time.Format(eventTimeFormat),
core.Green(e.Tag),
core.Red(t.IpAddress),
name)
core.Dim(vend))
} else {
fmt.Printf("[%s] [%s] %s\n",
e.Time.Format(eventTimeFormat),