X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=find-port-for-hostname;h=81bf56a02fe479e0be3408274617ddb12d9c6c51;hb=b849077938f368e54c3ad4b7b896ea2040c6c72f;hp=92d68e3e8df07d4675104ab2265e39f49339ee87;hpb=74ff2b5b86fcabc33749bbe83a58efcf0c127832;p=dell-switch

diff --git a/find-port-for-hostname b/find-port-for-hostname
index 92d68e3..81bf56a 100755
--- a/find-port-for-hostname
+++ b/find-port-for-hostname
@@ -6,10 +6,24 @@ test -z "$host" && echo "Usage: $0 hostname" && exit 1
 
 sudo id >/dev/null
 
+# hide physical and trunk ports (> 10 mac, port nr <= 49)
+cat /dev/shm/snmp-mac-port/* | cut -d' ' -f1,4 | sort | uniq -c | awk '{ if ( $1 > 10 && $3 <= 49 ) print "/"$2":"$2 " .* " $3 }' > /dev/shm/trunk.regex
+
 ping -c 1 $host | grep from > /dev/shm/port.$host.ping
-ip=`cat /dev/shm/port.$host.ping | cut -d' ' -f5 | tr -d '()':`
-host=`cat /dev/shm/port.$host.ping | cut -d' ' -f4`
+# did we got resolved IP address?
+if grep '(' /dev/shm/port.$host.ping >/dev/null ; then
+	ip=`cat /dev/shm/port.$host.ping | cut -d' ' -f5 | tr -d '():'`
+	host=`cat /dev/shm/port.$host.ping | cut -d' ' -f4`
+else
+	ip=`cat /dev/shm/port.$host.ping | cut -d' ' -f4 | tr -d ':'`
+fi
 mac=`sudo arp -a -n | grep "($ip)" | cut -d' ' -f4 | sort -u`
-grep -r -i $mac /dev/shm/snmp-mac-port/ | tee /dev/shm/port.$host.switch | cut -d: -f2- | egrep -v '(23|24|48|49)$' # remove trunk ports
+if [ -z "$mac" ] ; then
+	bro=`./bro-conn-ip-vlan-mac.sh $ip`
+	echo "# bro $bro"
+	mac=`echo $bro | cut -d' ' -f3`
+	test -z "$mac" && exit 1
+fi
+grep -r -i $mac /dev/shm/snmp-mac-port/ | tee /dev/shm/port.$host.switch | grep --file /dev/shm/trunk.regex -v | cut -d: -f2-
 
 echo "# $host $ip $mac on "`cat /dev/shm/port.$host.switch | cut -d: -f2- | cut -d' ' -f1 | sort -u | wc -l`" switches"