added origin ip info

1 files changed, 10 insertions, 7 deletions

diff --git a/whois.go b/whois.go
index d8190ca..4a6fd57 100644
--- a/whois.go
+++ b/whois.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"io/ioutil"
 	"net"
 	"strings"
@@ -16,10 +15,12 @@ const (
 )
 
 type asnipPair struct {
-	asNum string
-	ipAdr string
+	asNum   string
+	ipAdr   string
+	ipBlock string
 }
 
+/*
 func main() {
 	pairs, err := findASAndIPBlock("109.105.104.100", "123.123.123.123")
 	if err != nil {
@@ -32,6 +33,7 @@ func main() {
 	}
 	fmt.Println(pairs)
 }
+*/
 
 func findASAndIPBlock(domains ...string) (pairs []asnipPair, err error) {
 	if len(domains) == 0 {
@@ -53,13 +55,14 @@ func findASAndIPBlock(domains ...string) (pairs []asnipPair, err error) {
 
 	lines := strings.Split(res, "\n")
 	pairs = make([]asnipPair, 0, len(lines)-2)
-	for _, line := range lines[1 : len(lines)-1] {
+	for ix, line := range lines[1 : len(lines)-1] {
 		content := strings.Split(line, "|")
 		as := strings.TrimSpace(content[0])
-		ip := strings.TrimSpace(content[2])
+		ipb := strings.TrimSpace(content[2])
 		pairs = append(pairs, asnipPair{
-			asNum: as,
-			ipAdr: ip,
+			asNum:   as,
+			ipBlock: ipb,
+			ipAdr:   domains[ix],
 		})
 	}
 	return