mirror of
https://github.com/bettercap/bettercap
synced 2025-08-19 13:09:49 -07:00
fix: fixed net.probe mdns parsing from ipv6
This commit is contained in:
parent
fad6172b40
commit
c2be8a440b
1 changed files with 28 additions and 13 deletions
|
@ -41,22 +41,37 @@ func (mod *Prober) mdnsListener(c chan *mdns.ServiceEntry) {
|
||||||
defer mod.Debug("mdns listener stopped")
|
defer mod.Debug("mdns listener stopped")
|
||||||
|
|
||||||
for entry := range c {
|
for entry := range c {
|
||||||
if host := mod.Session.Lan.GetByIp(entry.AddrV4.String()); host != nil {
|
addrs := []string{}
|
||||||
meta := make(map[string]string)
|
if entry.AddrV4 != nil {
|
||||||
|
addrs = append(addrs, entry.AddrV4.String())
|
||||||
|
}
|
||||||
|
if entry.AddrV6 != nil {
|
||||||
|
addrs = append(addrs, entry.AddrV6.String())
|
||||||
|
}
|
||||||
|
|
||||||
meta["mdns:name"] = entry.Name
|
for _, addr := range addrs {
|
||||||
meta["mdns:hostname"] = entry.Host
|
if host := mod.Session.Lan.GetByIp(addr); host != nil {
|
||||||
meta["mdns:ipv4"] = entry.AddrV4.String()
|
meta := make(map[string]string)
|
||||||
|
|
||||||
if entry.AddrV6 != nil {
|
meta["mdns:name"] = entry.Name
|
||||||
meta["mdns:ipv6"] = entry.AddrV6.String()
|
meta["mdns:hostname"] = entry.Host
|
||||||
|
|
||||||
|
if entry.AddrV4 != nil {
|
||||||
|
meta["mdns:ipv4"] = entry.AddrV4.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
if entry.AddrV6 != nil {
|
||||||
|
meta["mdns:ipv6"] = entry.AddrV6.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
meta["mdns:port"] = fmt.Sprintf("%d", entry.Port)
|
||||||
|
|
||||||
|
mod.Debug("meta for %s: %v", addr, meta)
|
||||||
|
|
||||||
|
host.OnMeta(meta)
|
||||||
|
} else {
|
||||||
|
mod.Debug("got mdns entry for unknown ip %s", entry.AddrV4)
|
||||||
}
|
}
|
||||||
|
|
||||||
meta["mdns:port"] = fmt.Sprintf("%d", entry.Port)
|
|
||||||
|
|
||||||
host.OnMeta(meta)
|
|
||||||
} else {
|
|
||||||
mod.Debug("got mdns entry for known ip %s", entry.AddrV4)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue