new: net.show now accepts a comma separated list of ip, macs or aliases to filter for

network/lan.go

@@ -81,6 +81,19 @@ func (lan *LAN) Get(mac string) (*Endpoint, bool) {
 	return nil, false
 }
 
+func (lan *LAN) GetByIp(ip string) *Endpoint {
+	lan.Lock()
+	defer lan.Unlock()
+
+	for _, e := range lan.hosts {
+		if e.IpAddress == ip {
+			return e
+		}
+	}
+
+	return nil
+}
+
 func (lan *LAN) List() (list []*Endpoint) {
 	lan.Lock()
 	defer lan.Unlock()
@@ -169,19 +182,6 @@ func (lan *LAN) EachHost(cb func(mac string, e *Endpoint)) {
 	}
 }
 
-func (lan *LAN) GetByIp(ip string) *Endpoint {
-	lan.Lock()
-	defer lan.Unlock()
-
-	for _, e := range lan.hosts {
-		if e.IpAddress == ip {
-			return e
-		}
-	}
-
-	return nil
-}
-
 func (lan *LAN) AddIfNew(ip, mac string) *Endpoint {
 	lan.Lock()
 	defer lan.Unlock()

network/net.go

@@ -118,6 +118,32 @@ func ParseTargets(targets string, aliasMap *Aliases) (ips []net.IP, macs []net.H
 	return
 }
 
+func ParseEndpoints(targets string, lan *LAN) ([]*Endpoint, error) {
+	ips, macs, err := ParseTargets(targets, lan.Aliases())
+	if err != nil {
+		return nil, err
+	}
+
+	tmp := make(map[string]*Endpoint)
+	for _, ip := range ips {
+		if e := lan.GetByIp(ip.String()); e != nil {
+			tmp[e.HW.String()] = e
+		}
+	}
+
+	for _, mac := range macs {
+		if e, found := lan.Get(mac.String()); found {
+			tmp[e.HW.String()] = e
+		}
+	}
+
+	ret := make([]*Endpoint, 0)
+	for _, e := range tmp {
+		ret = append(ret, e)
+	}
+	return ret, nil
+}
+
 func buildEndpointFromInterface(iface net.Interface) (*Endpoint, error) {
 	addrs, err := iface.Addrs()
 	if err != nil {