update: chan with single record

Author: Esonhugh

cmd/all/all.go

@@ -69,9 +69,9 @@ func RunMultiThread(net, pod *net.IPNet, count int) (finalRecord define.Records)
 	scan2 := mutli.ScanNeighborSvc(pod, count)
 	select {
 	case r := <-scan:
-		finalRecord = append(finalRecord, r...)
+		finalRecord = append(finalRecord, r)
 	case r := <-scan2:
-		finalRecord = append(finalRecord, r...)
+		finalRecord = append(finalRecord, r)
 	}
 	return
 }

cmd/neighbor/neighbor.go

@@ -93,7 +93,7 @@ func RunPod(ns []string, net *net.IPNet, num int) (finalRecord define.Records) {
 func RunSvc(net *net.IPNet, num int) (finalRecord define.Records) {
 	scan := mutli.ScanNeighborSvc(net, num)
 	for r := range scan {
-		finalRecord = append(finalRecord, r...)
+		finalRecord = append(finalRecord, r)
 	}
 	if len(finalRecord) == 0 {
 		log.Warn("ScanSubnet Found Nothing")

pkg/mutli/executor.go

@@ -6,7 +6,7 @@ import (
 	"github.com/esonhugh/k8spider/define"
 )
 
-func ScanAll(subnet *net.IPNet, num int) (result <-chan []define.Record) {
+func ScanAll(subnet *net.IPNet, num int) (result <-chan define.Record) {
 	subs := NewSubnetScanner(num)
 	result = ScanServiceWithChan(subs.ScanSubnet(subnet))
 	return result
@@ -20,7 +20,7 @@ func ScanNeighbor(namespace []string, subnet *net.IPNet, num int) <-chan []defin
 	return subs.ScanMultiNeighbor(namespace, subnet)
 }
 
-func ScanNeighborSvc(subnet *net.IPNet, num int) <-chan []define.Record {
+func ScanNeighborSvc(subnet *net.IPNet, num int) <-chan define.Record {
 	subs := NewNeighborScanner(num)
 	return ScanServiceWithChan(subs.ScanSvcNeighbor(subnet))
 }

pkg/mutli/neigbhor.go

@@ -86,12 +86,12 @@ func (s *NeighborScanner) scan(ns string, subnet *net.IPNet, to chan []define.Re
 	}
 }
 
-func (s *NeighborScanner) ScanSvcNeighbor(subnet *net.IPNet) <-chan []define.Record {
+func (s *NeighborScanner) ScanSvcNeighbor(subnet *net.IPNet) <-chan define.Record {
 	if subnet == nil {
 		log.Debugf("subnet is nil")
 		return nil
 	}
-	out := make(chan []define.Record, 100)
+	out := make(chan define.Record, 100)
 	go func() {
 		// if subnets, err := pkg.SubnetShift(subnet, 4); err != nil {
 		if subnets, err := pkg.SubnetInto(subnet, s.count); err != nil {
@@ -117,17 +117,18 @@ func (s *NeighborScanner) ScanSvcNeighbor(subnet *net.IPNet) <-chan []define.Rec
 	return out
 }
 
-func (s *NeighborScanner) scanSvc(subnet *net.IPNet, to chan []define.Record) {
+func (s *NeighborScanner) scanSvc(subnet *net.IPNet, to chan define.Record) {
 	for _, ip := range pkg.ParseIPNetToIPs(subnet) {
 		hostList := pkg.PTRRecord(ip)
 		for _, host := range hostList {
 			if post.IsPodServiceFormat(host) {
 				newRecord := define.Record{
 					Ip:        ip,
-					SvcDomain: post.GetPodServiceRawService(host),
+					SvcDomain: host,
 				}
-				to <- []define.Record{newRecord}
+				to <- newRecord
 			} else {
+				log.Tracef("Pod Service: %v(%v) is not a pod service", host, ip.String())
 				continue
 			}
 		}

pkg/mutli/subnet.go

@@ -1,12 +1,12 @@
 package mutli
 
 import (
+	"net"
+	"sync"
+
 	"github.com/esonhugh/k8spider/define"
 	"github.com/esonhugh/k8spider/pkg"
-	"github.com/esonhugh/k8spider/pkg/scanner"
 	log "github.com/sirupsen/logrus"
-	"net"
-	"sync"
 )
 
 type SubnetScanner struct {
@@ -21,12 +21,12 @@ func NewSubnetScanner(threading int) *SubnetScanner {
 	}
 }
 
-func (s *SubnetScanner) ScanSubnet(subnet *net.IPNet) <-chan []define.Record {
+func (s *SubnetScanner) ScanSubnet(subnet *net.IPNet) <-chan define.Record {
 	if subnet == nil {
 		log.Debugf("subnet is nil")
 		return nil
 	}
-	out := make(chan []define.Record, 100)
+	out := make(chan define.Record, 100)
 	go func() {
 		// if subnets, err := pkg.SubnetShift(subnet, 4); err != nil {
 		if subnets, err := pkg.SubnetInto(subnet, s.count); err != nil {
@@ -52,9 +52,16 @@ func (s *SubnetScanner) ScanSubnet(subnet *net.IPNet) <-chan []define.Record {
 	return out
 }
 
-func (s *SubnetScanner) scan(subnet *net.IPNet, to chan []define.Record) {
-	// to <- scanner.ScanSubnet(subnet)
+func (s *SubnetScanner) scan(subnet *net.IPNet, to chan define.Record) {
 	for _, ip := range pkg.ParseIPNetToIPs(subnet) {
-		to <- scanner.ScanSingleIP(ip)
+		ptr := pkg.PTRRecord(ip)
+		if len(ptr) > 0 {
+			for _, domain := range ptr {
+				log.Infof("PTRrecord %v --> %v", subnet, domain)
+				r := define.Record{Ip: ip, SvcDomain: domain}
+				to <- r
+			}
+		}
 	}
+	return
 }

pkg/mutli/svc.go

@@ -5,11 +5,11 @@ import (
 	"github.com/esonhugh/k8spider/pkg/scanner"
 )
 
-func ScanServiceWithChan(rev <-chan []define.Record) <-chan []define.Record {
-	out := make(chan []define.Record, 100)
+func ScanServiceWithChan(rev <-chan define.Record) <-chan define.Record {
+	out := make(chan define.Record, 100)
 	go func() {
 		for records := range rev {
-			out <- scanner.ScanSvcForPorts(records)
+			out <- scanner.ScanSingleSvcForPorts(records)
 		}
 		close(out)
 	}()