github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-20 21:43:18 -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-15 18:54:52 +01:00
commit a9eeaad355
1 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

43
modules/arp_spoof.go
View file

@ -125,6 +125,28 @@ func (p *ArpSpoofer) sendArp(saddr net.IP, smac net.HardwareAddr, check_running
log.Debug("Sending %d bytes of ARP packet to %s:%s.", len(pkt), ip.String(), hw.String()) log.Debug("Sending %d bytes of ARP packet to %s:%s.", len(pkt), ip.String(), hw.String())
p.Session.Queue.Send(pkt) p.Session.Queue.Send(pkt)
} }
// full duplex since we need to route packets
// in user land as netsh is dumb
if runtime.GOOS == "windows" {
// restoring
if bytes.Compare(smac, p.Session.Gateway.HW) == 0 {
if err, pkt := packets.NewARPReply(ip, hw, p.Session.Gateway.IP, p.Session.Gateway.HW); err != nil {
log.Error("Error while creating ARP spoof packet for %s: %s", ip.String(), err)
} else {
log.Debug("Sending %d bytes of ARP packet to %s:%s.", len(pkt), ip.String(), hw.String())
p.Session.Queue.Send(pkt)
}
} else {
if err, pkt := packets.NewARPReply(ip, smac, p.Session.Gateway.IP, p.Session.Gateway.HW); err != nil {
log.Error("Error while creating ARP spoof packet for %s: %s", ip.String(), err)
} else {
log.Debug("Sending %d bytes of ARP packet to %s:%s.", len(pkt), ip.String(), hw.String())
p.Session.Queue.Send(pkt)
}
}
}
} }
} }
@ -142,25 +164,26 @@ func (p *ArpSpoofer) unSpoof() error {
func (p *ArpSpoofer) pktRouter(eth *layers.Ethernet, ip4 *layers.IPv4, pkt gopacket.Packet) { func (p *ArpSpoofer) pktRouter(eth *layers.Ethernet, ip4 *layers.IPv4, pkt gopacket.Packet) {
if eth == nil || ip4 == nil { if eth == nil || ip4 == nil {
return return
} else if ip4.DstIP.Equal(p.Session.Gateway.IP) { }
return
} else if bytes.Compare(eth.DstMAC, p.Session.Interface.HW) != 0 { // we want everything which is directed to our mac but not our ip
if bytes.Compare(eth.DstMAC, p.Session.Interface.HW) == 0 && ip4.DstIP.Equal(p.Session.Interface.IP) == false {
// get the real mac of the destination ip
hw, err := p.getMAC(ip4.DstIP, false)
if err != nil {
log.Error("Error while looking up hardware address for %s: %s", ip4.DstIP.String(), err)
return return
} }
// log.Info("Got packet to %s -> %s (%s)", ip4.SrcIP.String(), ip4.DstIP.String(), eth.DstMAC.String()) log.Info("Rerouting packet: %s -> %s (%s)", ip4.SrcIP.String(), ip4.DstIP.String(), eth.DstMAC.String())
copy(eth.DstMAC, p.Session.Gateway.HW) copy(eth.DstMAC, hw)
// log.Info("FIXED: %s -> %s (%s)", ip4.SrcIP.String(), ip4.DstIP.String(), eth.DstMAC.String())
data := pkt.Data() data := pkt.Data()
if err := p.Session.Queue.Send(data); err != nil { if err := p.Session.Queue.Send(data); err != nil {
log.Error("Could not reinject packet: %s", err) log.Error("Could not reinject packet: %s", err)
} }
/*else { }
log.Info("Reinjected %d bytes.", len(data))
}*/
} }
func (p *ArpSpoofer) Configure() error { func (p *ArpSpoofer) Configure() error {