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

modules/api_rest.go

@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/session"
-	"github.com/evilsocket/bettercap-ng/tls"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/session"
+	"github.com/bettercap/bettercap/tls"
 )
 
 type RestAPI struct {

modules/api_rest_controller.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/session"
 )
 
 var (

modules/arp_spoof.go

@@ -5,9 +5,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/packets"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/packets"
+	"github.com/bettercap/bettercap/session"
 
 	"github.com/malfunkt/iprange"
 )

modules/dhcp6_spoof.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/packets"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/packets"
+	"github.com/bettercap/bettercap/session"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"

modules/dns_spoof.go

@@ -6,10 +6,10 @@ import (
 	"net"
 	"strings"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/packets"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/packets"
+	"github.com/bettercap/bettercap/session"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"

modules/events_stream.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"strconv"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/session"
 )
 
 type EventsStream struct {

modules/events_view.go

@@ -5,9 +5,9 @@ import (
 	// "sort"
 	"strings"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/network"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/session"
 )
 
 const eventTimeFormat = "2006-01-02 15:04:05"

modules/http_proxy.go

@@ -1,7 +1,7 @@
 package modules
 
 import (
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/session"
 )
 
 type HttpProxy struct {

modules/http_proxy_base.go

@@ -15,11 +15,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/firewall"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/session"
-	btls "github.com/evilsocket/bettercap-ng/tls"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/firewall"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/session"
+	btls "github.com/bettercap/bettercap/tls"
 
 	"github.com/elazarl/goproxy"
 	"github.com/inconshreveable/go-vhost"

modules/http_proxy_js_response.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/elazarl/goproxy"
 
-	"github.com/evilsocket/bettercap-ng/core"
+	"github.com/bettercap/bettercap/core"
 )
 
 type JSResponse struct {

modules/http_proxy_script.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/session"
 
 	"github.com/robertkrimen/otto"
 )

modules/http_proxy_script_builtins.go

@@ -3,7 +3,7 @@ package modules
 import (
 	"io/ioutil"
 
-	"github.com/evilsocket/bettercap-ng/log"
+	"github.com/bettercap/bettercap/log"
 
 	"github.com/robertkrimen/otto"
 )

modules/http_proxy_script_test.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/session"
 )
 
 func getScript(src string) *ProxyScript {

modules/http_server.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/session"
 )
 
 type HttpServer struct {

modules/https_proxy.go

@@ -1,10 +1,10 @@
 package modules
 
 import (
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/session"
-	"github.com/evilsocket/bettercap-ng/tls"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/session"
+	"github.com/bettercap/bettercap/tls"
 )
 
 type HttpsProxy struct {

modules/mac_changer.go

@@ -6,10 +6,10 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	bnet "github.com/evilsocket/bettercap-ng/network"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	bnet "github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/session"
 )
 
 type MacChanger struct {

modules/net_probe.go

@@ -5,9 +5,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/network"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/session"
 
 	"github.com/malfunkt/iprange"
 )

modules/net_probe_udp.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"sync/atomic"
 
-	"github.com/evilsocket/bettercap-ng/log"
+	"github.com/bettercap/bettercap/log"
 )
 
 func (p *Prober) sendProbeUDP(from net.IP, from_hw net.HardwareAddr, ip net.IP) {

modules/net_recon.go

@@ -3,9 +3,9 @@ package modules
 import (
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/network"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/session"
 )
 
 type Discovery struct {

modules/net_recon_show.go

@@ -8,9 +8,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/network"
-	"github.com/evilsocket/bettercap-ng/packets"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/packets"
 
 	"github.com/dustin/go-humanize"
 	"github.com/olekukonko/tablewriter"

modules/net_recon_sort.go

@@ -1,9 +1,9 @@
 package modules
 
 import (
-	"github.com/evilsocket/bettercap-ng/network"
-	"github.com/evilsocket/bettercap-ng/packets"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/packets"
+	"github.com/bettercap/bettercap/session"
 )
 
 type ByAddressSorter []*network.Endpoint

modules/net_sniff.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/session"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"

modules/net_sniff_context.go

@@ -4,9 +4,9 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/session"
 
 	"github.com/google/gopacket/pcap"
 	"github.com/google/gopacket/pcapgo"

modules/net_sniff_dns.go

@@ -3,7 +3,7 @@ package modules
 import (
 	"strings"
 
-	"github.com/evilsocket/bettercap-ng/core"
+	"github.com/bettercap/bettercap/core"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"

modules/net_sniff_event.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/session"
 )
 
 type SniffData map[string]interface{}

modules/net_sniff_http.go

@@ -3,7 +3,7 @@ package modules
 import (
 	"fmt"
 
-	"github.com/evilsocket/bettercap-ng/core"
+	"github.com/bettercap/bettercap/core"
 	"regexp"
 
 	"github.com/google/gopacket"

modules/net_sniff_krb5.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"encoding/asn1"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/packets"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/packets"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"

modules/net_sniff_ntlm.go

@@ -4,8 +4,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/packets"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/packets"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"

modules/net_sniff_parsers.go

@@ -3,9 +3,9 @@ package modules
 import (
 	"fmt"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/packets"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/packets"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"

modules/net_sniff_sni.go

@@ -3,7 +3,7 @@ package modules
 import (
 	"fmt"
 
-	"github.com/evilsocket/bettercap-ng/core"
+	"github.com/bettercap/bettercap/core"
 	"regexp"
 
 	"github.com/google/gopacket"

modules/net_sniff_stats.go

@@ -1,7 +1,7 @@
 package modules
 
 import (
-	"github.com/evilsocket/bettercap-ng/log"
+	"github.com/bettercap/bettercap/log"
 	"time"
 )
 

modules/net_sniff_views.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/google/gopacket/layers"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/session"
 )
 
 func vTime(t time.Time) string {

modules/syn_scan.go

@@ -6,11 +6,11 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/network"
-	"github.com/evilsocket/bettercap-ng/packets"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/packets"
+	"github.com/bettercap/bettercap/session"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"

modules/syn_scan_event.go

@@ -1,8 +1,8 @@
 package modules
 
 import (
-	"github.com/evilsocket/bettercap-ng/network"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/session"
 )
 
 type SynScanEvent struct {

modules/ticker.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/session"
 )
 
 type Ticker struct {

modules/utils.go

@@ -5,10 +5,10 @@ import (
 	"net"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/network"
-	"github.com/evilsocket/bettercap-ng/packets"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/packets"
+	"github.com/bettercap/bettercap/session"
 )
 
 func findMAC(s *session.Session, ip net.IP, probe bool) (net.HardwareAddr, error) {

modules/wifi_recon.go

@@ -8,11 +8,11 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/network"
-	"github.com/evilsocket/bettercap-ng/packets"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/network"
+	"github.com/bettercap/bettercap/packets"
+	"github.com/bettercap/bettercap/session"
 
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"

modules/wifi_recon_sort.go

@@ -1,7 +1,7 @@
 package modules
 
 import (
-	"github.com/evilsocket/bettercap-ng/network"
+	"github.com/bettercap/bettercap/network"
 )
 
 type ByRSSISorter []*network.Station

modules/wol.go

@@ -5,10 +5,10 @@ import (
 	"net"
 	"regexp"
 
-	"github.com/evilsocket/bettercap-ng/core"
-	"github.com/evilsocket/bettercap-ng/log"
-	"github.com/evilsocket/bettercap-ng/packets"
-	"github.com/evilsocket/bettercap-ng/session"
+	"github.com/bettercap/bettercap/core"
+	"github.com/bettercap/bettercap/log"
+	"github.com/bettercap/bettercap/packets"
+	"github.com/bettercap/bettercap/session"
 
 	"github.com/google/gopacket/layers"
 )