refact: renamed package net to network to avoid collision with golang net package.

net/endpoint.go

@@ -1,106 +0,0 @@
-package net
-
-import (
-	"encoding/binary"
-	"fmt"
-	"net"
-	"time"
-
-	"github.com/evilsocket/bettercap-ng/core"
-)
-
-type OnHostResolvedCallback func(e *Endpoint)
-type Endpoint struct {
-	Index            int                    `json:"-"`
-	IP               net.IP                 `json:"-"`
-	Net              *net.IPNet             `json:"-"`
-	IPv6             net.IP                 `json:"-"`
-	HW               net.HardwareAddr       `json:"-"`
-	IpAddress        string                 `json:"ipv4"`
-	Ip6Address       string                 `json:"ipv6"`
-	SubnetBits       uint32                 `json:"-"`
-	IpAddressUint32  uint32                 `json:"-"`
-	HwAddress        string                 `json:"mac"`
-	Hostname         string                 `json:"hostname"`
-	Alias            string                 `json:"alias"`
-	Vendor           string                 `json:"vendor"`
-	ResolvedCallback OnHostResolvedCallback `json:"-"`
-	FirstSeen        time.Time              `json:"first_seen"`
-	LastSeen         time.Time              `json:"last_seen"`
-}
-
-func ip2int(ip net.IP) uint32 {
-	if len(ip) == 16 {
-		return binary.BigEndian.Uint32(ip[12:16])
-	}
-	return binary.BigEndian.Uint32(ip)
-}
-
-func NewEndpointNoResolve(ip, mac, name string, bits uint32) *Endpoint {
-	addr := net.ParseIP(ip)
-	mac = NormalizeMac(mac)
-	hw, _ := net.ParseMAC(mac)
-	now := time.Now()
-
-	e := &Endpoint{
-		IP:               addr,
-		IpAddress:        ip,
-		IpAddressUint32:  ip2int(addr),
-		Net:              nil,
-		HW:               hw,
-		SubnetBits:       bits,
-		HwAddress:        mac,
-		Hostname:         name,
-		Vendor:           OuiLookup(mac),
-		ResolvedCallback: nil,
-		FirstSeen:        now,
-		LastSeen:         now,
-	}
-
-	_, netw, _ := net.ParseCIDR(e.CIDR())
-	e.Net = netw
-
-	return e
-}
-
-func NewEndpoint(ip, mac string) *Endpoint {
-	e := NewEndpointNoResolve(ip, mac, "", 0)
-
-	// start resolver goroutine
-	go func() {
-		if names, err := net.LookupAddr(e.IpAddress); err == nil {
-			e.Hostname = names[0]
-			if e.ResolvedCallback != nil {
-				e.ResolvedCallback(e)
-			}
-		}
-	}()
-
-	return e
-}
-
-func (t *Endpoint) Name() string {
-	return t.Hostname
-}
-
-func (t *Endpoint) CIDR() string {
-	shift := 32 - t.SubnetBits
-	address := t.IpAddressUint32
-	ip := make(net.IP, 4)
-
-	binary.BigEndian.PutUint32(ip, (address>>shift)<<shift)
-
-	return fmt.Sprintf("%s/%d", ip.String(), t.SubnetBits)
-}
-
-func (t *Endpoint) String() string {
-	if t.HwAddress == "" {
-		return t.IpAddress
-	} else if t.Vendor == "" {
-		return fmt.Sprintf("%s : %s", t.IpAddress, t.HwAddress)
-	} else if t.Hostname == "" {
-		return fmt.Sprintf("%s : %s ( %s )", t.IpAddress, t.HwAddress, t.Vendor)
-	}
-
-	return fmt.Sprintf("%s : %s ( %s ) - %s", t.IpAddress, t.HwAddress, t.Vendor, core.Bold(t.Hostname))
-}