extend AS support

.gitignore

@@ -7,4 +7,4 @@ bin/**/socket-connect-bpf
 bpf_*_bpfeb.go
 bpf_*_bpfel.go
 
-ip2asn-v6.tsv
+*.tsv

as/asnumbersIPv4.go

@@ -14,7 +14,7 @@ import (
 
 var asMap = make(map[uint8][]ASInfo)
 
-// ParseASNumbers parses the autonomous system (AS) Numbers and IP ranges from a .tsv file
+// ParseASNumbersIPv4 parses the autonomous system (AS) Numbers and IPv4 ranges from a .tsv file
 func ParseASNumbersIPv4(asTsvFile string) {
 	csvFile, err := os.Open(asTsvFile)
 

as/asnumbersIPv6.go

@@ -0,0 +1,74 @@
+package as
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"net"
+	"os"
+	"strconv"
+	"strings"
+)
+
+var asList []ASInfoIPv6
+
+// ParseASNumbersIPv6 parses the autonomous system (AS) Numbers and IPv6 ranges from a .tsv file
+func ParseASNumbersIPv6(asTsvFile string) {
+	csvFile, err := os.Open(asTsvFile)
+
+	if err != nil {
+		fmt.Println("Could not read AS Number file")
+		fmt.Println(err)
+		return
+	}
+
+	defer csvFile.Close()
+
+	scanner := bufio.NewScanner(csvFile)
+	for scanner.Scan() {
+		fields := strings.Fields(scanner.Text())
+		if len(fields) != 5 {
+			continue // Skip invalid lines
+		}
+
+		start := net.ParseIP(fields[0])
+		end := net.ParseIP(fields[1])
+		if start == nil || end == nil {
+			continue // Skip invalid IP ranges
+		}
+
+		asNumber, _ := strconv.ParseUint(fields[2], 10, 32)
+
+		asList = append(asList, ASInfoIPv6{
+			StartIP:  start,
+			EndIP:    end,
+			AsNumber: uint32(asNumber),
+			Name:     fields[4],
+		})
+	}
+
+	if err := scanner.Err(); err != nil {
+		fmt.Println("Could not read AS Number file")
+		fmt.Println(err)
+		return
+	}
+}
+
+// GetASInfoIPv6 returns information about an autonomous system (AS) of which the given IP is part of.
+func GetASInfoIPv6(ip net.IP) ASInfoIPv6 {
+	for _, r := range asList {
+		if bytes.Compare(ip, r.StartIP) >= 0 && bytes.Compare(ip, r.EndIP) <= 0 {
+			return r
+		}
+	}
+	var empty ASInfoIPv6
+	return empty
+}
+
+// ASInfoIPv6 contains information about an autonomous system (AS)
+type ASInfoIPv6 struct {
+	StartIP  net.IP
+	EndIP    net.IP
+	AsNumber uint32
+	Name     string
+}

as/asnumbersIPv6_test.go

@@ -0,0 +1,20 @@
+package as
+
+import (
+	"net"
+	"testing"
+)
+
+func TestIP6ToAsRange(t *testing.T) {
+	ParseASNumbersIPv6("./ip2asn-v6.tsv")
+	ip := "2620:2d:4000:1::1"
+	got := GetASInfoIPv6(net.ParseIP(ip))
+	wantName := "CANONICAL-AS"
+	if got.Name != wantName {
+		t.Errorf("GetASInfo(%s) = %s; want %s", ip, got.Name, wantName)
+	}
+	wantAsNumber := uint32(41231)
+	if got.AsNumber != wantAsNumber {
+		t.Errorf("GetASInfo(%s) = %d; want %d", ip, got.AsNumber, wantAsNumber)
+	}
+}

main.go

@@ -54,6 +54,7 @@ func setupOutput() {
 	flag.Parse()
 	if *printAll {
 		as.ParseASNumbersIPv4("./as/ip2asn-v4-u32.tsv")
+		as.ParseASNumbersIPv6("./as/ip2asn-v6.tsv")
 	}
 	out = newOutput(*printAll)
 }
@@ -171,7 +172,8 @@ func readIP4Events(rd *perf.Reader) bool {
 	eventPayload := newGenericEventPayload(&event.Event)
 	eventPayload.DestIP = conv.ToIP4(event.Daddr)
 	eventPayload.DestPort = event.Dport
-	eventPayload.ASInfo = as.GetASInfoIPv4(eventPayload.DestIP)
+	asInfo := as.GetASInfoIPv4(eventPayload.DestIP)
+	eventPayload.ASNameInfo = ASNameInfo{Name: asInfo.Name, AsNumber: asInfo.AsNumber}
 	out.PrintLine(eventPayload)
 	return true
 }
@@ -200,6 +202,8 @@ func readIP6Events(rd *perf.Reader) bool {
 	eventPayload := newGenericEventPayload(&event.Event)
 	eventPayload.DestIP = conv.ToIP6(event.Daddr1, event.Daddr2)
 	eventPayload.DestPort = event.Dport
+	asInfo := as.GetASInfoIPv6(eventPayload.DestIP)
+	eventPayload.ASNameInfo = ASNameInfo{Name: asInfo.Name, AsNumber: asInfo.AsNumber}
 	out.PrintLine(eventPayload)
 	return true
 }
@@ -294,5 +298,11 @@ type eventPayload struct {
 	Host          string
 	DestIP        net.IP
 	DestPort      uint16
-	ASInfo        as.ASInfo
+	ASNameInfo    ASNameInfo
+}
+
+// ASNameInfo contains the name and number of an autonomous system (AS)
+type ASNameInfo struct {
+	AsNumber uint32
+	Name     string
 }

output.go

@@ -3,8 +3,6 @@ package main
 import (
 	"fmt"
 	"strconv"
-
-	"github.com/p-/socket-connect-bpf/as"
 )
 
 type output interface {
@@ -43,8 +41,8 @@ func (t tableOutput) PrintLine(e eventPayload) {
 
 	if t.printAll {
 		var asText = ""
-		if (as.ASInfo{}) != e.ASInfo {
-			asText = "AS" + strconv.Itoa(int(e.ASInfo.AsNumber)) + " (" + e.ASInfo.Name + ")"
+		if (ASNameInfo{}) != e.ASNameInfo {
+			asText = "AS" + strconv.Itoa(int(e.ASNameInfo.AsNumber)) + " (" + e.ASNameInfo.Name + ")"
 		}
 		header = "%-9s %-9s %-6d %-42s %-16s %-20s %s\n"
 		args = []interface{}{time, e.AddressFamily, e.Pid, e.ProcessPath + " " + e.ProcessArgs, e.User, dest, asText}

updateASData.sh

@@ -5,7 +5,7 @@ cd as/
 download_and_unzip () {
    filename=$1
     wget https://iptoasn.com/data/$filename.gz
-    rm $filename
+    rm -f $filename
     gunzip $filename.gz
 }