github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-20 13:33:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: small fix or general refactoring i did not bother commenting

Browse source
This commit is contained in:
evilsocket 2019-02-06 07:29:36 +01:00
commit 97187acccb
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
1 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

51
modules/wifi_show.go
View file

@ -5,6 +5,7 @@ import (
"os" "os"
"sort" "sort"
"strconv" "strconv"
"strings"
"time" "time"
"github.com/bettercap/bettercap/network" "github.com/bettercap/bettercap/network"
@ -262,6 +263,28 @@ func (w *WiFiModule) colNames(nrows int) []string {
return columns return columns
} }
func (w *WiFiModule) showStatusBar() {
w.Session.Queue.Stats.RLock()
defer w.Session.Queue.Stats.RUnlock()
parts := []string{
fmt.Sprintf("%s (ch. %d)", w.Session.Interface.Name(), network.GetInterfaceChannel(w.Session.Interface.Name())),
fmt.Sprintf("%s %s", tui.Red("↑"), humanize.Bytes(w.Session.Queue.Stats.Sent)),
fmt.Sprintf("%s %s", tui.Green("↓"), humanize.Bytes(w.Session.Queue.Stats.Received)),
fmt.Sprintf("%d pkts", w.Session.Queue.Stats.PktReceived),
}
if nErrors := w.Session.Queue.Stats.Errors; nErrors > 0 {
parts = append(parts, fmt.Sprintf("%d errs", nErrors))
}
if nHandshakes := w.Session.WiFi.NumHandshakes(); nHandshakes > 0 {
parts = append(parts, fmt.Sprintf("%d handshakes", nHandshakes))
}
fmt.Printf("\n%s\n\n", strings.Join(parts, " / "))
}
func (w *WiFiModule) Show() (err error) { func (w *WiFiModule) Show() (err error) {
var stations []*network.Station var stations []*network.Station
if err, stations = w.doSelection(); err != nil { if err, stations = w.doSelection(); err != nil {
@ -279,33 +302,7 @@ func (w *WiFiModule) Show() (err error) {
tui.Table(os.Stdout, w.colNames(nrows), rows) tui.Table(os.Stdout, w.colNames(nrows), rows)
} }
numHandshakes := w.Session.WiFi.NumHandshakes() w.showStatusBar()
w.Session.Queue.Stats.RLock()
if numHandshakes > 0 {
fmt.Printf("\n%s (ch. %d) / %s %s / %s %s / %d pkts / %d errs / %d handshakes\n\n",
w.Session.Interface.Name(),
network.GetInterfaceChannel(w.Session.Interface.Name()),
tui.Red("↑"),
humanize.Bytes(w.Session.Queue.Stats.Sent),
tui.Green("↓"),
humanize.Bytes(w.Session.Queue.Stats.Received),
w.Session.Queue.Stats.PktReceived,
w.Session.Queue.Stats.Errors,
numHandshakes)
} else {
fmt.Printf("\n%s (ch. %d) / %s %s / %s %s / %d pkts / %d errs\n\n",
w.Session.Interface.Name(),
network.GetInterfaceChannel(w.Session.Interface.Name()),
tui.Red("↑"),
humanize.Bytes(w.Session.Queue.Stats.Sent),
tui.Green("↓"),
humanize.Bytes(w.Session.Queue.Stats.Received),
w.Session.Queue.Stats.PktReceived,
w.Session.Queue.Stats.Errors)
}
w.Session.Queue.Stats.RUnlock()
w.Session.Refresh() w.Session.Refresh()