[usocket-cvs] r41 - in usocket/trunk: . backend

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Sat Feb  4 15:43:49 2006
New Revision: 41

Modified:
   usocket/trunk/backend/allegro.lisp
   usocket/trunk/usocket.asd
Log:
Fix loading errors for Allegro CL.

Modified: usocket/trunk/backend/allegro.lisp
==============================================================================
--- usocket/trunk/backend/allegro.lisp	(original)
+++ usocket/trunk/backend/allegro.lisp	Sat Feb  4 15:43:49 2006
@@ -6,18 +6,18 @@
 (in-package :usocket)
 
 (defparameter +allegro-identifier-error-map+
-  '((:address-in-use . usocket-address-in-use-error)
-    (:address-not-available . usocket-address-not-available-error)
-    (:network-down . usocket-network-down-error)
-    (:network-reset . usocket-network-reset-error)
-    (:connection-aborted . usocket-connection-aborted-error)
-    (:connection-reset . usocket-connection-reset-error)
-    (:no-buffer-space . usocket-no-buffers-error)
-    (:shutdown . usocket-shutdown-error)
-    (:connection-timed-out . usocket-timeout-error)
-    (:connection-refused . usocket-connection-refused-error)
-    (:host-down . usocket-host-down-error)
-    (:host-unreachable . usocket-host-unreachable-error)))
+  '((:address-in-use . address-in-use-error)
+    (:address-not-available . address-not-available-error)
+    (:network-down . network-down-error)
+    (:network-reset . network-reset-error)
+    (:connection-aborted . connection-aborted-error)
+    (:connection-reset . connection-reset-error)
+    (:no-buffer-space . no-buffers-error)
+    (:shutdown . shutdown-error)
+    (:connection-timed-out . timeout-error)
+    (:connection-refused . connection-refused-error)
+    (:host-down . host-down-error)
+    (:host-unreachable . host-unreachable-error)))
 
 (defun handle-condition (condition &optional (socket nil))
   "Dispatch correct usocket condition."
@@ -27,7 +27,7 @@
                                      +allegro-identifier-error-map+))))
                     (if usock-err
                         (error usock-err :socket socket)
-                      (error 'usocket-unknown-error
+                      (error 'unknown-error
                              :real-condition condition
                              :socket socket))))))
 
@@ -36,24 +36,24 @@
   (let ((socket))
     (setf socket
           (with-mapped-conditions (socket)
-             (sock:make-socket :remote-host (host-to-hostname host)
-                               :remote-port port)))
+             (socket:make-socket :remote-host (host-to-hostname host)
+                                 :remote-port port)))
     (make-socket :socket socket :stream socket)))
 
-(defmethod close ((usocket usocket))
+(defmethod socket-close ((usocket usocket))
   "Close socket."
   (with-mapped-conditions (usocket)
-    (sock:close (socket usocket))))
+    (close (socket usocket))))
 
 
 
 (defun get-host-by-address (address)
   (with-mapped-conditions ()
-    (sock:ipaddr-to-hostname address)))
+    (socket:ipaddr-to-hostname address)))
 
 (defun get-hosts-by-name (name)
   ;;###FIXME: ACL has the acldns module which returns all A records
   ;; only problem: it doesn't fall back to tcp (from udp) if the returned
   ;; structure is too long.
   (with-mapped-conditions ()
-    (list (hbo-to-vector-quad (sock:lookup-hostname name)))))
+    (list (hbo-to-vector-quad (socket:lookup-hostname name)))))

Modified: usocket/trunk/usocket.asd
==============================================================================
--- usocket/trunk/usocket.asd	(original)
+++ usocket/trunk/usocket.asd	Sat Feb  4 15:43:49 2006
@@ -17,7 +17,9 @@
     :version "0.1.0"
     :licence "MIT"
     :description "Universal socket library for Common Lisp"
-    :depends-on (#+sbcl :sb-bsd-sockets :split-sequence)
+    :depends-on (:split-sequence
+                 #+allegro :socket
+                 #+sbcl :sb-bsd-sockets)
     :components ((:file "package")
                  (:file "usocket"
                         :depends-on ("package"))