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: small fix or general refactoring i did not bother commenting

Browse source
This commit is contained in:
evilsocket 2018-02-17 05:27:13 +01:00
commit 9390a580fd
3 changed files with 21 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

38
modules/wifi_recon.go
View file

@ -7,6 +7,7 @@ import (
"os"
"sort"
"strconv"
"strings"
"time"
"github.com/evilsocket/bettercap-ng/core"
@ -27,7 +28,6 @@ type WiFiRecon struct {
session.SessionModule
wifi *WiFi
stats *WiFiStats
handle *pcap.Handle
channel int
client net.HardwareAddr
@ -37,7 +37,6 @@ type WiFiRecon struct {
func NewWiFiRecon(s *session.Session) *WiFiRecon {
w := &WiFiRecon{
SessionModule: session.NewSessionModule("wifi.recon", s),
stats: NewWiFiStats(),
channel: 0,
client: make([]byte, 0),
accessPoint: make([]byte, 0),
@ -143,23 +142,12 @@ func (w *WiFiRecon) getRow(station *WiFiStation) []string {
}
ssid := station.ESSID()
encryption := w.stats.EncryptionOf(station.HW)
encryption := station.Encryption
if encryption == "OPEN" {
encryption = core.Green(encryption)
}
sent := ""
bytes := w.stats.SentFrom(station.HW)
if bytes > 0 {
sent = humanize.Bytes(bytes)
}
recvd := ""
bytes = w.stats.SentTo(station.HW)
if bytes > 0 {
recvd = humanize.Bytes(bytes)
}
sent := humanize.Bytes(station.Sent)
recvd := humanize.Bytes(station.Received)
row := []string{
fmt.Sprintf("%d dBm", station.RSSI),
@ -374,17 +362,21 @@ func (w *WiFiRecon) updateStats(dot11 *layers.Dot11, packet gopacket.Packet) {
if dot11.Type.MainType() == layers.Dot11TypeData {
bytes := uint64(len(packet.Data()))
dst := dot11.Address1
src := dot11.Address2
dst := dot11.Address1.String()
if station, found := w.wifi.Stations[dst]; found == true {
station.Received += bytes
}
w.stats.CollectReceived(dst, bytes)
w.stats.CollectSent(src, bytes)
src := dot11.Address2.String()
if station, found := w.wifi.Stations[src]; found == true {
station.Sent += bytes
}
}
if ok, enc := packets.Dot11ParseEncryption(packet, dot11); ok == true {
w.stats.ResetEncryption(dot11.Address3)
for _, e := range enc {
w.stats.CollectEncryption(dot11.Address3, e)
bssid := dot11.Address3.String()
if station, found := w.wifi.Stations[bssid]; found == true {
station.Encryption = strings.Join(enc, ", ")
}
}
}

9
modules/wifi_station.go
View file

@ -6,9 +6,12 @@ import (
type WiFiStation struct {
*network.Endpoint
IsAP bool
Channel int
RSSI int8
IsAP bool
Channel int
RSSI int8
Sent uint64
Received uint64
Encryption string
}
func NewWiFiStation(essid, bssid string, isAp bool, channel int, rssi int8) *WiFiStation {

117
modules/wifi_stats.go
View file

@ -1,117 +0,0 @@
package modules
import (
"net"
"strings"
"sync"
)
type WiFiStationStats struct {
Sent uint64
Received uint64
Encryption map[string]bool
}
func NewWiFiStationStats(sent uint64, recvd uint64) *WiFiStationStats {
return &WiFiStationStats{
Sent: sent,
Received: recvd,
Encryption: make(map[string]bool),
}
}
type WiFiStats struct {
sync.Mutex
stats map[string]*WiFiStationStats
}
func NewWiFiStats() *WiFiStats {
return &WiFiStats{
stats: make(map[string]*WiFiStationStats),
}
}
func (s *WiFiStats) CollectSent(station net.HardwareAddr, bytes uint64) {
s.Lock()
defer s.Unlock()
bssid := station.String()
if sstats, found := s.stats[bssid]; found == true {
sstats.Sent += bytes
} else {
s.stats[bssid] = NewWiFiStationStats(bytes, 0)
}
}
func (s *WiFiStats) CollectReceived(station net.HardwareAddr, bytes uint64) {
s.Lock()
defer s.Unlock()
bssid := station.String()
if sstats, found := s.stats[bssid]; found == true {
sstats.Received += bytes
} else {
s.stats[bssid] = NewWiFiStationStats(0, bytes)
}
}
func (s *WiFiStats) ResetEncryption(station net.HardwareAddr) {
s.Lock()
defer s.Unlock()
bssid := station.String()
if sstats, found := s.stats[bssid]; found == true {
sstats.Encryption = make(map[string]bool)
}
}
func (s *WiFiStats) CollectEncryption(station net.HardwareAddr, enc string) {
s.Lock()
defer s.Unlock()
bssid := station.String()
if sstats, found := s.stats[bssid]; found == true {
sstats.Encryption[enc] = true
} else {
stats := NewWiFiStationStats(0, 0)
stats.Encryption[enc] = true
s.stats[bssid] = stats
}
}
func (s *WiFiStats) SentFrom(station net.HardwareAddr) uint64 {
s.Lock()
defer s.Unlock()
bssid := station.String()
if sstats, found := s.stats[bssid]; found == true {
return sstats.Sent
}
return 0
}
func (s *WiFiStats) SentTo(station net.HardwareAddr) uint64 {
s.Lock()
defer s.Unlock()
bssid := station.String()
if sstats, found := s.stats[bssid]; found == true {
return sstats.Received
}
return 0
}
func (s *WiFiStats) EncryptionOf(station net.HardwareAddr) string {
s.Lock()
defer s.Unlock()
bssid := station.String()
if sstats, found := s.stats[bssid]; found == true {
unique := make([]string, 0)
for key := range sstats.Encryption {
unique = append(unique, key)
}
return strings.Join(unique, ", ")
}
return ""
}