reorganize

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
Jess Frazelle
2018-07-06 13:37:39 -04:00
parent c4901b1521
commit b99aa9d325

View File

@@ -56,12 +56,15 @@ func main() {
var wg sync.WaitGroup var wg sync.WaitGroup
for ip := ip.Mask(ipnet.Mask); ipnet.Contains(ip); inc(ip) { for ip := ip.Mask(ipnet.Mask); ipnet.Contains(ip); inc(ip) {
for port := beginPort; port <= endPort; port++ {
wg.Add(1) wg.Add(1)
go func(ip string) { go func(ip string, port int) {
defer wg.Done() defer wg.Done()
scanIP(ip) scanIP(ip, port)
}(ip.String())
}(ip.String(), port)
}
} }
wg.Wait() wg.Wait()
@@ -70,8 +73,7 @@ func main() {
logrus.Infof("Scan took: %s", since.String()) logrus.Infof("Scan took: %s", since.String())
} }
func scanIP(ip string) { func scanIP(ip string, port int) {
for port := beginPort; port <= endPort; port++ {
// Check if the port is open. // Check if the port is open.
ok := portOpen(ip, port) ok := portOpen(ip, port)
if !ok { if !ok {
@@ -94,7 +96,6 @@ func scanIP(ip string) {
fmt.Printf("%s:%d\t%s\t%s\t%s\n", fmt.Printf("%s:%d\t%s\t%s\t%s\n",
ip, port, ip, port,
info.Net.Organization.Handle, info.Net.Organization.Name, info.Net.Organization.Reference) info.Net.Organization.Handle, info.Net.Organization.Name, info.Net.Organization.Reference)
}
} }
func portOpen(ip string, port int) bool { func portOpen(ip string, port int) bool {