packages: cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp...

[glen]

Author: glen                         Date: Fri Oct 23 14:12:43 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- snmpget only

---- Files affected:
packages/cacti-template-snmp_tcp_connection_status:
   cacti-template-snmp_tcp_connection_status.sh (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh
diff -u packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh:1.5 packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh:1.6
--- packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh:1.5	Fri Oct 23 16:00:45 2009
+++ packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh	Fri Oct 23 16:12:38 2009
@@ -9,59 +9,18 @@
 
 PROGRAM=${0##*/}
 
-# parse command line args
-t=$(getopt -o o: -n "$PROGRAM" -- "$@")
-[ $? != 0 ] && exit $?
-eval set -- "$t"
-
-while :; do
-	case "$1" in
-	-o)
-		snmpget=$2
-		shift
-	;;
-	--)
-		shift
-		break
-	;;
-	*)
-		echo 2>&1 "$PROGRAM: Internal error: [$1] not recognized!"
-		exit 1
-	;;
-	esac
-	shift
-done
-
 hostname=$1
 snmp_community=${2:-public}
 timeout=${3:-10}
 retry=5
+oid=.1.3.6.1.4.1.16606.1.3.1.1.7.116.99.112.115.116.97.116
 
+# handle case when template was imported with <> getting lost
 if [ -z "$hostname" -o "$hostname" = "hostcommunity" ]; then # WTF
-	echo >&2 "Usage: $0 HOSTNAME [SNMP_COMMUNITY] [TIMEOUT]"
+	echo >&2 "Usage: $PROGRAM HOSTNAME [SNMP_COMMUNITY] [TIMEOUT]"
 	exit 1
 fi
 
-if [ "$snmpget" ]; then
-	local out
-	out=$(snmpget -v2c -On -c "$snmp_community" -t "$timeout" "$hostname" "$snmpget") || exit $?
-   	echo ${out#.*STRING: }
-	exit 0
-fi
-
-snmpnetstat -v 2c -r "$retry" -c "$snmp_community" -t "$timeout" -Can -Cp tcp "$hostname" | awk '
-	$1 == "tcp" {
-		ss[$4]++;
-	}
-
-		# socket states from net-snmp-5.4.2.1/apps/snmpnetstat/inet.c
-		split("CLOSED LISTEN SYNSENT SYNRECEIVED ESTABLISHED FINWAIT1 FINWAIT2 CLOSEWAIT LASTACK CLOSING TIMEWAIT", t, " ");
-		# create mapping (duh, why there are different data names used?)
-		# XXX TIMECLOSE missing
-		split("time_close listen syn_sent syn_recv established fin_wait1 fin_wait2 closewait lastack closing time_wait", m, " ");
-		for (i in t) {
-			s = t[i];
-			k = m[i];
-			printf("%s:%d ", k, ss[s]);
-		}
-}'
+out=$(snmpget -v2c -On -c "$snmp_community" -t "$timeout" "$hostname" "$snmpget") || exit $?
+echo ${out#.*STRING: }
+exit 0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-template-snmp_tcp_connection_status/cacti-template-snmp_tcp_connection_status.sh?r1=1.5&r2=1.6&f=u