Index: /trunk/ccl/level-1/l1-sockets.lisp
===================================================================
--- /trunk/ccl/level-1/l1-sockets.lisp	(revision 5825)
+++ /trunk/ccl/level-1/l1-sockets.lisp	(revision 5826)
@@ -680,27 +680,21 @@
          
   
-(defun make-tcp-stream-socket (fd &key remote-host
-				  remote-port
-				  (format :bivalent)
-				  (class 'tcp-stream)
-                                  (basic t)
-                                  external-format
+(defun make-tcp-stream-socket (fd &rest keys
+                                  &key remote-host
+				  remote-port				  
 				  &allow-other-keys)
   (inet-connect fd
 		(host-as-inet-host remote-host)
 		(port-as-inet-port remote-port "tcp"))
-  (make-tcp-stream fd :format format :external-format external-format :class class :basic basic))
-
-(defun make-file-stream-socket (fd &key remote-filename
-                                   external-format
-                                   (format :bivalent)
-                                   (class 'file-socket-stream)
-                                   (basic t)
+  (apply #'make-tcp-stream fd keys))
+
+(defun make-file-stream-socket (fd &rest keys
+                                   &key remote-filename
                                    &allow-other-keys)
   (file-socket-connect fd remote-filename)
-  (make-file-socket-stream fd :format format :external-format external-format :class class :basic basic))
-
-
-(defun make-tcp-stream (fd &key format external-format (class 'tcp-stream) sharing (basic t) &allow-other-keys)
+  (apply #'make-file-socket-stream fd keys))
+
+
+(defun make-tcp-stream (fd &key (format :bivalent) external-format (class 'tcp-stream) sharing (basic t) &allow-other-keys)
   (let* ((external-format (normalize-external-format :socket external-format)))
     (let ((element-type (ecase format
@@ -719,5 +713,5 @@
                       :basic basic))))
 
-(defun make-file-socket-stream (fd &key format external-format (class 'file-socket-stream)  sharing basic &allow-other-keys)
+(defun make-file-socket-stream (fd &key (format :bivalent) external-format (class 'file-socket-stream)  sharing basic &allow-other-keys)
   (let* ((external-format (normalize-external-format :socket external-format)))
   
@@ -1116,5 +1110,6 @@
     (setf (paref params (:* :unsigned-long) 0) domain
           (paref params (:* :unsigned-long) 1) type
-          (paref params (:* :unsigned-long) 2) protocol)))
+          (paref params (:* :unsigned-long) 2) protocol)
+    (syscall syscalls::socketcall 1 params)))
 
 (defun init-unix-sockaddr (addr path)