github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-14 02:36:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: small fix or general refactoring i did not bother commenting

Browse source
This commit is contained in:
evilsocket 2018-02-22 21:59:13 +01:00
commit ee4d1e9b8a
3 changed files with 49 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

37
modules/syn_scan.go
View file

@ -101,41 +101,6 @@ func (s *SynScanner) Stop() error {
return nil
}
func (s *SynScanner) getMAC(ip net.IP, probe bool) (net.HardwareAddr, error) {
var mac string
var hw net.HardwareAddr
var err error
// do we have this ip mac address?
mac, err = network.ArpLookup(s.Session.Interface.Name(), ip.String(), false)
if err != nil && probe == true {
from := s.Session.Interface.IP
from_hw := s.Session.Interface.HW
if err, probe := packets.NewUDPProbe(from, from_hw, ip, 139); err != nil {
log.Error("Error while creating UDP probe packet for %s: %s", ip.String(), err)
} else {
s.Session.Queue.Send(probe)
}
time.Sleep(500 * time.Millisecond)
mac, err = network.ArpLookup(s.Session.Interface.Name(), ip.String(), false)
}
if mac == "" {
return nil, fmt.Errorf("Could not find hardware address for %s.", ip.String())
}
mac = network.NormalizeMac(mac)
hw, err = net.ParseMAC(mac)
if err != nil {
return nil, fmt.Errorf("Error while parsing hardware address '%s' for %s: %s", mac, ip.String(), err)
}
return hw, nil
}
func (s *SynScanner) inRange(ip net.IP) bool {
for _, a := range s.addresses {
if a.Equal(ip) {
@ -207,7 +172,7 @@ func (s *SynScanner) synScan() error {
// start sending SYN packets and wait
for _, address := range s.addresses {
mac, err := s.getMAC(address, true)
mac, err := findMAC(s.Session, address, true)
if err != nil {
log.Debug("Could not get MAC for %s: %s", address.String(), err)
continue