Clean up network/* packages, revamp online status detection

network/netutils/cleandns.go

@@ -5,8 +5,7 @@ import (
 )
 
 var (
-	// cleanDomainRegex = regexp.MustCompile("^(((?!-))(xn--)?[a-z0-9-_]{0,61}[a-z0-9]{1,1}\\.)*(xn--)?([a-z0-9-]{1,61}|[a-z0-9-]{1,30}\\.[a-z]{2,}\\.)$")
-	cleanDomainRegex = regexp.MustCompile("^((xn--)?[a-z0-9-_]{0,61}[a-z0-9]{1,1}\\.)*(xn--)?([a-z0-9-]{1,61}|[a-z0-9-]{1,30}\\.[a-z]{2,}\\.)$")
+	cleanDomainRegex = regexp.MustCompile(`^((xn--)?[a-z0-9-_]{0,61}[a-z0-9]{1,1}\.)*(xn--)?([a-z0-9-]{1,61}|[a-z0-9-]{1,30}\.[a-z]{2,}\.)$`)
 )
 
 // IsValidFqdn returns whether the given string is a valid fqdn.

network/netutils/ip.go

@@ -10,7 +10,7 @@ const (
 	Global
 	LocalMulticast
 	GlobalMulticast
-	Invalid
+	Invalid int8 = -1
 )
 
 // ClassifyIP returns the classification for the given IP address.
@@ -77,9 +77,7 @@ func IPIsLocalhost(ip net.IP) bool {
 // IPIsLAN returns true if the given IP is a site-local or link-local address.
 func IPIsLAN(ip net.IP) bool {
 	switch ClassifyIP(ip) {
-	case SiteLocal:
-		return true
-	case LinkLocal:
+	case SiteLocal, LinkLocal:
 		return true
 	default:
 		return false

network/netutils/tcpassembly.go

@@ -7,32 +7,34 @@ import (
 	"github.com/google/gopacket/tcpassembly"
 )
 
+// SimpleStreamAssemblerManager is a simple manager for github.com/google/gopacket/tcpassembly
 type SimpleStreamAssemblerManager struct {
 	InitLock      sync.Mutex
 	lastAssembler *SimpleStreamAssembler
 }
 
+// New returns a new stream assembler.
 func (m *SimpleStreamAssemblerManager) New(net, transport gopacket.Flow) tcpassembly.Stream {
 	assembler := new(SimpleStreamAssembler)
 	m.lastAssembler = assembler
 	return assembler
 }
 
+// GetLastAssembler returns the newest created stream assembler.
 func (m *SimpleStreamAssemblerManager) GetLastAssembler() *SimpleStreamAssembler {
-	// defer func() {
-	// 	m.lastAssembler = nil
-	// }()
 	return m.lastAssembler
 }
 
+// SimpleStreamAssembler is a simple assembler for github.com/google/gopacket/tcpassembly
 type SimpleStreamAssembler struct {
 	Cumulated    []byte
 	CumulatedLen int
 	Complete     bool
 }
 
+// NewSimpleStreamAssembler returns a new SimpleStreamAssembler.
 func NewSimpleStreamAssembler() *SimpleStreamAssembler {
-	return new(SimpleStreamAssembler)
+	return &SimpleStreamAssembler{}
 }
 
 // Reassembled implements tcpassembly.Stream's Reassembled function.