And a typo fix.

[fwd] / un.c

diff --git a/un.c b/un.c
index c0a2cc9..f701f6a 100644 (file)
--- a/un.c
+++ b/un.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: un.c,v 1.1 1999/07/26 23:34:11 mdw Exp $
+ * $Id: un.c,v 1.7 2003/11/29 20:36:07 mdw Exp $
  *
  * Protocol specific definitions for Unix-domain sockets
  *
@@ -29,6 +29,24 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: un.c,v $
+ * Revision 1.7  2003/11/29 20:36:07  mdw
+ * Privileged outgoing connections.
+ *
+ * Revision 1.6  2003/11/25 14:08:23  mdw
+ * Debianization.  Socket target options.  Internet binding.
+ *
+ * Revision 1.5  2002/02/22 23:43:32  mdw
+ * Call @xfree@ rather than @free@.
+ *
+ * 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.
  *
@@ -37,8 +55,8 @@
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
+#undef sun /* Cretins */
 
-#include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <stddef.h>
@@ -65,6 +83,7 @@
 #include "fw.h"
 #include "reffd.h"
 #include "scan.h"
+#include "socket.h"
 #include "un.h"
 
 /*----- Data structures ---------------------------------------------------*/
@@ -94,6 +113,7 @@ static addr *un_read(scanner *sc, unsigned type)
               d.len + 1);
   ua->a.ops = &un_ops;
   ua->a.sz = offsetof(struct sockaddr_un, sun_path) + d.len + 1;
+  memset(&ua->sun, 0, ua->a.sz);
   ua->sun.sun_family = AF_UNIX;
   memcpy(ua->sun.sun_path, d.buf, d.len + 1);
   dstr_destroy(&d);
@@ -105,7 +125,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@ --- */
@@ -128,7 +148,7 @@ 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")
@@ -139,6 +159,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)
@@ -151,7 +179,7 @@ static reffd *un_accept(int fd, addr_opts *ao, const char *desc)
   {
     char buf[PATH_MAX + sizeof(struct sockaddr)];
     struct sockaddr_un *sun = (struct sockaddr_un *)buf;
-    int sunsz = sizeof(buf);
+    size_t sunsz = sizeof(buf);
  
     if ((nfd = accept(fd, (struct sockaddr *)sun, &sunsz)) < 0)
       return (0);
@@ -176,19 +204,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@ --- */
@@ -199,12 +234,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 -------------------------------------------------*/