X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/bc241e9852f14199c850f88e727abb39acdf90c6..9515272fc0a92f82c056a9b8bca0633822e14d9c:/un.c

diff --git a/un.c b/un.c
index 8740b81..6fd46b4 100644
--- a/un.c
+++ b/un.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: un.c,v 1.4 2000/08/01 17:59:56 mdw Exp $
+ * $Id: un.c,v 1.9 2004/04/08 01:36:25 mdw Exp $
  *
  * Protocol specific definitions for Unix-domain sockets
  *
@@ -26,23 +26,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: un.c,v $
- * Revision 1.4  2000/08/01 17:59:56  mdw
- * Switch over to using `size_t' for socket address lengths.
- *
- * Revision 1.3  2000/08/01 17:58:32  mdw
- * Remove unnecessary <ctype.h> header.
- *
- * Revision 1.2  1999/07/27 18:30:53  mdw
- * Various minor portability fixes.
- *
- * Revision 1.1  1999/07/26 23:34:11  mdw
- * New socket address types.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -74,6 +57,7 @@
 #include "fw.h"
 #include "reffd.h"
 #include "scan.h"
+#include "socket.h"
 #include "un.h"
 
 /*----- Data structures ---------------------------------------------------*/
@@ -115,7 +99,7 @@ static addr *un_read(scanner *sc, unsigned type)
 static void un_destroy(addr *a)
 {
   un_addr *ua = (un_addr *)a;
-  free(ua);
+  xfree(ua);
 }
 
 /* --- @print@ --- */
@@ -138,10 +122,10 @@ static addr_opts *un_initopts(void)
 
 /* --- @option@ --- */
 
-static int un_option(scanner *sc, addr_opts *ao)
+static int srcopt(scanner *sc, addr_opts *ao)
 {
   un_opts *uo = (un_opts *)ao;
-  CONF_BEGIN(sc, "unix", "Unix domain socket")
+  CONF_BEGIN(sc, "source", "Unix domain socket source")
 
   if (fattr_option(sc, uo ? &uo->f : &fattr_global))
     CONF_ACCEPT;
@@ -149,6 +133,14 @@ static int un_option(scanner *sc, addr_opts *ao)
   CONF_END;
 }
 
+static int un_option(scanner *sc, addr_opts *ao, unsigned type)
+{
+  CONF_BEGIN(sc, "unix", "Unix domain socket");
+  if (type != ADDR_DEST && srcopt(sc, ao))
+    CONF_ACCEPT;
+  CONF_END;
+}
+
 /* --- @accept@ --- */
 
 static reffd *un_accept(int fd, addr_opts *ao, const char *desc)
@@ -186,19 +178,26 @@ static void un_freeopts(addr_opts *ao)
   DESTROY(uo);
 }
 
-/* --- @bound@ --- */
+/* --- @bind@ --- */
 
-static void un_bound(addr *a, addr_opts *ao)
+static int un_bind(addr *a, addr_opts *ao)
 {
   un_addr *ua = (un_addr *)a;
   un_opts *uo = (un_opts *)ao;
-  if (fattr_apply(ua->sun.sun_path, &uo->f)) {
-    dstr d = DSTR_INIT;
-    un_print(a, ADDR_SRC, &d);
-    fw_log(-1, "[%s] couldn't apply file attributes: %s",
-	   d.buf, strerror(errno));
-    dstr_destroy(&d);
-  }
+  int fd;
+
+  if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+    goto fail_0;
+  if (bind(fd, (struct sockaddr *)&ua->sun, sizeof(ua->sun)))
+    goto fail_1;
+  if (fattr_apply(ua->sun.sun_path, &uo->f))
+    goto fail_1;
+  return (fd);
+
+fail_1:
+  close(fd);
+fail_0:
+  return (-1);
 }
 
 /* --- @unbind@ --- */
@@ -209,12 +208,28 @@ static void un_unbind(addr *a)
   unlink(ua->sun.sun_path);
 }
 
+/* --- @connect@ --- */
+
+static int un_connect(addr *a, addr_opts *ao, conn *c, endpt *e)
+{
+  un_addr *ua = (un_addr *)a;
+  int fd;
+
+  if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
+    goto fail_0;
+  return (conn_init(c, sel, fd, (struct sockaddr *)&ua->sun, sizeof(ua->sun),
+		    starget_connected, e));
+fail_0:
+  return (-1);
+}
+
 /* --- Protocol definition --- */
 
 addr_ops un_ops = {
-  "unix", PF_UNIX,
+  "unix",
   un_read, un_destroy, un_print,
-  un_initopts, un_option, un_accept, un_freeopts, un_bound, un_unbind
+  un_initopts, un_option, 0, un_freeopts, un_bind, un_unbind, un_accept,
+  0, 0, un_connect
 };
 
 /*----- That's all, folks -------------------------------------------------*/