From 3ecffb37c2f8ed0e42deb4854227c9afd4288824 Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Sun, 13 Jan 2008 23:27:05 +0100 Subject: [PATCH] Prefix the names of all socket-related foreign functions by %. Signed-off-by: Stelian Ionescu --- sockets/bsd.lisp | 40 ++++++++++++++++++++-------------------- sockets/iface.lisp | 12 ++++++------ sockets/make-socket.lisp | 2 +- sockets/pkgdcl.lisp | 2 +- sockets/socket-methods.lisp | 28 ++++++++++++++-------------- sockets/socket-options.lisp | 18 +++++++++--------- 6 files changed, 51 insertions(+), 51 deletions(-) diff --git a/sockets/bsd.lisp b/sockets/bsd.lisp index 6a90a83..fe21f5e 100644 --- a/sockets/bsd.lisp +++ b/sockets/bsd.lisp @@ -45,13 +45,13 @@ ;;;; sys/socket.h -(define-socket-call "accept" :int +(define-socket-call ("accept" %accept) :int "Accept an incoming connection, returning the file descriptor." (socket fd) (address :pointer) ; sockaddr-foo (addrlen :pointer)) -(define-socket-call "bind" :int +(define-socket-call ("bind" %bind) :int "Bind a socket to a particular local address." (fd fd) (address :pointer) @@ -63,17 +63,17 @@ (address :pointer) ; sockaddr-foo (addrlen socklen)) -(define-socket-call "getpeername" :int +(define-socket-call ("getpeername" %getpeername) :int (socket fd) (address :pointer) (addrlen :pointer)) -(define-socket-call "getsockname" :int +(define-socket-call ("getsockname" %getsockname) :int (socket fd) (address :pointer) (addrlen :pointer)) -(define-socket-call "getsockopt" :int +(define-socket-call ("getsockopt" %getsockopt) :int "Retrieve socket configuration." (fd fd) (level :int) @@ -81,12 +81,12 @@ (optval :pointer) (optlen :pointer)) -(define-socket-call "listen" :int +(define-socket-call ("listen" %listen) :int "Mark a bound socket as listening for incoming connections." (socket fd) (backlog :int)) -(define-socket-call "recvfrom" ssize +(define-socket-call ("recvfrom" %recvfrom) ssize (socket fd) (buffer :pointer) (length size) @@ -94,7 +94,7 @@ (address :pointer) (addrlen :pointer)) -(define-socket-call "sendto" ssize +(define-socket-call ("sendto" %sendto) ssize (socket fd) (buffer :pointer) (length size) @@ -103,18 +103,18 @@ (destlen socklen)) #-(and) ; unused -(define-socket-call "recvmsg" ssize +(define-socket-call ("recvmsg" %recvmsg) ssize (socket fd) (message :pointer) (flags :int)) #-(and) ; unused -(define-socket-call "sendmsg" ssize +(define-socket-call ("sendmsg" %sendmsg) ssize (socket fd) (message :pointer) (flags :int)) -(define-socket-call "setsockopt" :int +(define-socket-call ("setsockopt" %setsockopt) :int "Configure a socket." (fd fd) (level :int) @@ -127,27 +127,27 @@ (how :int)) ;;; SOCKET is emulated in winsock.lisp. -(define-socket-call "socket" :int +(define-socket-call ("socket" %socket) :int "Create a BSD socket." (domain :int) ; af-* (type :int) ; sock-* (protocol :int)) #-(and) ; unused -(define-socket-call "sockatmark" :int +(define-socket-call ("sockatmark" %sockatmark) :int (socket fd)) #-(and) ; unused -(define-socket-call ("socketpair" %socketpair) :int +(define-socket-call ("socketpair" %%socketpair) :int (domain :int) ; af-* (type :int) ; sock-* (protocol :int) (filedes :pointer)) #-(and) ; unused -(defun socketpair (domain type protocol) +(defun %socketpair (domain type protocol) (with-foreign-object (filedes :int 2) - (%socketpair domain type protocol filedes) + (%%socketpair domain type protocol filedes) (values (mem-aref filedes :int 0) (mem-aref filedes :int 1)))) @@ -158,16 +158,16 @@ ;;;; net/if.h -(defcfun "if_nametoindex" +(defcfun ("if_nametoindex" %if-nametoindex) (errno-wrapper :unsigned-int :error-predicate zerop) (ifname :string)) -(define-socket-call "if_indextoname" :string +(define-socket-call ("if_indextoname" %if-indextoname) :string (ifindex :unsigned-int) (ifname :pointer)) -(define-socket-call "if_nameindex" :pointer +(define-socket-call ("if_nameindex" %if-nameindex) :pointer "Return all network interface names and indexes") -(define-socket-call "if_freenameindex" :void +(define-socket-call ("if_freenameindex" %if-freenameindex) :void (ptr :pointer)) diff --git a/sockets/iface.lisp b/sockets/iface.lisp index 78c6d14..e0febde 100644 --- a/sockets/iface.lisp +++ b/sockets/iface.lisp @@ -56,23 +56,23 @@ (defun list-network-interfaces () "Returns a list of network interfaces currently available." (with-foreign-object (ifptr :pointer) - (setf ifptr (if-nameindex)) + (setf ifptr (%if-nameindex)) (unless (null-pointer-p ifptr) (loop :for i :from 0 :for name := (foreign-slot-value (mem-aref ifptr 'if-nameindex i) - 'if-nameindex 'name) + 'if-nameindex 'name) :for index := (foreign-slot-value (mem-aref ifptr 'if-nameindex i) - 'if-nameindex 'index) + 'if-nameindex 'index) :while (plusp index) :collect (make-interface name index) - :finally (if-freenameindex ifptr))))) + :finally (%if-freenameindex ifptr))))) (defun get-interface-by-index (index) (with-foreign-object (buff :uint8 ifnamesize) (handler-case - (if-indextoname index buff) + (%if-indextoname index buff) (nix:enxio (err) (error 'unknown-interface :code (osicat-sys:system-error-code err) @@ -83,7 +83,7 @@ (defun get-interface-by-name (name) (handler-case - (if-nametoindex name) + (%if-nametoindex name) (nix:enodev (err) (error 'unknown-interface :code (osicat-sys:system-error-code err) diff --git a/sockets/make-socket.lisp b/sockets/make-socket.lisp index db9f706..b2824ca 100644 --- a/sockets/make-socket.lisp +++ b/sockets/make-socket.lisp @@ -294,7 +294,7 @@ is automatically closed upon exit." (defun get-address-family (fd) (with-sockaddr-storage (ss) (with-socklen (size size-of-sockaddr-storage) - (getsockname fd ss size) + (%getsockname fd ss size) (foreign-slot-value ss 'sockaddr-storage 'family)))) (defun make-socket-stream (fd &key (external-format :default) (errorp t)) diff --git a/sockets/pkgdcl.lisp b/sockets/pkgdcl.lisp index 5923e54..5e75d2c 100644 --- a/sockets/pkgdcl.lisp +++ b/sockets/pkgdcl.lisp @@ -30,7 +30,7 @@ #:system-error-message #:errno-wrapper #:pid #:gid #:uid #:size #:ssize #:bzero) (:import-from #:osicat-sys #:size-of-int) - (:shadow #:listen #:let #:let* #:multiple-value-bind #:funcall #:defun) + (:shadow #:let #:let* #:multiple-value-bind #:funcall #:defun) (:export ;; Conditions #:posix-error diff --git a/sockets/socket-methods.lisp b/sockets/socket-methods.lisp index 6b9e9af..445abb5 100644 --- a/sockets/socket-methods.lisp +++ b/sockets/socket-methods.lisp @@ -68,7 +68,7 @@ (with-accessors ((fd fd-of) (fam socket-family) (proto socket-protocol)) socket (setf fd (or file-descriptor - (multiple-value-call #'socket + (multiple-value-call #'%socket (translate-make-socket-keywords-to-constants family type protocol)))) (setf fam family @@ -179,7 +179,7 @@ (with-sockaddr-storage (ss) (with-socklen (size size-of-sockaddr-storage) (handler-case - (getsockname (fd-of socket) ss size) + (%getsockname (fd-of socket) ss size) (nix:ebadf () nil) (nix:econnreset () nil) (:no-error (_) (declare (ignore _)) t)))))) @@ -189,7 +189,7 @@ (defmethod local-name ((socket socket)) (with-sockaddr-storage (ss) (with-socklen (size size-of-sockaddr-storage) - (getsockname (fd-of socket) ss size) + (%getsockname (fd-of socket) ss size) (sockaddr-storage->sockaddr ss)))) (defmethod local-address ((socket socket)) @@ -203,7 +203,7 @@ (defmethod remote-name ((socket socket)) (with-sockaddr-storage (ss) (with-socklen (size size-of-sockaddr-storage) - (getpeername (fd-of socket) ss size) + (%getpeername (fd-of socket) ss size) (sockaddr-storage->sockaddr ss)))) (defmethod remote-address ((socket socket)) @@ -222,11 +222,11 @@ (defun bind-ipv4-address (fd address port) (with-sockaddr-in (sin address port) - (bind fd sin size-of-sockaddr-in))) + (%bind fd sin size-of-sockaddr-in))) (defun bind-ipv6-address (fd address port) (with-sockaddr-in6 (sin6 address port) - (bind fd sin6 size-of-sockaddr-in6))) + (%bind fd sin6 size-of-sockaddr-in6))) (defmethod bind-address ((socket internet-socket) (address ipv4-address) &key (port 0)) @@ -244,7 +244,7 @@ (defmethod bind-address ((socket local-socket) (address local-address) &key) (with-sockaddr-un (sun (address-name address)) - (bind (fd-of socket) sun size-of-sockaddr-un)) + (%bind (fd-of socket) sun size-of-sockaddr-un)) (values socket)) (defmethod bind-address :after ((socket socket) (address address) &key) @@ -256,7 +256,7 @@ (unless backlog (setf backlog (min *default-backlog-size* +max-backlog-size+))) (check-type backlog unsigned-byte "a non-negative integer") - (listen (fd-of socket) backlog) + (%listen (fd-of socket) backlog) (setf (slot-value socket 'listening) t) (values socket)) @@ -279,7 +279,7 @@ (with-sockaddr-storage (ss) (with-socklen (size size-of-sockaddr-storage) (handler-case - (make-client-socket (accept (fd-of socket) ss size)) + (make-client-socket (%accept (fd-of socket) ss size)) (nix:ewouldblock ())))))) ;;;; CONNECT @@ -325,7 +325,7 @@ (with-sockaddr-storage (ss) (with-socklen (size size-of-sockaddr-storage) (handler-case - (getpeername (fd-of socket) ss size) + (%getpeername (fd-of socket) ss size) (socket-not-connected-error () nil) (:no-error (_) (declare (ignore _)) t)))))) @@ -412,9 +412,9 @@ (sockaddr->sockaddr-storage ss remote-address remote-port)) (with-pointer-to-vector-data (buff-sap buff) (incf-pointer buff-sap start-offset) - (sendto (fd-of socket) buff-sap bufflen flags - (if remote-address ss (null-pointer)) - (if remote-address size-of-sockaddr-storage 0)))))) + (%sendto (fd-of socket) buff-sap bufflen flags + (if remote-address ss (null-pointer)) + (if remote-address size-of-sockaddr-storage 0)))))) (defmethod socket-send ((buffer array) (socket active-socket) &rest args &key (start 0) end remote-address (remote-port 0) &allow-other-keys) @@ -460,7 +460,7 @@ (bzero ss size-of-sockaddr-storage) (with-pointer-to-vector-data (buff-sap buff) (incf-pointer buff-sap start-offset) - (recvfrom fd buff-sap bufflen flags ss size))))) + (%recvfrom fd buff-sap bufflen flags ss size))))) (declaim (inline %socket-receive-stream-socket)) (defun %socket-receive-stream-socket (buffer socket start end flags) diff --git a/sockets/socket-options.lisp b/sockets/socket-options.lisp index 9c7d3f8..236cfea 100644 --- a/sockets/socket-options.lisp +++ b/sockets/socket-options.lisp @@ -117,13 +117,13 @@ (define-socket-option-helper (:get :bool) (fd level option) (with-foreign-object (optval :int) (with-socklen (optlen size-of-int) - (getsockopt fd level option optval optlen) + (%getsockopt fd level option optval optlen) (mem-ref optval :boolean)))) (define-socket-option-helper (:set :bool) (fd level option value) (with-foreign-object (optval :int) (setf (mem-ref optval :int) (lisp->c-bool value)) - (setsockopt fd level option optval size-of-int) + (%setsockopt fd level option optval size-of-int) (values))) ;;; INT @@ -133,13 +133,13 @@ (define-socket-option-helper (:get :int) (fd level option) (with-foreign-object (optval :int) (with-socklen (optlen size-of-int) - (getsockopt fd level option optval optlen) + (%getsockopt fd level option optval optlen) (mem-ref optval :int)))) (define-socket-option-helper (:set :int) (fd level option value) (with-foreign-object (optval :int) (setf (mem-ref optval :int) value) - (setsockopt fd level option optval size-of-int) + (%setsockopt fd level option optval size-of-int) (values))) ;;; LINGER @@ -149,7 +149,7 @@ (define-socket-option-helper (:get :linger) (fd level option) (with-foreign-object (optval 'linger) (with-socklen (optlen size-of-linger) - (getsockopt fd level option optval optlen) + (%getsockopt fd level option optval optlen) (with-foreign-slots ((linger onoff) optval linger) (values (not (zerop onoff)) linger))))) @@ -158,7 +158,7 @@ (with-foreign-slots ((linger onoff) optval linger) (setf onoff (lisp->c-bool new-onoff) linger new-linger)) - (setsockopt fd level option optval size-of-linger) + (%setsockopt fd level option optval size-of-linger) (values))) ;;; TIMEVAL @@ -168,7 +168,7 @@ (define-socket-option-helper (:get :timeval) (fd level option) (with-foreign-object (optval 'nix::timeval) (with-socklen (optlen nix::size-of-timeval) - (getsockopt fd level option optval optlen) + (%getsockopt fd level option optval optlen) (with-foreign-slots ((nix::sec nix::usec) optval nix::timeval) (values nix::sec nix::usec))))) @@ -177,7 +177,7 @@ (with-foreign-slots ((nix::sec nix::usec) optval nix::timeval) (setf nix::sec sec nix::usec usec)) - (setsockopt fd level option optval nix::size-of-timeval) + (%setsockopt fd level option optval nix::size-of-timeval) (values))) ;;; IFREQ-NAME @@ -191,7 +191,7 @@ (with-foreign-slots ((name) optval ifreq) (with-foreign-string (ifname interface) (nix:memcpy name ifname (min (length interface) (1- ifnamsiz))))) - (setsockopt fd level option optval size-of-ifreq) + (%setsockopt fd level option optval size-of-ifreq) (values))) ;;;; Option Definitions -- 2.11.4.GIT