From 1afab5d7be551097c98b4d1c593232b2ca54ba8d Mon Sep 17 00:00:00 2001 From: evilsocket Date: Thu, 26 Apr 2018 12:19:52 +0200 Subject: [PATCH] more lint driven refactoring --- network/arp.go | 4 ++-- network/arp_parser_linux.go | 2 +- network/ble.go | 7 +------ network/lan.go | 18 ++++++++---------- network/net.go | 4 ++-- network/net_linux.go | 6 +++--- network/wifi.go | 4 ++-- 7 files changed, 19 insertions(+), 26 deletions(-) diff --git a/network/arp.go b/network/arp.go index 95dbda80..e22aec77 100644 --- a/network/arp.go +++ b/network/arp.go @@ -58,7 +58,7 @@ func ArpUpdate(iface string) (ArpTable, error) { func ArpLookup(iface string, address string, refresh bool) (string, error) { // Refresh ARP table if first run or if a force refresh has been instructed. - if ArpParsed() == false || refresh { + if !ArpParsed() || refresh { if _, err := ArpUpdate(iface); err != nil { return "", err } @@ -76,7 +76,7 @@ func ArpLookup(iface string, address string, refresh bool) (string, error) { } func ArpInverseLookup(iface string, mac string, refresh bool) (string, error) { - if ArpParsed() == false || refresh { + if !ArpParsed() || refresh { if _, err := ArpUpdate(iface); err != nil { return "", err } diff --git a/network/arp_parser_linux.go b/network/arp_parser_linux.go index fe2fc142..3738cbd5 100644 --- a/network/arp_parser_linux.go +++ b/network/arp_parser_linux.go @@ -2,7 +2,7 @@ package network import "regexp" -var ArpTableParser = regexp.MustCompile("^([\\d\\.]+)\\s+dev\\s+(\\w+)\\s+\\w+\\s+([a-f0-9:]{17})\\s+\\w+$") +var ArpTableParser = regexp.MustCompile(`^([\d\.]+)\s+dev\s+(\w+)\s+\w+\s+([a-f0-9:]{17})\s+\w+$`) var ArpTableTokens = 4 var ArpTableTokenIndex = []int{1, 3, 2} var ArpCmd = "ip" diff --git a/network/ble.go b/network/ble.go index 1612742e..a4930fc7 100644 --- a/network/ble.go +++ b/network/ble.go @@ -35,13 +35,8 @@ func NewBLE(newcb BLEDevNewCallback, lostcb BLEDevLostCallback) *BLE { func (b *BLE) MarshalJSON() ([]byte, error) { doc := bleJSON{ - Devices: make([]*BLEDevice, 0), + Devices: b.Devices(), } - - for _, dev := range b.Devices() { - doc.Devices = append(doc.Devices, dev) - } - return json.Marshal(doc) } diff --git a/network/lan.go b/network/lan.go index 573561e9..b89866d0 100644 --- a/network/lan.go +++ b/network/lan.go @@ -16,15 +16,13 @@ type EndpointLostCallback func(e *Endpoint) type LAN struct { sync.Mutex - - hosts map[string]*Endpoint - iface *Endpoint - gateway *Endpoint - ttl map[string]uint - aliases *Aliases - newCb EndpointNewCallback - lostCb EndpointLostCallback - aliasesFileName string + hosts map[string]*Endpoint + iface *Endpoint + gateway *Endpoint + ttl map[string]uint + aliases *Aliases + newCb EndpointNewCallback + lostCb EndpointLostCallback } type lanJSON struct { @@ -146,7 +144,7 @@ func (lan *LAN) shouldIgnore(ip, mac string) bool { } // skip everything which is not in our subnet (multicast noise) addr := net.ParseIP(ip) - return lan.iface.Net.Contains(addr) == false + return !lan.iface.Net.Contains(addr) } func (lan *LAN) Has(ip string) bool { diff --git a/network/net.go b/network/net.go index ab8affbe..bf748e0e 100644 --- a/network/net.go +++ b/network/net.go @@ -133,7 +133,7 @@ func buildEndpointFromInterface(iface net.Interface) (*Endpoint, error) { for _, a := range addrs { address := a.String() if IPv4Validator.MatchString(address) { - if strings.IndexRune(address, '/') == -1 { + if strings.ContainsRune(address, '/') { // plain ip e.SetIP(address) } else { @@ -201,7 +201,7 @@ func FindInterface(name string) (*Endpoint, error) { for _, address := range addrs { ip := address.String() - if strings.Contains(ip, "127.0.0.1") == false && IPv4Validator.MatchString(ip) { + if !strings.Contains(ip, "127.0.0.1") && IPv4Validator.MatchString(ip) { return buildEndpointFromInterface(iface) } } diff --git a/network/net_linux.go b/network/net_linux.go index b2543b7b..3521b04c 100644 --- a/network/net_linux.go +++ b/network/net_linux.go @@ -12,11 +12,11 @@ import ( ) // only matches gateway lines -var IPv4RouteParser = regexp.MustCompile("^(default|[0-9\\.]+)\\svia\\s([0-9\\.]+)\\sdev\\s(\\w+)\\s.*$") +var IPv4RouteParser = regexp.MustCompile(`^(default|[0-9\.]+)\svia\s([0-9\.]+)\sdev\s(\w+)\s.*$`) var IPv4RouteTokens = 4 var IPv4RouteCmd = "ip" var IPv4RouteCmdOpts = []string{"route"} -var WiFiFreqParser = regexp.MustCompile("^\\s+Channel.([0-9]+)\\s+:\\s+([0-9\\.]+)\\s+GHz.*$") +var WiFiFreqParser = regexp.MustCompile(`^\s+Channel.([0-9]+)\s+:\s+([0-9\.]+)\s+GHz.*$`) func IPv4RouteIsGateway(ifname string, tokens []string, f func(gateway string) (*Endpoint, error)) (*Endpoint, error) { ifname2 := tokens[3] @@ -54,7 +54,7 @@ func GetSupportedFrequencies(iface string) ([]int, error) { for scanner.Scan() { line := scanner.Text() matches := WiFiFreqParser.FindStringSubmatch(line) - if matches != nil && len(matches) == 3 { + if len(matches) == 3 { if freq, err := strconv.ParseFloat(matches[2], 64); err == nil { freqs = append(freqs, int(freq*1000)) } diff --git a/network/wifi.go b/network/wifi.go index c53b0cb6..389b8960 100644 --- a/network/wifi.go +++ b/network/wifi.go @@ -115,7 +115,7 @@ func (w *WiFi) Remove(mac string) { // get non printable characters .... (ref #61) func isBogusMacESSID(essid string) bool { for _, c := range essid { - if strconv.IsPrint(c) == false { + if !strconv.IsPrint(c) { return true } } @@ -131,7 +131,7 @@ func (w *WiFi) AddIfNew(ssid, mac string, frequency int, rssi int8) *AccessPoint ap.LastSeen = time.Now() ap.RSSI = rssi // always get the cleanest one - if isBogusMacESSID(ssid) == false { + if !isBogusMacESSID(ssid) { ap.Hostname = ssid } return ap