[snmp1-cvs] CVS snmp1

[jriise]

Update of /project/snmp1/cvsroot/snmp1
In directory clnet:/tmp/cvs-serv23880

Modified Files:
	ber.lisp snmp.lisp 
Log Message:
Documentation strings. Bug in tag codes. Masked an unfrequent sockets-error


--- /project/snmp1/cvsroot/snmp1/ber.lisp	2007/01/21 02:25:02	1.3
+++ /project/snmp1/cvsroot/snmp1/ber.lisp	2007/02/03 17:23:20	1.4
@@ -35,15 +35,15 @@
 (let ((tag->octet (make-hash-table))
 	(octet->tag (make-hash-table))
 	(tag-list (list
-		   (list :integer           (+ (* 40 0)  2))
-		   (list :octet-string      (+ (* 40 0)  4))
-		   (list :null              (+ (* 40 0)  5))
-		   (list :object-identifier (+ (* 40 0)  6))
-		   (list :ipaddress         (+ (* 40 1)  0))
-		   (list :counter           (+ (* 40 1)  1))
-		   (list :gauge             (+ (* 40 1)  2))
-		   (list :timeticks         (+ (* 40 1)  3))
-		   (list :opaque            (+ (* 40 1)  4))
+		   (list :integer           2)
+		   (list :octet-string      4)
+		   (list :null              5)
+		   (list :object-identifier 6)
+		   (list :ipaddress         64)
+		   (list :counter           65)
+		   (list :gauge             66)
+		   (list :timeticks         67)
+		   (list :opaque            68)
 		   (list :sequence          #x30)
 		   (list :get               #xa0)
 		   (list :getnext           #xa1)
--- /project/snmp1/cvsroot/snmp1/snmp.lisp	2007/01/21 02:25:03	1.3
+++ /project/snmp1/cvsroot/snmp1/snmp.lisp	2007/02/03 17:23:20	1.4
@@ -156,6 +156,7 @@
 ;;     ))
 
 (defun udp-send-and-receive (host port timeout repetitions message)
+<<<<<<< HEAD/snmp.lisp
   "send one pqcket and receive one packet. Do timeouts and retries.
 This function is specific to sbcl"
   (let ((socket (make-instance 'sb-bsd-sockets:inet-socket :protocol :udp :type :datagram))
@@ -174,9 +175,10 @@
 		       (subseq buf 0 len)))
 		 (timeout ()  #|(display :hei )|# nil)))
        until result)
-    (sb-BSD-SOCKETS:SOCKET-CLOSE socket)
-    result
-    ))
+        (sb-BSD-SOCKETS:SOCKET-CLOSE socket)
+        result
+        )
+    (sb-bsd-sockets:socket-error ())))
 
 
 (defun snmp-get-many- (oids &optional (request-id (random 1000)))