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

refact: migrated aliases to islazy/data.UnsortedKV

Browse source
This commit is contained in:
evilsocket 2018-10-13 18:39:31 +02:00
commit 7f808ac059
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
9 changed files with 171 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

5
network/net.go
View file

@ -7,6 +7,7 @@ import (
"regexp"
"strings"
"github.com/evilsocket/islazy/data"
"github.com/evilsocket/islazy/str"
"github.com/malfunkt/iprange"
@ -67,7 +68,7 @@ func NormalizeMac(mac string) string {
return strings.ToLower(strings.Join(parts, ":"))
}
func ParseTargets(targets string, aliasMap *Aliases) (ips []net.IP, macs []net.HardwareAddr, err error) {
func ParseTargets(targets string, aliasMap *data.UnsortedKV) (ips []net.IP, macs []net.HardwareAddr, err error) {
ips = make([]net.IP, 0)
macs = make([]net.HardwareAddr, 0)
@ -90,7 +91,7 @@ func ParseTargets(targets string, aliasMap *Aliases) (ips []net.IP, macs []net.H
// check and resolve aliases
for _, alias := range aliasParser.FindAllString(targets, -1) {
if mac, found := aliasMap.Find(alias); found {
if mac, found := aliasMap.Get(alias); found {
mac = NormalizeMac(mac)
hw, err := net.ParseMAC(mac)
if err != nil {