October 2007 - cl-net-snmp-cvs@common-lisp.net

[cl-net-snmp-cvs] r86 - vendor/cl-http/server
by ctian＠common-lisp.net 20 Oct '07

20 Oct '07

Author: ctian Date: Sat Oct 20 03:01:42 2007 New Revision: 86 Modified: vendor/cl-http/server/scripts.lisp Log: match LispWorks 5's API Modified: vendor/cl-http/server/scripts.lisp ============================================================================== --- vendor/cl-http/server/scripts.lisp (original) +++ vendor/cl-http/server/scripts.lisp Sat Oct 20 03:01:42 2007 @@ -342,7 +342,7 @@ :script :script script args))) -(defmethod documentation ((script script) #-(or CMU LispWorks4) &optional doc-type) +(defmethod documentation ((script script) #-(or CMU LispWorks4 LispWorks5) &optional doc-type) (declare (ignore doc-type)) (http:get-value script :documentation))

1 0

[cl-net-snmp-cvs] r85 - vendor/cl-http/lw/server
by ctian＠common-lisp.net 20 Oct '07

20 Oct '07

Author: ctian Date: Sat Oct 20 02:58:24 2007 New Revision: 85 Modified: vendor/cl-http/lw/server/sysdcl.lisp Log: Load necessary file for LispWorks 5 Modified: vendor/cl-http/lw/server/sysdcl.lisp ============================================================================== --- vendor/cl-http/lw/server/sysdcl.lisp (original) +++ vendor/cl-http/lw/server/sysdcl.lisp Sat Oct 20 02:58:24 2007 @@ -36,17 +36,17 @@ "PACKAGE" ; HTTP Packages #+LispWorks "HTTP:lw;server;package" ; LispWorks specific package changes - #+LispWorks4 + #+(or LispWorks4 LispWorks5) "http:smtp;package" "PRELIMINARY" ; Showable procedures "VARIABLES" ; Variables and constants #+Genera lispm ; Load Lisp Machine specific code #+LispWorks3.2 "HTTP:lw;server;tcp-stream" ; LispWorks 3.2.2 specific - #+LispWorks4 + #+(or LispWorks4 LispWorks5) "HTTP:lw;server;tcp-stream-4" ; LispWorks 4 specific #-Genera "HTTP:mcl;server;www-utils" ; Some portable utils are there - #+(or LispWorks4.0 LispWorks4.1 LispWorks4.2 LispWorks4.3) + #+(or LispWorks4.0 LispWorks4.1 LispWorks4.2 LispWorks4.3 LispWorks5) "HTTP:lw;server;time-and-author" ; LispWorks 4 specific file properties #+(or UNIX Harlequin-PC-Lisp) "HTTP:lw;server;unix" ; add-ons for UNIX-like ports

1 0

[cl-net-snmp-cvs] r84 - vendor/cl-http/lw
by ctian＠common-lisp.net 20 Oct '07

20 Oct '07

Author: ctian Date: Sat Oct 20 02:57:16 2007 New Revision: 84 Modified: vendor/cl-http/lw/pre-cl-http.lisp Log: (require "comm") for LispWorks 5 Modified: vendor/cl-http/lw/pre-cl-http.lisp ============================================================================== --- vendor/cl-http/lw/pre-cl-http.lisp (original) +++ vendor/cl-http/lw/pre-cl-http.lisp Sat Oct 20 02:57:16 2007 @@ -31,7 +31,7 @@ #+LispWorks3.2 (do-demand-pre-loads :comms) -#+LispWorks4 +#+(or LispWorks4 LispWorks5) (require "comm") #+(and compile-reverse LispWorks3.2)

1 0

[cl-net-snmp-cvs] r82 - trunk/mib
by ctian＠common-lisp.net 18 Oct '07

18 Oct '07

Author: ctian Date: Thu Oct 18 07:52:35 2007 New Revision: 82 Modified: trunk/mib/print-oid.lisp Log: Fix OID print-object Modified: trunk/mib/print-oid.lisp ============================================================================== --- trunk/mib/print-oid.lisp (original) +++ trunk/mib/print-oid.lisp Thu Oct 18 07:52:35 2007 @@ -13,7 +13,8 @@ (reverse rev-names) (resolve (reverse rev-ids))))) (when *oid-print-short* - (setf part-2 (nthcdr (- (oid-length obj) *oid-print-length*) part-2))) + (setf part-2 (nthcdr (let ((d (- (oid-length obj) *oid-print-length*))) + (if (plusp d) d 0)) part-2))) (format stream "~A~{.~A~}" (car part-2) (cdr part-2))))

1 0

[cl-net-snmp-cvs] r81 - trunk
by ctian＠common-lisp.net 18 Oct '07

18 Oct '07

Author: ctian Date: Thu Oct 18 07:46:15 2007 New Revision: 81 Modified: trunk/net-snmp.asd Log: Add CFFI to depends Modified: trunk/net-snmp.asd ============================================================================== --- trunk/net-snmp.asd (original) +++ trunk/net-snmp.asd Thu Oct 18 07:46:15 2007 @@ -17,6 +17,7 @@ :ironclad ; for v3 support :net-telent-date ; for time convert #-win32 :iolib ; for networking + #+win32 :cffi ; for portable FFI :zebu) ; for mib parse :components (;; ASN.1 (:module asn.1

1 0

[cl-net-snmp-cvs] r80 - in trunk: . smi
by ctian＠common-lisp.net 18 Oct '07

18 Oct '07

Author: ctian Date: Thu Oct 18 07:11:29 2007 New Revision: 80 Modified: trunk/net-snmp.asd trunk/smi/ipaddress.lisp Log: Add ipaddress support and fix for win32 load Modified: trunk/net-snmp.asd ============================================================================== --- trunk/net-snmp.asd (original) +++ trunk/net-snmp.asd Thu Oct 18 07:11:29 2007 @@ -30,7 +30,7 @@ (:file "integer" :depends-on ("package")) (:file "string" :depends-on ("package")) (:file "sequence" :depends-on ("package")) - (:file "ipaddress" :depends-on ("package")) + #-win32 (:file "ipaddress" :depends-on ("package")) (:file "oid" :depends-on ("package")) (:file "timeticks" :depends-on ("package")) (:file "pdu" :depends-on ("package")) @@ -50,6 +50,7 @@ (:file "browser" :depends-on ("tree"))) :depends-on (smi)) ;; SNMP + #-win32 (:module snmp :components ((:file "package") (:file "constants" :depends-on ("package")) Modified: trunk/smi/ipaddress.lisp ============================================================================== --- trunk/smi/ipaddress.lisp (original) +++ trunk/smi/ipaddress.lisp Thu Oct 18 07:11:29 2007 @@ -1,3 +1,26 @@ (in-package :smi) -;;; We use net.sockets:sockaddr class as ipaddr type. +;; IP Address Type, use IOLIB's ipv4addr class + +(defmethod plain-value ((address ipv4addr)) + (vector-to-dotted (name address))) + +(defmethod ber-encode ((value ipv4addr)) + (declare (ignore value)) + (nconc (ber-encode-type 1 0 0) + (ber-encode-length 4) + (coerce (name value) 'list))) + +(defmethod ber-decode-value ((stream stream) (type (eql :ipaddress)) length) + (declare (type stream stream) + (type fixnum length) + (ignore type)) + (assert (= 4 length)) + (let ((part-1 (read-byte stream)) + (part-2 (read-byte stream)) + (part-3 (read-byte stream)) + (part-4 (read-byte stream))) + (make-instance 'ipv4addr :name (vector part-1 part-2 part-3 part-4)))) + +(eval-when (:load-toplevel :execute) + (install-asn.1-type :ipaddress 1 0 0))

1 0

[cl-net-snmp-cvs] r79 - dists www
by ctian＠common-lisp.net 17 Oct '07

17 Oct '07

Author: ctian Date: Wed Oct 17 12:27:39 2007 New Revision: 79 Added: dists/ dists/cl-net-snmp_1.2.tar.gz (contents, props changed) Modified: www/index.shtml Log: Add dists file for 1.2 Added: dists/cl-net-snmp_1.2.tar.gz ============================================================================== Binary file. No diff available. Modified: www/index.shtml ============================================================================== --- www/index.shtml (original) +++ www/index.shtml Wed Oct 17 12:27:39 2007 @@ -1,15 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> - <head> - <title>cl-net-snmp</title> - <link rel="stylesheet" type="text/css" - href="http://www.style.org/css/style.org-red.css"/> - <meta http-equiv="Content-Type" - content="text/html; charset=ISO-8859-1"/> - <basefont face="Georgia" size="2"/> - </head> - <body> - <div class="header"><br/></div> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><title>cl-net-snmp</title> + + + + <link rel="stylesheet" type="text/css" href="http://www.style.org/css/style.org-red.css"> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body><basefont face="Georgia" size="2"> + + <div class="header"><br></div> <div class="shadow1"> </div> <div class="shadow2"> </div> <div class="content"> @@ -17,7 +14,7 @@ <h1>About</h1> <div class="deck"> Cl-NET-SNMP is a pure lisp SNMP implementation now. - <br/> + <br> This package is still in early development stage, lots of work for me to do, but I'll continue coding, because I use it for managing my servers. (I'm a Unix System Administrator of @@ -39,37 +36,36 @@ <div class="rule"> </div> <h1>Release</h1> <div class="deck"> - Fri Sep 28 12:00:00 CST 2007: version 1.0, - <a href="http://common-lisp.net/project/cl-net-snmp/release/cl-net-snmp_1.0.tar.gz"> - get the source.</a><br/> - </div> - <div class="deck"> - Sun Apr 8 20:11:52 CST 2007: version 0.10, - <a href="http://common-lisp.net/project/cl-net-snmp/release/cl-net-snmp_0.10.tar.gz"> - get the source.</a><br/> + Thu Oct 18 00:19:45 CST 2007: version 1.2, + <a href="http://common-lisp.net/project/cl-net-snmp/release/cl-net-snmp_1.2.tar.gz"> + get the source.</a><br> </div> <div class="rule"> </div> <h1>Source Code</h1> <div class="deck"> Click - <a href="http://common-lisp.net/websvn/listing.php?repname=cl-net-snmp&path=%2F&sc=0"> + <a href="http://common-lisp.net/websvn/listing.php?repname=cl-net-snmp&path=%2F&…"> here</a> to view the source code on common-lisp.net's Web-SVN interface, and use - follow command to check out the code:<br/> - <br/> - + follow command to check out the code:<br> + <br> <div class="dateline"> - svn checkout svn://common-lisp.net/project/cl-net-snmp/svn/trunk cl-net-snmp<br/> + svn checkout svn://common-lisp.net/project/cl-net-snmp/svn/trunk cl-net-snmp<br> </div> - - <br/> + <br> A modify version of ZEBU LALR(1) parser can be found at - <a href="http://common-lisp.net/project/cl-net-snmp/archive/zebu/">here</a>. + <a href="http://common-lisp.net/project/cl-net-snmp/archive/zebu/">here</a>, or use + follow command to check out the code:<br> + <br> + <div class="dateline"> + svn checkout svn://common-lisp.net/project/cl-net-snmp/svn/vendor/zebu zebu<br> + </div> + <br> </div> <div class="rule"> </div> <h1>Document</h1> <div class="deck"> - I define two classes: 'snmp-session and 'oid, and a 'snmp-get-msg method to do the - work, see README file in source code. + Sample usage: (snmpV1, public) + <pre>CL-USER 2 > (snmp:snmp-walk "localhost" "system")<br>((#<SMI:OBJECT-ID sysDescr.0><br> "Linux 2950.lab.163.org 2.6.18-4-xen-vserver-amd64 #1 SMP Fri May 4 03:26:45 UTC 2007 x86_64")<br> (#<SMI:OBJECT-ID sysObjectID.0> #<SMI:OBJECT-ID netSnmpAgentOIDs.linux>)<br> (#<SMI:OBJECT-ID sysUpTime.sysUpTimeInstance> #<SMI:TIMETICKS (169041005) 469:33:30.05>)<br> (#<SMI:OBJECT-ID sysContact.0> "Chun Tian (binghe) <binghe.lisp(a)gmail.com>")<br> (#<SMI:OBJECT-ID sysName.0> "2950.lab.163.org")<br> (#<SMI:OBJECT-ID sysLocation.0> "Hangzhou, China")<br> (#<SMI:OBJECT-ID sysORLastChange.0> #<SMI:TIMETICKS (1) 0:00:00.01>)<br> (#<SMI:OBJECT-ID sysORID.1> #<SMI:OBJECT-ID snmpModules.snmpMIB>)<br> (#<SMI:OBJECT-ID sysORID.2> #<SMI:OBJECT-ID mib-2.tcpMIB>)<br> (#<SMI:OBJECT-ID sysORID.3> #<SMI:OBJECT-ID mib-2.ip>)<br> (#<SMI:OBJECT-ID sysORID.4> #<SMI:OBJECT-ID mib-2.udpMIB>)<br> (#<SMI:OBJECT-ID sysORID.5> #<SMI:OBJECT-ID vacmMIBGroups.vacmBasicGroup>)<br> (#<SMI:OBJECT-ID sysORID.6> #<SMI:OBJECT-ID snmpFrameworkMIBCompliances.snmpFrameworkMIBCompliance>)<br> (#<SMI:OBJECT-ID sysORID.7> #<SMI:OBJECT-ID snmpMPDMIBCompliances.snmpMPDCompliance>)<br> (#<SMI:OBJECT-ID sysORID.8> #<SMI:OBJECT-ID usmMIBCompliances.usmMIBCompliance>)<br> (#<SMI:OBJECT-ID sysORDescr.1> "The MIB module for SNMPv2 entities")<br> (#<SMI:OBJECT-ID sysORDescr.2> "The MIB module for managing TCP implementations")<br> (#<SMI:OBJECT-ID sysORDescr.3> "The MIB module for managing IP and ICMP implementations")<br> (#<SMI:OBJECT-ID sysORDescr.4> "The MIB module for managing UDP implementations")<br> (#<SMI:OBJECT-ID sysORDescr.5> "View-based Access Control Model for SNMP.")<br> (#<SMI:OBJECT-ID sysORDescr.6> "The SNMP Management Architecture MIB.")<br> (#<SMI:OBJECT-ID sysORDescr.7> "The MIB for Message Processing and Dispatching.")<br> (#<SMI:OBJECT-ID sysORDescr.8><br>  "The management information definitions for the SNMP User-based Security Model.")<br> (#<SMI:OBJECT-ID sysORUpTime.1> #<SMI:TIMETICKS (0) 0:00:00.00>)<br> (#<SMI:OBJECT-ID sysORUpTime.2> #<SMI:TIMETICKS (0) 0:00:00.00>)<br> (#<SMI:OBJECT-ID sysORUpTime.3> #<SMI:TIMETICKS (0) 0:00:00.00>)<br> (#<SMI:OBJECT-ID sysORUpTime.4> #<SMI:TIMETICKS (0) 0:00:00.00>)<br> (#<SMI:OBJECT-ID sysORUpTime.5> #<SMI:TIMETICKS (0) 0:00:00.00>)<br> (#<SMI:OBJECT-ID sysORUpTime.6> #<SMI:TIMETICKS (1) 0:00:00.01>)<br> (#<SMI:OBJECT-ID sysORUpTime.7> #<SMI:TIMETICKS (1) 0:00:00.01>)<br> (#<SMI:OBJECT-ID sysORUpTime.8> #<SMI:TIMETICKS (1) 0:00:00.01>))<br></pre> </div> <div class="rule"> </div> <h1>Relate Lisp Projects</h1> @@ -102,13 +98,12 @@ <h1>Maintainer</h1> <div class="deck"> Chun Tian (binghe) <ctian at common-lisp dot - net>, Lisp Programmer, Unix Administrator.<br/> + net>, Lisp Programmer, Unix Administrator.<br> Welcome to his chinese <a href="http://tianchunbinghe.blog.163.com/">BLOG</a> - on NetEase blog system.^_^<br/> + on NetEase blog system.^_^<br> </div> </div> <div class="footer"> <address>Powered by Common-Lisp.net</address> </div> - </body> -</html> + </body></html> \ No newline at end of file

1 0

[cl-net-snmp-cvs] r78 - tags/1.2
by ctian＠common-lisp.net 17 Oct '07

17 Oct '07

Author: ctian Date: Wed Oct 17 12:15:00 2007 New Revision: 78 Added: tags/1.2/ - copied from r77, trunk/ Log: Release 1.2

1 0

[cl-net-snmp-cvs] r77 - trunk
by ctian＠common-lisp.net 17 Oct '07

17 Oct '07

Author: ctian Date: Wed Oct 17 12:11:56 2007 New Revision: 77 Modified: trunk/Makefile trunk/README Log: clean more files; fill README Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed Oct 17 12:11:56 2007 @@ -1,4 +1,7 @@ clean: find . -name "*~" -exec rm {} \; find . -name "*.64ufasl" -exec rm {} \; + find . -name "*.old" -exec rm {} \; +build: + lispworks -build deliver.lisp Modified: trunk/README ============================================================================== --- trunk/README (original) +++ trunk/README Wed Oct 17 12:11:56 2007 @@ -1 +1,48 @@ -^_^ +CL-USER 2 > (snmp:snmp-walk "localhost" "system") +((#<SMI:OBJECT-ID sysDescr.0> + "Linux 2950.lab.163.org 2.6.18-4-xen-vserver-amd64 #1 SMP Fri May 4 03:26:45 UTC 2007 x86_64") + (#<SMI:OBJECT-ID sysObjectID.0> + #<SMI:OBJECT-ID netSnmpAgentOIDs.linux>) + (#<SMI:OBJECT-ID sysUpTime.sysUpTimeInstance> + #<SMI:TIMETICKS (169041005) 469:33:30.05>) + (#<SMI:OBJECT-ID sysContact.0> + "Root <root@localhost> (configure /etc/snmp/snmpd.local.conf)") + (#<SMI:OBJECT-ID sysName.0> "2950.lab.163.org") + (#<SMI:OBJECT-ID sysLocation.0> + "Unknown (configure /etc/snmp/snmpd.local.conf)") + (#<SMI:OBJECT-ID sysORLastChange.0> #<SMI:TIMETICKS (1) 0:00:00.01>) + (#<SMI:OBJECT-ID sysORID.1> #<SMI:OBJECT-ID snmpModules.snmpMIB>) + (#<SMI:OBJECT-ID sysORID.2> #<SMI:OBJECT-ID mib-2.tcpMIB>) + (#<SMI:OBJECT-ID sysORID.3> #<SMI:OBJECT-ID mib-2.ip>) + (#<SMI:OBJECT-ID sysORID.4> #<SMI:OBJECT-ID mib-2.udpMIB>) + (#<SMI:OBJECT-ID sysORID.5> + #<SMI:OBJECT-ID vacmMIBGroups.vacmBasicGroup>) + (#<SMI:OBJECT-ID sysORID.6> + #<SMI:OBJECT-ID snmpFrameworkMIBCompliances.snmpFrameworkMIBCompliance>) + (#<SMI:OBJECT-ID sysORID.7> + #<SMI:OBJECT-ID snmpMPDMIBCompliances.snmpMPDCompliance>) + (#<SMI:OBJECT-ID sysORID.8> + #<SMI:OBJECT-ID usmMIBCompliances.usmMIBCompliance>) + (#<SMI:OBJECT-ID sysORDescr.1> "The MIB module for SNMPv2 entities") + (#<SMI:OBJECT-ID sysORDescr.2> + "The MIB module for managing TCP implementations") + (#<SMI:OBJECT-ID sysORDescr.3> + "The MIB module for managing IP and ICMP implementations") + (#<SMI:OBJECT-ID sysORDescr.4> + "The MIB module for managing UDP implementations") + (#<SMI:OBJECT-ID sysORDescr.5> + "View-based Access Control Model for SNMP.") + (#<SMI:OBJECT-ID sysORDescr.6> + "The SNMP Management Architecture MIB.") + (#<SMI:OBJECT-ID sysORDescr.7> + "The MIB for Message Processing and Dispatching.") + (#<SMI:OBJECT-ID sysORDescr.8> + "The management information definitions for the SNMP User-based Security Model.") + (#<SMI:OBJECT-ID sysORUpTime.1> #<SMI:TIMETICKS (0) 0:00:00.00>) + (#<SMI:OBJECT-ID sysORUpTime.2> #<SMI:TIMETICKS (0) 0:00:00.00>) + (#<SMI:OBJECT-ID sysORUpTime.3> #<SMI:TIMETICKS (0) 0:00:00.00>) + (#<SMI:OBJECT-ID sysORUpTime.4> #<SMI:TIMETICKS (0) 0:00:00.00>) + (#<SMI:OBJECT-ID sysORUpTime.5> #<SMI:TIMETICKS (0) 0:00:00.00>) + (#<SMI:OBJECT-ID sysORUpTime.6> #<SMI:TIMETICKS (1) 0:00:00.01>) + (#<SMI:OBJECT-ID sysORUpTime.7> #<SMI:TIMETICKS (1) 0:00:00.01>) + (#<SMI:OBJECT-ID sysORUpTime.8> #<SMI:TIMETICKS (1) 0:00:00.01>))

1 0

[cl-net-snmp-cvs] r76 - in trunk: . asn.1 mib smi snmp
by ctian＠common-lisp.net 17 Oct '07

17 Oct '07

Author: ctian Date: Wed Oct 17 12:08:20 2007 New Revision: 76 Added: trunk/mib/print-oid.lisp Modified: trunk/asn.1/asn.1-domain.lisp trunk/asn.1/package.lisp trunk/mib/package.lisp trunk/mib/tree.lisp trunk/net-snmp.asd trunk/smi/oid.lisp trunk/smi/package.lisp trunk/snmp/package.lisp Log: custom oid display, short package names Modified: trunk/asn.1/asn.1-domain.lisp ============================================================================== --- trunk/asn.1/asn.1-domain.lisp (original) +++ trunk/asn.1/asn.1-domain.lisp Wed Oct 17 12:08:20 2007 @@ -1,6 +1,6 @@ ;;; This file was generated by Zebu (Version 3.5.5) -(IN-PACKAGE "COM.NETEASE.ASN.1") +(IN-PACKAGE "ASN.1") (REQUIRE "zebu-package") (USE-PACKAGE "ZEBU") Modified: trunk/asn.1/package.lisp ============================================================================== --- trunk/asn.1/package.lisp (original) +++ trunk/asn.1/package.lisp Wed Oct 17 12:08:20 2007 @@ -1,7 +1,6 @@ (in-package :snmp.system) -(defpackage com.netease.asn.1 - (:nicknames asn.1) +(defpackage asn.1 (:use :common-lisp #+lispworks :stream #+sbcl :sb-gray #+clisp :gray :zebu) Modified: trunk/mib/package.lisp ============================================================================== --- trunk/mib/package.lisp (original) +++ trunk/mib/package.lisp Wed Oct 17 12:08:20 2007 @@ -1,7 +1,6 @@ (in-package :snmp.system) -(defpackage :com.netease.mib - (:nicknames mib) +(defpackage mib (:use :common-lisp :asn.1 :smi :zebu) (:export *mib-tree* *mib-index* Added: trunk/mib/print-oid.lisp ============================================================================== --- (empty file) +++ trunk/mib/print-oid.lisp Wed Oct 17 12:08:20 2007 @@ -0,0 +1,21 @@ +(in-package :mib) + +(defmethod print-object ((obj object-id) stream) + (with-slots (rev-ids rev-names) obj + (print-unreadable-object (obj stream :type t) + (when *oid-print-id* + (let ((part-1 (reverse rev-ids))) + (format stream "~A~{.~A~}" (car part-1) (cdr part-1)))) + (when (and *oid-print-id* *oid-print-name*) + (format stream " (")) + (when *oid-print-name* + (let ((part-2 (if rev-names + (reverse rev-names) + (resolve (reverse rev-ids))))) + (when *oid-print-short* + (setf part-2 (nthcdr (- (oid-length obj) *oid-print-length*) part-2))) + (format stream "~A~{.~A~}" + (car part-2) + (cdr part-2)))) + (when (and *oid-print-id* *oid-print-name*) + (format stream ")"))))) Modified: trunk/mib/tree.lisp ============================================================================== --- trunk/mib/tree.lisp (original) +++ trunk/mib/tree.lisp Wed Oct 17 12:08:20 2007 @@ -85,19 +85,6 @@ (tree-id (gethash (first names) *mib-index*))))) (t nil)))) -(defmethod print-object ((obj object-id) stream) - (with-slots (rev-ids rev-names) obj - (print-unreadable-object (obj stream :type t) - (let ((part-1 (reverse rev-ids)) - (part-2 (if rev-names - (reverse rev-names) - (resolve (reverse rev-ids))))) - (format stream "~A~{.~A~} {~A~{.~A~}}" - (car part-1) - (cdr part-1) - (car part-2) - (cdr part-2)))))) - (defun parse-mib (file &key (verbose nil)) (let ((*comment-start* "--") (*comment-brackets* '(("/*" . "*/"))) Modified: trunk/net-snmp.asd ============================================================================== --- trunk/net-snmp.asd (original) +++ trunk/net-snmp.asd Wed Oct 17 12:08:20 2007 @@ -2,8 +2,7 @@ (in-package :cl-user) -(defpackage com.netease.snmp.system - (:nicknames snmp.system) +(defpackage snmp.system (:use :common-lisp :asdf) (:export #+lispworks make-fli-templates)) @@ -11,7 +10,7 @@ (defsystem net-snmp :description "Simple Network Manangement Protocol" - :version "1.1" + :version "1.2" :author "Chun Tian (binghe) <binghe.lisp(a)gmail.com>" :depends-on (:cl-fad ; for directory and file :cl-ppcre ; for oid resolve @@ -46,6 +45,7 @@ :components ((:file "package") (:file "tree" :depends-on ("package")) (:file "build" :depends-on ("tree")) + (:file "print-oid" :depends-on ("tree")) #+lispworks (:file "browser" :depends-on ("tree"))) :depends-on (smi)) Modified: trunk/smi/oid.lisp ============================================================================== --- trunk/smi/oid.lisp (original) +++ trunk/smi/oid.lisp Wed Oct 17 12:08:20 2007 @@ -4,6 +4,11 @@ (in-package :smi) +(defvar *oid-print-name* t) +(defvar *oid-print-id* nil) +(defvar *oid-print-short* t) +(defvar *oid-print-length* 2) + (defclass object-id () ((rev-ids :initform nil :type list :reader oid-revid :initarg :id) (rev-names :initform nil :type list :reader oid-name :initarg :name) Modified: trunk/smi/package.lisp ============================================================================== --- trunk/smi/package.lisp (original) +++ trunk/smi/package.lisp Wed Oct 17 12:08:20 2007 @@ -1,13 +1,15 @@ (in-package :snmp.system) -(defpackage com.netease.smi - (:nicknames smi) +(defpackage smi (:use :common-lisp :asn.1 #-(and lispworks win32) :net.sockets) (:export ;; general value-of general-type plain-value ;; object-id object-id oid make-object-id rev-ids rev-names + oid-length oid-revid oid-name oid-< + *oid-print-name* *oid-print-id* *oid-print-short* + *oid-print-length* ;; pdu get-request-pdu get-next-request-pdu @@ -43,4 +45,4 @@ (defmethod plain-value ((object general-type)) (value-of object)) -(defparameter *version* 2) +(defparameter *version* 3) Modified: trunk/snmp/package.lisp ============================================================================== --- trunk/snmp/package.lisp (original) +++ trunk/snmp/package.lisp Wed Oct 17 12:08:20 2007 @@ -1,8 +1,8 @@ (in-package :snmp.system) -(defpackage :com.netease.snmp - (:nicknames snmp) - (:use :common-lisp :smi :asn.1 :mib #-win32 :net.sockets #-win32 :io.streams) +(defpackage snmp + (:use :common-lisp :smi :asn.1 :mib + #-win32 :net.sockets #-win32 :io.streams) (:export v1-session v2c-session v3-session make-session *default-version* *default-community* *default-port* snmp-get snmp-walk))

1 0