X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fconstants.lisp;h=c5d19a31fca3d969d9c1dba9053c59e3c5b94ba9;hb=10cdee0326e9e8a5bbfe1d8312a73d58f023fb5f;hp=9dbf4f7d658596d99bdee6e61f3684c37f8759f7;hpb=3a38ef48c9ae55b932b5639ac9ac3ccd56c7dd9f;p=sbcl.git diff --git a/contrib/sb-bsd-sockets/constants.lisp b/contrib/sb-bsd-sockets/constants.lisp index 9dbf4f7..c5d19a3 100644 --- a/contrib/sb-bsd-sockets/constants.lisp +++ b/contrib/sb-bsd-sockets/constants.lisp @@ -12,12 +12,12 @@ ((:integer af-inet "AF_INET" "IP Protocol family") (:integer af-unspec "AF_UNSPEC" "Unspecified") (:integer af-local - #+(or sunos solaris) "AF_UNIX" - #-(or sunos solaris) "AF_LOCAL" - "Local to host (pipes and file-domain).") + #+(or sunos solaris) "AF_UNIX" + #-(or sunos solaris) "AF_LOCAL" + "Local to host (pipes and file-domain).") #+linux (:integer af-inet6 "AF_INET6" "IP version 6") #+linux (:integer af-route "AF_NETLINK" "Alias to emulate 4.4BSD ") - + (:integer sock-stream "SOCK_STREAM" "Sequenced, reliable, connection-based byte streams.") (:integer sock-dgram "SOCK_DGRAM" @@ -60,11 +60,12 @@ (:integer tcp-nodelay "TCP_NODELAY") #+linux (:integer so-bindtodevice "SO_BINDTODEVICE") (:integer ifnamsiz "IFNAMSIZ") - + (:integer EADDRINUSE "EADDRINUSE") (:integer EAGAIN "EAGAIN") (:integer EBADF "EBADF") (:integer ECONNREFUSED "ECONNREFUSED") + (:integer ETIMEDOUT "ETIMEDOUT") (:integer EINTR "EINTR") (:integer EINVAL "EINVAL") (:integer ENOBUFS "ENOBUFS") @@ -74,6 +75,7 @@ (:integer EPROTONOSUPPORT "EPROTONOSUPPORT") (:integer ESOCKTNOSUPPORT "ESOCKTNOSUPPORT") (:integer ENETUNREACH "ENETUNREACH") + (:integer ENOTCONN "ENOTCONN") (:integer NETDB-INTERNAL "NETDB_INTERNAL" "See errno.") (:integer NETDB-SUCCESS "NETDB_SUCCESS" "No problem.") @@ -93,6 +95,9 @@ (:integer msg-trunc "MSG_TRUNC") (:integer msg-waitall "MSG_WAITALL") + ;; for socket-receive + (:type socklen-t "socklen_t") + #| ;;; stat is nothing to do with sockets, but I keep it around for testing ;;; the ffi glue @@ -104,83 +109,87 @@ (buf (* t)))) |# (:structure protoent ("struct protoent" - ((* t) name "char *" "p_name") + (c-string-pointer name "char *" "p_name") ((* (* t)) aliases "char **" "p_aliases") - (integer proto "int" "p_proto"))) - (:function getprotobyname ("getprotobyname" (* t) - (name c-string))) + (integer proto "int" "p_proto"))) + (:function getprotobyname ("getprotobyname" (* protoent) + (name c-string))) (:integer inaddr-any "INADDR_ANY") (:structure in-addr ("struct in_addr" - ((array (unsigned 8) 4) addr "u_int32_t" "s_addr"))) + ((array (unsigned 8)) addr "u_int32_t" "s_addr"))) (:structure sockaddr-in ("struct sockaddr_in" (integer family "sa_family_t" "sin_family") - ((array (unsigned 8) 2) port "u_int16_t" "sin_port") - ((array (unsigned 8) 4) addr "struct in_addr" "sin_addr"))) + ;; These two could be in-port-t and + ;; in-addr-t, but then we'd throw away the + ;; convenience (and byte-order agnosticism) + ;; of the old sb-grovel scheme. + ((array (unsigned 8)) port "u_int16_t" "sin_port") + ((array (unsigned 8)) addr "struct in_addr" "sin_addr"))) (:structure sockaddr-un ("struct sockaddr_un" (integer family "sa_family_t" "sun_family") - ((array (unsigned 8) 108) path "char" "sun_path"))) + (c-string path "char" "sun_path"))) (:structure hostent ("struct hostent" - ((* t) name "char *" "h_name") + (c-string-pointer name "char *" "h_name") ((* c-string) aliases "char **" "h_aliases") (integer type "int" "h_addrtype") (integer length "int" "h_length") ((* (* (unsigned 8))) addresses "char **" "h_addr_list"))) - (:function socket ("socket" integer - (domain integer) - (type integer) - (protocol integer))) - (:function bind ("bind" integer - (sockfd integer) - (my-addr (* t)) - (addrlen integer))) - (:function listen ("listen" integer - (socket integer) - (backlog integer))) - (:function accept ("accept" integer - (socket integer) - (my-addr (* t)) - (addrlen integer :in-out))) - (:function getpeername ("getpeername" integer - (socket integer) - (her-addr (* t)) - (addrlen integer :in-out))) - (:function getsockname ("getsockname" integer - (socket integer) - (my-addr (* t)) - (addrlen integer :in-out))) - (:function connect ("connect" integer - (socket integer) - (his-addr (* t)) - (addrlen integer ))) - - (:function close ("close" integer - (fd integer))) - (:function recvfrom ("recvfrom" integer - (socket integer) - (buf (* t)) - (len integer) - (flags integer) - (sockaddr (* t)) - (socklen (* integer)))) - (:function gethostbyname ("gethostbyname" (* t ) (name c-string))) - (:function gethostbyaddr ("gethostbyaddr" (* t ) - (addr (* t)) - (len integer) - (af integer))) - (:function setsockopt ("setsockopt" integer - (socket integer) - (level integer) - (optname integer) + (:function socket ("socket" int + (domain int) + (type int) + (protocol int))) + (:function bind ("bind" int + (sockfd int) + (my-addr (* t)) ; KLUDGE: sockaddr-in or sockaddr-un? + (addrlen int))) + (:function listen ("listen" int + (socket int) + (backlog int))) + (:function accept ("accept" int + (socket int) + (my-addr (* t)) ; KLUDGE: sockaddr-in or sockaddr-un? + (addrlen int :in-out))) + (:function getpeername ("getpeername" int + (socket int) + (her-addr (* t)) ; KLUDGE: sockaddr-in or sockaddr-un? + (addrlen int :in-out))) + (:function getsockname ("getsockname" int + (socket int) + (my-addr (* t)) ; KLUDGE: sockaddr-in or sockaddr-un? + (addrlen int :in-out))) + (:function connect ("connect" int + (socket int) + (his-addr (* t)) ; KLUDGE: sockaddr-in or sockaddr-un? + (addrlen int ))) + + (:function close ("close" int + (fd int))) + (:function recvfrom ("recvfrom" int + (socket int) + (buf (* t)) + (len integer) + (flags int) + (sockaddr (* t)) ; KLUDGE: sockaddr-in or sockaddr-un? + (socklen (* socklen-t)))) + (:function gethostbyname ("gethostbyname" (* hostent) (name c-string))) + (:function gethostbyaddr ("gethostbyaddr" (* hostent) + (addr (* t)) + (len int) + (af int))) + (:function setsockopt ("setsockopt" int + (socket int) + (level int) + (optname int) (optval (* t)) - (optlen integer))) - (:function fcntl ("fcntl" integer - (fd integer) - (cmd integer) - (arg integer))) - (:function getsockopt ("getsockopt" integer - (socket integer) - (level integer) - (optname integer) + (optlen int))) + (:function fcntl ("fcntl" int + (fd int) + (cmd int) + (arg long))) + (:function getsockopt ("getsockopt" int + (socket int) + (level int) + (optname int) (optval (* t)) - (optlen integer :in-out)))) + (optlen (* int))))) )