Started adding SRFI-106

Makefile

@@ -10,7 +10,7 @@ VERSION=$(shell cat srfi/${SRFI}/VERSION)
 DESCRIPTION=$(shell head -n1 srfi/${SRFI}/README.md)
 README=srfi/${SRFI}/README.html
 TESTFILE=srfi/${SRFI}/test.scm
-TMPDIR=./tmp/${SCHEME}
+TMPDIR=.tmp/${SCHEME}
 
 PKG=srfi-${SRFI}-${VERSION}.tgz
 
@@ -39,7 +39,7 @@ test-r7rs: tmpdir
 	cd ${TMPDIR} && printf "\n" | ./test-r7rs
 
 test-r7rs-docker:
-	docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=foreign-c-srfi-test-${SCHEME} --quiet .
+	docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=foreign-c-srfi-test-${SCHEME} .
 	docker run -t foreign-c-srfi-test-${SCHEME} sh -c "make SCHEME=${SCHEME} SRFI=${SRFI} SNOW_CHIBI_ARGS=--always-yes build install test-r7rs"
 
 test-r6rs: tmpdir
@@ -50,7 +50,7 @@ test-r6rs: tmpdir
 	cd ${TMPDIR} && ./test-r6rs
 
 test-r6rs-docker:
-	docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=foreign-c-srfi-test-${SCHEME} --quiet .
+	docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=foreign-c-srfi-test-${SCHEME} .
 	docker run -t foreign-c-srfi-test-${SCHEME} sh -c "make SCHEME=${SCHEME} SRFI=${SRFI} test-r6rs"
 
 tmpdir:

srfi/106.scm

@@ -0,0 +1,151 @@
+(define-c-library libc
+                  `("sys/types.h" "sys/socket.h" "netdb.h" "errno.h" "fcntl.h" "poll.h")
+                  libc-name
+                  '((additional-versions ("0" "6"))))
+
+(define-c-procedure c-socket libc 'socket 'int '(int int int))
+(define-c-procedure c-getaddrinfo libc 'getaddrinfo 'int '(pointer pointer pointer pointer))
+(define-c-procedure c-connect libc 'connect 'int '(int pointer int))
+(define-c-procedure c-perror libc 'perror 'void '(pointer))
+(define-c-procedure c-fcntl libc 'fcntl 'int '(int int int))
+(define-c-procedure c-send libc 'send 'int '(int pointer int int))
+(define-c-procedure c-read libc 'read 'int '(int pointer int))
+(define-c-procedure c-poll libc 'poll 'int '(pointer int int))
+
+
+(define-record-type <socket>
+  (make-socket file-descriptor)
+  socket?
+  (file-descriptor socket-file-descriptor))
+
+(define *af-inet* 2)
+(define *af-inet6* 10)
+(define *af-unspec* 0)
+
+(define *sock-stream* 1)
+(define *sock-dgram* 2)
+
+(define *ai-canonname* 2)
+(define *ai-numerichost* 4)
+(define *ai-v4mapped* 8)
+(define *ai-all* 16)
+(define *ai-addrconfig* 32)
+
+(define *ipproto-ip* 0)
+(define *ipproto-tcp* 6)
+(define *ipproto-udp* 17)
+
+(define *msg-peek* 17)
+(define *msg-oob* 1)
+(define *msg-waitall* 256)
+
+(define *shut-rd* 0)
+(define *shut-wr* 1)
+(define *shut-rdwr* 2)
+
+(define F-SETFL 4)
+(define O-NONBLOCK 2048)
+(define EINPROGRESS 115)
+(define SOL-SOCKET 1)
+(define SO-ERROR 4)
+(define POLLIN 1)
+(define POLLOUT 4)
+
+(define socket-merge-flags (lambda flags (apply + flags)))
+(define (socket-purge-flags base-flag . flags) (apply - (cons base-flag flags)))
+
+(define (make-client-socket node service . args)
+  (let* ((ai-family (if (>= (length args) 1) (list-ref args 0) *af-inet*))
+         (ai-socktype (if (>= (length args) 2) (list-ref args 1) *sock-stream*))
+         (ai-flags (if (>= (length args) 3)
+                     (list-ref args 2)
+                     (socket-merge-flags *ai-v4mapped* *ai-addrconfig*)))
+         (ai-protocol (if (>= (length args) 4) (list-ref args 3) *ipproto-ip*))
+         (binary-address (make-c-bytevector 128 0))
+         (addrinfo-hints (let ((pointer (make-c-bytevector 128 0)))
+                           (c-bytevector-sint-set! pointer
+                                                   (c-type-size 'int)
+                                                   ai-family
+                                                   (native-endianness)
+                                                   (c-type-size 'int))
+                           (c-bytevector-sint-set! pointer
+                                                   (* (c-type-size 'int) 2)
+                                                   ai-socktype
+                                                   (native-endianness)
+                                                   (c-type-size 'int))
+                           pointer))
+         (addrinfo (make-c-bytevector 128 0))
+         (addrinfo-result
+           (call-with-address-of
+             addrinfo
+             (lambda (addrinfo-address)
+               (call-with-address-of
+                 addrinfo-hints
+                 (lambda (addrinfo-hints-address)
+                   (c-getaddrinfo (string->c-utf8 node)
+                                  (string->c-utf8 service)
+                                  addrinfo-hints
+                                  addrinfo-address))))))
+         (socket-file-descriptor
+           (c-socket
+             ;; ai-family
+             (c-bytevector-sint-ref addrinfo
+                                    (c-type-size 'int)
+                                    (native-endianness)
+                                    (c-type-size 'int))
+             ;; ai-socktype
+             (c-bytevector-sint-ref addrinfo
+                                    (* (c-type-size 'int) 2)
+                                    (native-endianness)
+                                    (c-type-size 'int))
+             ;; ai-protocol
+             (c-bytevector-sint-ref addrinfo
+                                    (* (c-type-size 'int) 3)
+                                    (native-endianness)
+                                    (c-type-size 'int)))))
+    (when (< addrinfo-result 0)
+      (c-perror (string->c-utf8 "Failed get address"))
+      (exit 1))
+    (when (< socket-file-descriptor 0)
+      (c-perror (string->c-utf8 "Failed to create socket"))
+      (exit 1))
+    (when (< (c-fcntl socket-file-descriptor F-SETFL O-NONBLOCK) 0)
+      (c-perror (string->c-utf8 "Failed to set the socket to nonblocking")))
+    (letrec* ((connect-result (c-connect socket-file-descriptor
+                                         ;; ai-addr
+                                         (c-bytevector-pointer-ref addrinfo
+                                                                (* (c-type-size 'int) 6)
+                                                                )
+                                         ;; ai-addrlen
+                                         (c-bytevector-sint-ref addrinfo
+                                                                (* (c-type-size 'int) 4)
+                                                                (native-endianness)
+                                                                (c-type-size 'int))))
+              (pollfd (make-c-bytevector 128 0)))
+      (c-bytevector-sint-set! pollfd
+                              0
+                              socket-file-descriptor
+                              (native-endianness)
+                              (c-type-size 'int))
+      (c-bytevector-sint-set! pollfd
+                              0
+                              0 ;POLLOUT & POLLIN
+                              (native-endianness)
+                              (c-type-size 'int))
+      ;; TODO Why 8 works but 1 does not?
+      (when (= (c-poll pollfd 8 5000) 0)
+        (error "Connection timed out")))
+
+
+    (let ((msg (string->c-utf8 "Hello"))
+          (msg-len 5))
+      (display "HERE:")
+      (when (= (c-send socket-file-descriptor msg msg-len 0) -1)
+        (c-perror (string->c-utf8 "Sending erorr"))
+        (exit 1)
+        )
+      )
+
+    (make-socket socket-file-descriptor)))
+
+

srfi/106.sld

@@ -1,24 +1,26 @@
 (define-library
   (srfi 106)
   (import (scheme base)
+          (scheme write)
+          (scheme process-context)
           (foreign c))
   (export make-client-socket
-          make-server-socket
+          ;make-server-socket
-          socket?
+          ;socket?
-          socket-accept
+          ;socket-accept
           socket-send
-          socket-recv
+          ;socket-recv
-          socket-shutdown
+          ;socket-shutdown
-          socket-close
+          ;socket-close
-          socket-input-port
+          ;socket-input-port
-          socket-output-port
+          ;socket-output-port
-          call-with-socket
+          ;call-with-socket
-          address-family
+          ;address-family
-          address-info
+          ;address-info
-          socket-domain
+          ;socket-domain
-          ip-protocol
+          ;ip-protocol
-          message-type
+          ;message-type
-          shutdown-method
+          ;shutdown-method
           socket-merge-flags
           socket-purge-flags
           *af-unspec*

srfi/106/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

srfi/106/README.md

@@ -0,0 +1 @@
+SRFI-106: Basic socket interface

srfi/106/VERSION

@@ -0,0 +1 @@
+0.1.0

srfi/106/test.scm

@@ -0,0 +1,7 @@
+
+(define client-socket (make-client-socket "127.0.0.1" "3000"))
+
+(socket-send client-socket (string->utf8 "Hello from test"))
+
+(write client-socket)
+(newline)