diff options
author | Poul-Henning Kamp <phk@FreeBSD.org> | 1997-03-04 22:34:40 +0000 |
---|---|---|
committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1997-03-04 22:34:40 +0000 |
commit | 3d4709fbb27b3225352cfe0b81c96b645f9b0450 (patch) | |
tree | 1496d49866005b3ee0dd4ba5714d3aa984b49787 /net/scotty | |
parent | Update from 1.1.7+patches to 1.1.8. This fixes a number of unresolved (diff) |
Boldly venture into the realm of ports, abduct an old friend of mine
and patch it up a bit. Yes indeed, phk is back in the tcl+snmp arena.
Update to 2.1.5, add the ability to probe several communities with
the IP-discover function.
Notes
Notes:
svn path=/head/; revision=5843
Diffstat (limited to 'net/scotty')
-rw-r--r-- | net/scotty/Makefile | 6 | ||||
-rw-r--r-- | net/scotty/distinfo | 2 | ||||
-rw-r--r-- | net/scotty/files/patch-aa | 4 | ||||
-rw-r--r-- | net/scotty/files/patch-ab | 89 |
4 files changed, 73 insertions, 28 deletions
diff --git a/net/scotty/Makefile b/net/scotty/Makefile index b0cd00a812e3..29d91ef9bdf9 100644 --- a/net/scotty/Makefile +++ b/net/scotty/Makefile @@ -3,14 +3,14 @@ # Date created: 18 Februar 1995 # Whom: Gennady Sorokopud <gena@netvision.net.il> # -# $Id: Makefile,v 1.14 1996/12/01 01:23:15 obrien Exp $ +# $Id: Makefile,v 1.15 1996/12/03 03:27:44 asami Exp $ # -DISTNAME= scotty-2.1.3 +DISTNAME= scotty-2.1.5 CATEGORIES= net MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/ -MAINTAINER= gena@netvision.net.il +MAINTAINER= phk@freebsd.org LIB_DEPENDS= tk41\\.1\\.:${PORTSDIR}/x11/tk41 diff --git a/net/scotty/distinfo b/net/scotty/distinfo index 7a3576056bef..0c21ca80086d 100644 --- a/net/scotty/distinfo +++ b/net/scotty/distinfo @@ -1 +1 @@ -MD5 (scotty-2.1.3.tar.gz) = 5fa8a75d17c9d64857c9087be1607a14 +MD5 (scotty-2.1.5.tar.gz) = 0915a64afda98b948a719cfb6d06799b diff --git a/net/scotty/files/patch-aa b/net/scotty/files/patch-aa index 34f23419c975..40c2fa30d2cc 100644 --- a/net/scotty/files/patch-aa +++ b/net/scotty/files/patch-aa @@ -28,5 +28,5 @@ +++ tkined.sh.in Fri Sep 13 09:26:21 1996 @@ -0,0 +1,3 @@ +#!/bin/sh -+export TCLLIBPATH="@PREFIX@/lib/tkined1.4.3 @PREFIX@/lib/tnm2.1.3" -+exec @PREFIX@/bin/tkined1.4.3 ++export TCLLIBPATH="@PREFIX@/lib/tkined1.4.5 @PREFIX@/lib/tnm2.1.5" ++exec @PREFIX@/bin/tkined1.4.5 diff --git a/net/scotty/files/patch-ab b/net/scotty/files/patch-ab index e82ab476e3aa..06393a6dc6db 100644 --- a/net/scotty/files/patch-ab +++ b/net/scotty/files/patch-ab @@ -1,24 +1,69 @@ ---- ../tnm/generic/tnmNetdb.c Wed Aug 7 07:13:18 1996 -+++ ../tnm/generic/tnmNetdb.c Mon Mar 3 11:46:16 1997 -@@ -218,6 +218,9 @@ - if (TnmSetIPAddress(interp, name, &addr) != TCL_OK) { - return TCL_ERROR; - } -+ -+ addr.sin_addr.s_addr = ntohl(addr.sin_addr.s_addr); -+ - sprintf(interp->result, "%lu.%lu.%lu.%lu", - (addr.sin_addr.s_addr >> 24) & 0xff, - (addr.sin_addr.s_addr >> 16) & 0xff, -diff -u -r work.ref/scotty-2.1.3/tnm/generic/tnmUtil.c work/scotty-2.1.3/tnm/generic/tnmUtil.c ---- ../tnm/generic/tnmUtil.c Tue Aug 6 17:20:38 1996 -+++ ../tnm/generic/tnmUtil.c Mon Mar 3 11:41:33 1997 -@@ -478,6 +478,8 @@ - return name; +--- ../tkined/apps/ip_discover.tcl Thu Sep 12 22:01:03 1996 ++++ /usr/local/lib/tkined1.4.5/apps/ip_discover.tcl Tue Mar 4 23:05:50 1997 +@@ -30,6 +30,7 @@ + set columns 16 + set report true + set debug false ++set communities {public private} + + + ## +@@ -343,20 +344,22 @@ + } + + proc discover_snmp {} { +- global nodes address snmp ++ global nodes address snmp communities + global icmp_retries icmp_timeout + set start [clock seconds] + mib load rfc1213.mib +- foreach id [array names nodes] { +- set ip $address($id) +- if {[catch {snmp session -address $ip \ +- -retries $icmp_retries -timeout $icmp_timeout} s]} continue +- if {[catch { +- $s get sysObjectID.0 [list discover_snmp_callback $id "%S" "%E"] +- } msg]} { +- writeln "Oops: $ip get sysObjectID.0: $msg" ++ foreach com $communities { ++ foreach id [array names nodes] { ++ set ip $address($id) ++ if {[catch {snmp session -address $ip -community $com \ ++ -retries $icmp_retries -timeout $icmp_timeout} s]} continue ++ if {[catch { ++ $s get sysObjectID.0 [list discover_snmp_callback $id "%S" "%E"] ++ } msg]} { ++ writeln "Oops: $ip get sysObjectID.0: $msg" ++ } ++ update + } +- update } + snmp wait + set count [llength [array names snmp]] +@@ -1276,6 +1279,7 @@ + global email_trace + global report + global debug ++ global communities + + set result [ined request "IP-Discover Parameter" \ + [list [list "# of ICMP retries:" $icmp_retries scale 1 10] \ +@@ -1287,7 +1291,8 @@ + [list "Nodes per row:" $columns scale 10 40] \ + [list "Email Discover Routes:" $email_trace radio true false] \ + [list "Write Report:" $report radio true false] \ +- [list "Debug Mode:" $debug radio true false] ] \ ++ [list "Debug Mode:" $debug radio true false] \ ++ [list "SNMP Communities:" $communities entry 10] ] \ + [list "set values" cancel] ] + + if {[lindex $result 0] == "cancel"} return +@@ -1302,6 +1307,7 @@ + set email_trace [lindex $result 8] + set report [lindex $result 9] + set debug [lindex $result 10] ++ set communities [lindex $result 11] -+ addr->sin_addr.s_addr = ntohl(addr->sin_addr.s_addr); -+ - if (interp) { - char buffer[20]; - sprintf(buffer, "%lu.%lu.%lu.%lu", + icmp -retries $icmp_retries + icmp -timeout $icmp_timeout |