Unix: Implement sk_connect_unix

2 files changed, 29 insertions, 0 deletions

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 9d54a2c3..3aba48d2 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -1512,6 +1512,34 @@ sk_open_unix(sock *s, char *name)
   return 0;
 }
 
+int
+sk_connect_unix(sock *s, char *name)
+{
+  struct sockaddr_un sa;
+  int fd;
+
+  /* We are sloppy during error (leak fd and not set s->err), but we die anyway */
+
+  fd = socket(AF_UNIX, SOCK_STREAM, 0);
+  if (fd < 0)
+    return -1;
+
+  if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
+    return -1;
+
+  /* Path length checked in test_old_bird() */
+  sa.sun_family = AF_UNIX;
+  strcpy(sa.sun_path, name);
+
+  if (connect(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) < 0)
+    return -1;
+
+  s->fd = fd;
+  s->type = SK_UNIX;
+  sk_insert(s);
+  return 0;
+}
+
 
 #define CMSG_RX_SPACE MAX(CMSG4_SPACE_PKTINFO+CMSG4_SPACE_TTL, \
 			  CMSG6_SPACE_PKTINFO+CMSG6_SPACE_TTL)
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index 8244fc86..746a3590 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -107,6 +107,7 @@ void io_loop(void);
 void io_log_dump(void);
 int sk_open_unix(struct birdsock *s, char *name);
 struct rfile *rf_open(struct pool *, const char *name, const char *mode);
+int sk_connect_unix(struct birdsock *s, char *name);
 void *rf_file(struct rfile *f);
 int rf_fileno(struct rfile *f);
 void test_old_bird(char *path);