Changeset 27293 in project

Timestamp:

08/24/12 16:42:35 (9 years ago)

Author:

felix winkelmann

Message:

unix-sockets 1.7: added unix-pair, contributed by zb centuries ago

Location:

release/4/unix-sockets

Files:

• tags/1.7 (copied) (copied from release/4/unix-sockets/trunk)
• tags/1.7/unix-sockets.scm (modified) (3 diffs)
• tags/1.7/unix-sockets.setup (modified) (1 diff)
• trunk/unix-sockets.scm (modified) (3 diffs)
• trunk/unix-sockets.setup (modified) (1 diff)

release/4/unix-sockets/tags/1.7/unix-sockets.scm

@@ -43 +43 @@
    unix-close
    unix-listener?
-   unix-listen)
+   unix-listen
+   unix-pair)
 
 ;; TODO: errno should be accessed using the proper API?
@@ -127 +128 @@
   return s2;
 }
+
+static int
+create_socket_pair(___out int *s2)
+{
+  int s1, rc;
+  int pair[2];
+  rc = socketpair(PF_LOCAL, SOCK_STREAM, 0, pair);
+  if (rc < 0) return -1;
+  s1 = pair[0];
+  *s2 = pair[1];
+  return s1;
+}
+
 <#
 
@@ -152 +166 @@
         (unix-error 'unix-connect "can not connect" filename)
         (io-ports 'unix-connect n) ) ) )
+
+(define (unix-pair)
+  (let-values (((s1 s2) (create_socket_pair)))
+    (if (negative? s1)
+        (unix-error 'unix-pair "cannot create socket pair")
+        (let-values (((i1 o1) (io-ports 'unix-pair s1))
+                     ((i2 o2) (io-ports 'unix-pair s2)))
+          (values i1 o1 i2 o2)))))
 
 (define-constant +buffer-size+ 1024)

release/4/unix-sockets/tags/1.7/unix-sockets.setup

@@ -8 +8 @@
  'unix-sockets
  '("unix-sockets.so" "unix-sockets.import.so") 
- '((version 1.6)))
+ '((version 1.7)))

release/4/unix-sockets/trunk/unix-sockets.scm

@@ -43 +43 @@
    unix-close
    unix-listener?
-   unix-listen)
+   unix-listen
+   unix-pair)
 
 ;; TODO: errno should be accessed using the proper API?
@@ -127 +128 @@
   return s2;
 }
+
+static int
+create_socket_pair(___out int *s2)
+{
+  int s1, rc;
+  int pair[2];
+  rc = socketpair(PF_LOCAL, SOCK_STREAM, 0, pair);
+  if (rc < 0) return -1;
+  s1 = pair[0];
+  *s2 = pair[1];
+  return s1;
+}
+
 <#
 
@@ -152 +166 @@
         (unix-error 'unix-connect "can not connect" filename)
         (io-ports 'unix-connect n) ) ) )
+
+(define (unix-pair)
+  (let-values (((s1 s2) (create_socket_pair)))
+    (if (negative? s1)
+        (unix-error 'unix-pair "cannot create socket pair")
+        (let-values (((i1 o1) (io-ports 'unix-pair s1))
+                     ((i2 o2) (io-ports 'unix-pair s2)))
+          (values i1 o1 i2 o2)))))
 
 (define-constant +buffer-size+ 1024)

release/4/unix-sockets/trunk/unix-sockets.setup

@@ -8 +8 @@
  'unix-sockets
  '("unix-sockets.so" "unix-sockets.import.so") 
- '((version 1.6)))
+ '((version 1.7)))