From 99db39697d2af6a09f85858751c2a513c7c9b86b Mon Sep 17 00:00:00 2001 From: dlichteblau Date: Tue, 2 Jan 2007 12:54:00 +0000 Subject: [PATCH] removed server socket code (unused) --- src/glisp/dep-clisp.lisp | 11 ----------- src/glisp/dep-cmucl.lisp | 26 -------------------------- src/glisp/dep-openmcl.lisp | 32 -------------------------------- src/glisp/dep-sbcl.lisp | 32 -------------------------------- src/glisp/package.lisp | 1 - src/glisp/util.lisp | 12 ------------ 6 files changed, 114 deletions(-) diff --git a/src/glisp/dep-clisp.lisp b/src/glisp/dep-clisp.lisp index cd4fa90..3d3b09e 100644 --- a/src/glisp/dep-clisp.lisp +++ b/src/glisp/dep-clisp.lisp @@ -40,17 +40,6 @@ (lisp:socket-connect port hostname) :byte)) -(export 'glisp::make-server-socket :glisp) -(defun glisp:make-server-socket (port) - (lisp:socket-server port)) - -(defun glisp::accept-connection/low (socket) - (let ((stream (lisp:socket-accept socket))) - (setf (stream-element-type stream) '(unsigned-byte 8)) - (values - stream - :byte))) - (defun glisp::g/make-string (length &rest options) (apply #'make-array length :element-type diff --git a/src/glisp/dep-cmucl.lisp b/src/glisp/dep-cmucl.lisp index 5b52201..e4be036 100644 --- a/src/glisp/dep-cmucl.lisp +++ b/src/glisp/dep-cmucl.lisp @@ -71,32 +71,6 @@ :name (format nil "Network connection to ~A:~D" hostname port)) :byte))) -(defstruct (server-socket (:constructor make-server-socket-struct)) - fd - element-type - port) - -(export 'glisp::make-server-socket :glisp) -(defun glisp::make-server-socket (port &key (element-type '(unsigned-byte 8))) - (make-server-socket-struct :fd (ext:create-inet-listener port) - :element-type element-type - :port port)) - -(defun glisp::accept-connection/low (socket) - (mp:process-wait-until-fd-usable (server-socket-fd socket) :input) - (values - (sys:make-fd-stream (ext:accept-tcp-connection (server-socket-fd socket)) - :input t :output t - :element-type (server-socket-element-type socket)) - (cond ((subtypep (server-socket-element-type socket) 'integer) - :byte) - (t - :char)))) - -(export 'glisp::close-server-socket :glisp) -(defun glisp::close-server-socket (socket) - (unix:unix-close (server-socket-fd socket))) - (defun glisp::g/make-string (length &rest options) (apply #'make-array length :element-type 'base-char options)) diff --git a/src/glisp/dep-openmcl.lisp b/src/glisp/dep-openmcl.lisp index 45156be..302aa70 100644 --- a/src/glisp/dep-openmcl.lisp +++ b/src/glisp/dep-openmcl.lisp @@ -45,38 +45,6 @@ :remote-port port) :byte)) -(defstruct (server-socket (:constructor make-server-socket-struct)) - fd - element-type - port) - - -#|| -(export 'glisp::make-server-socket :glisp) -(defun glisp::make-server-socket (port &key (element-type '(unsigned-byte 8))) - (make-server-socket-struct :fd (ext:create-inet-listener port) - :element-type element-type - :port port)) - - -(defun glisp::accept-connection/low (socket) - (mp:process-wait-until-fd-usable (server-socket-fd socket) :input) - (values - (sys:make-fd-stream (ext:accept-tcp-connection (server-socket-fd socket)) - :input t :output t - :element-type (server-socket-element-type socket)) - (cond ((subtypep (server-socket-element-type socket) 'integer) - :byte) - (t - :char)))) - -(export 'glisp::close-server-socket :glisp) -(defun glisp::close-server-socket (socket) - (unix:unix-close (server-socket-fd socket))) -||# - -;;;;;; - (defun glisp::g/make-string (length &rest options) (apply #'make-array length :element-type 'base-char options)) diff --git a/src/glisp/dep-sbcl.lisp b/src/glisp/dep-sbcl.lisp index 4e9c42b..a74bd2b 100644 --- a/src/glisp/dep-sbcl.lisp +++ b/src/glisp/dep-sbcl.lisp @@ -51,38 +51,6 @@ :input t :output t) :byte)) -(defstruct (server-socket (:constructor make-server-socket-struct)) - fd - element-type - port) - - -#|| -(export 'glisp::make-server-socket :glisp) -(defun glisp::make-server-socket (port &key (element-type '(unsigned-byte 8))) - (make-server-socket-struct :fd (ext:create-inet-listener port) - :element-type element-type - :port port)) - - -(defun glisp::accept-connection/low (socket) - (mp:process-wait-until-fd-usable (server-socket-fd socket) :input) - (values - (sys:make-fd-stream (ext:accept-tcp-connection (server-socket-fd socket)) - :input t :output t - :element-type (server-socket-element-type socket)) - (cond ((subtypep (server-socket-element-type socket) 'integer) - :byte) - (t - :char)))) - -(export 'glisp::close-server-socket :glisp) -(defun glisp::close-server-socket (socket) - (unix:unix-close (server-socket-fd socket))) -||# - -;;;;;; - (defun glisp::g/make-string (length &rest options) (apply #'make-array length :element-type 'character options)) diff --git a/src/glisp/package.lisp b/src/glisp/package.lisp index c89660e..f31dfe5 100644 --- a/src/glisp/package.lisp +++ b/src/glisp/package.lisp @@ -88,7 +88,6 @@ "CL-BYTE-STREAM->GSTREAM" "CL-CHAR-STREAM->GSTREAM" "G/OPEN-INET-SOCKET" - "ACCEPT-CONNECTION" "FIND-TEMPORARY-FILE" "DELETE-TEMPORARY-FILE" diff --git a/src/glisp/util.lisp b/src/glisp/util.lisp index ff3bdb5..78d1b93 100644 --- a/src/glisp/util.lisp +++ b/src/glisp/util.lisp @@ -678,18 +678,6 @@ Hmm unter PCL geht das nicht ;-( (:char (cl-char-stream->gstream stream)) (:byte (cl-byte-stream->gstream stream)) ))) -#|| -(defun g/open-inet-socket-ssl (host port) - (multiple-value-bind (stream) (gluser::make-ssl-client-socket host port) - (cl-byte-stream->gstream stream))) -||# - -(defun accept-connection (socket) - (multiple-value-bind (stream kind) (accept-connection/low socket) - (ecase kind - (:char (cl-char-stream->gstream stream)) - (:byte (cl-byte-stream->gstream stream)) ))) - ;;; ---------------------------------------------------------------------------------------------------- -- 2.11.4.GIT