X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=snmp-mac-port;h=8ddf0436d8cfc5504e1118c6b943db193573b4f8;hb=d8cecd6d9b6a0ff463d20102e2632ca2b219efc9;hp=db0e0bf7ac8e6d79c0cdb576777a20739fde3d24;hpb=552a2e7fe0131060b8239d83317c63e91f272c51;p=dell-switch

diff --git a/snmp-mac-port b/snmp-mac-port
index db0e0bf..8ddf043 100755
--- a/snmp-mac-port
+++ b/snmp-mac-port
@@ -7,9 +7,19 @@ test -d $log || mkdir $log
 
 snmp_walk() {
 	ip=$1
-	#snmpwalk -O0sUX -v2c -Cc -c $COMMUNITY $ip BRIDGE-MIB::dot1dTpFdbPort | sed -e "s/^[^:]*:/$ip/" -e 's/\].*: / /' | tee $log/$ip
+	if ! fping $ip 2>>/dev/shm/dead ; then
+		echo "ERROR: $ip"
+		return
+	fi
+
 	# Q-BRIDGE-MIB dot1qFdbTable
-	snmpbulkwalk -O0sUX -v2c -Cc -c $COMMUNITY $ip 1.3.6.1.2.1.17.7.1.2.2.1.2 | sed -e 's/.*7\.1\.2\.2\.[0-9]\.[0-9]\.//' -e 's/ = [^:]*: / /' -e 's/\./ /g' | awk -v name=$ip '{ printf "%s %d %02x:%02x:%02x:%02x:%02x:%02x %d\n", name, $1, $2,$3,$4,$5,$6,$7, $8 }' | tee $log/$ip
+	#snmpbulkwalk -O0sUX -v2c -Cc -c $COMMUNITY $ip 1.3.6.1.2.1.17.7.1.2.2.1.2 | sed -e 's/.*7\.1\.2\.2\.[0-9]\.[0-9]\.//' -e 's/ = [^:]*: / /' -e 's/\./ /g' | awk -v name=$ip '{ printf "%s %d %02x:%02x:%02x:%02x:%02x:%02x %d\n", name, $1, $2,$3,$4,$5,$6,$7, $8 }' | tee $log/$ip
+	snmpbulkwalk -O0sUX -v2c -Cc -c $COMMUNITY $ip dot1qTpFdbPort | tr '[' ' ' | tr -d ']' | awk -v name=$ip '{ printf "%s %d %s %d\n",name,$2,$4,$7 }' | tee $log/$ip
+	num=`cat $log/$ip | wc -l`
+	if [ $num -le 1 ] ; then
+		# fake vlan using only BRIDGE-MIB::dot1dTpFdbPort
+		snmpwalk -O0sUX -v2c -Cc -c $COMMUNITY $ip BRIDGE-MIB::dot1dTpFdbPort | sed -e "s/^[^:]*:/$ip -/" -e 's/\].*: / /' | tee -a $log/$ip
+	fi
 }
 
 if [ ! -z "$1" ] ; then