diff --git a/js/http.go b/js/http.go index 16d95f42..1adbcc27 100644 --- a/js/http.go +++ b/js/http.go @@ -54,10 +54,7 @@ func (c httpPackage) Request(method string, uri string, headers map[string]strin req.Header.Add(name, value) } - transport := &http.Transport{} - client := &http.Client{Transport: transport} - - resp, err := client.Do(req) + resp, err := http.DefaultClient.Do(req) if err != nil { return httpResponse{Error: err} } diff --git a/modules/graph/json.go b/modules/graph/json.go index 82521a0a..90e34f73 100644 --- a/modules/graph/json.go +++ b/modules/graph/json.go @@ -9,7 +9,7 @@ import ( func (mod *Module) generateJSONGraph(bssid string) error { mod.wLock.Lock() defer mod.wLock.Unlock() - + start := time.Now() if err := mod.updateSettings(); err != nil { return err diff --git a/modules/net_probe/net_probe.go b/modules/net_probe/net_probe.go index 3b3ddb93..789fc3a1 100644 --- a/modules/net_probe/net_probe.go +++ b/modules/net_probe/net_probe.go @@ -111,7 +111,8 @@ func (mod *Prober) Start() error { return } - list, err := iprange.Parse(mod.Session.Interface.CIDR()) + cidr := mod.Session.Interface.CIDR() + list, err := iprange.Parse(cidr) if err != nil { mod.Fatal("%s", err) } @@ -125,6 +126,8 @@ func (mod *Prober) Start() error { addresses := list.Expand() throttle := time.Duration(mod.throttle) * time.Millisecond + mod.Info("probing %d addresses on %s", len(addresses), cidr) + for mod.Running() { if mod.probes.MDNS { mod.sendProbeMDNS(fromIP, fromHW) diff --git a/modules/wifi/wifi_hopping.go b/modules/wifi/wifi_hopping.go index 0dfb78db..8d5abf27 100644 --- a/modules/wifi/wifi_hopping.go +++ b/modules/wifi/wifi_hopping.go @@ -24,7 +24,7 @@ func (mod *WiFiModule) isInterfaceConnected() bool { } func (mod *WiFiModule) hopUnlocked(channel int) (mustStop bool) { - mod.Debug("hopping on channel %d", channel) + // mod.Debug("hopping on channel %d", channel) if err := network.SetInterfaceChannel(mod.iface.Name(), channel); err != nil { // check if the device has been disconnected diff --git a/network/make_manuf.py b/network/make_manuf.py index ded7261b..73c70772 100755 --- a/network/make_manuf.py +++ b/network/make_manuf.py @@ -2,7 +2,6 @@ import os import six import re -import sys base = os.path.dirname(os.path.realpath(__file__)) # "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob_plain;f=manuf;hb=HEAD" diff --git a/network/net_linux.go b/network/net_linux.go index 7e8265a6..feca3d7b 100644 --- a/network/net_linux.go +++ b/network/net_linux.go @@ -41,7 +41,7 @@ func SetInterfaceChannel(iface string, channel int) error { } if core.HasBinary("iw") { - Debug("SetInterfaceChannel(%s, %d) iw based", iface, channel) + // Debug("SetInterfaceChannel(%s, %d) iw based", iface, channel) out, err := core.Exec("iw", []string{"dev", iface, "set", "channel", fmt.Sprintf("%d", channel)}) if err != nil { return fmt.Errorf("iw: out=%s err=%s", out, err) @@ -49,7 +49,7 @@ func SetInterfaceChannel(iface string, channel int) error { return fmt.Errorf("Unexpected output while setting interface %s to channel %d: %s", iface, channel, out) } } else if core.HasBinary("iwconfig") { - Debug("SetInterfaceChannel(%s, %d) iwconfig based") + // Debug("SetInterfaceChannel(%s, %d) iwconfig based") out, err := core.Exec("iwconfig", []string{iface, "channel", fmt.Sprintf("%d", channel)}) if err != nil { return fmt.Errorf("iwconfig: out=%s err=%s", out, err)