github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-16 10:03:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: better ipv6 detection logic

Browse source
This commit is contained in:
Simone Margaritelli 2024-09-22 15:03:06 +02:00
parent 8446d66d12
commit a234c20650
5 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
network/lan.go
View file

@ -6,6 +6,7 @@ import (
"strings"
"sync"
"github.com/bettercap/bettercap/v2/log"
"github.com/evilsocket/islazy/data"
)
@ -136,11 +137,11 @@ func (lan *LAN) Remove(ip, mac string) {
func (lan *LAN) shouldIgnore(ip, mac string) bool {
// skip our own address
if ip == lan.iface.IpAddress || mac == lan.iface.HwAddress {
if ip == lan.iface.IpAddress || ip == lan.iface.Ip6Address || mac == lan.iface.HwAddress {
return true
}
// skip the gateway
if ip == lan.gateway.IpAddress || mac == lan.gateway.HwAddress {
if ip == lan.gateway.IpAddress || ip == lan.gateway.Ip6Address || mac == lan.gateway.HwAddress {
return true
}
// skip broadcast addresses
@ -190,6 +191,15 @@ func (lan *LAN) AddIfNew(ip, mac string) *Endpoint {
if lan.ttl[mac] < LANDefaultttl {
lan.ttl[mac]++
}
if strings.ContainsRune(ip, ':') && t.Ip6Address == "" {
log.Info("ipv6 %s detected for %s (%s)", ip, t.IpAddress, mac)
t.SetIPv6(ip)
} else if strings.ContainsRune(ip, '.') && t.IpAddress == "" {
log.Info("ipv4 %s detected for %s (%s)", ip, t.Ip6Address, mac)
t.SetIP(ip)
}
return t
}