COMMON-NET: Added functions for construction TCP/UDP addresses from hosts.

[lisp-utils.git] / common-net.lisp

diff --git a/common-net.lisp b/common-net.lisp
index fadf080..e17931d 100644 (file)
--- a/common-net.lisp
+++ b/common-net.lisp
@@ -246,7 +246,7 @@
   (declare (type stream-socket socket))
   (unless (eq (stream-socket-mode socket) :character)
     (error 'stream-mode-error :stream socket :socket socket :expected-mode :character))
-  (case (fill-char-buffer socket 1)
+  (case (fill-char-buffer socket 1 t)
     ((nil) (return-from gray-stream-read-char-no-hang :eof))
     ((:wait) (return-from gray-stream-read-char-no-hang nil)))
   (with-slots (char-buffer char-read-pos) socket
@@ -429,7 +429,13 @@
 
 (defmethod connected-address-p ((address tcp-address)) t)
 
-(export '(tcp-address tcp4-address tcp6-address))
+(defun tcp-address-for (host-address port)
+  (check-type port (unsigned-byte 16))
+  (etypecase host-address
+    (ipv4-address (make-instance 'tcp4-address :host-address host-address :port port))
+    (ipv6-address (make-instance 'tcp6-address :host-address host-address :port port))))
+
+(export '(tcp-address tcp4-address tcp6-address tcp-address-for))
 
 ;;; UDP code
 
@@ -439,7 +445,13 @@
 
 (defmethod connected-address-p ((address tcp-address)) nil)
 
-(export '(udp-address udp4-address udp6-address))
+(defun udp-address-for (host-address port)
+  (check-type port (unsigned-byte 16))
+  (etypecase host-address
+    (ipv4-address (make-instance 'udp4-address :host-address host-address :port port))
+    (ipv6-address (make-instance 'udp6-address :host-address host-address :port port))))
+
+(export '(udp-address udp4-address udp6-address udp-address-for))
 
 ;;; Unix sockets