X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/ee599f5566c155b4decd9c77bfa4d6212f20891e..755e6619263d316dc46fa504e0c333c963ec8eaa:/un.c

diff --git a/un.c b/un.c
index f701f6a..1ee5363 100644
--- a/un.c
+++ b/un.c
@@ -1,90 +1,30 @@
 /* -*-c-*-
  *
- * $Id: un.c,v 1.7 2003/11/29 20:36:07 mdw Exp $
- *
  * Protocol specific definitions for Unix-domain sockets
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
- * This file is part of the `fw' port forwarder.
+ * This file is part of the `fwd' port forwarder.
  *
- * `fw' is free software; you can redistribute it and/or modify
+ * `fwd' is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
- * `fw' is distributed in the hope that it will be useful,
+ *
+ * `fwd' is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
- * along with `fw'; if not, write to the Free Software Foundation,
+ * along with `fwd'; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- 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.
- *
- */
-
-/*----- Header files ------------------------------------------------------*/
-
-#include "config.h"
-#undef sun /* Cretins */
-
-#include <errno.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#include <mLib/alloc.h>
-#include <mLib/dstr.h>
-#include <mLib/report.h>
-#include <mLib/sub.h>
-
-#include "addr.h"
-#include "conf.h"
-#include "fattr.h"
-#include "fw.h"
-#include "reffd.h"
-#include "scan.h"
-#include "socket.h"
-#include "un.h"
+#include "fwd.h"
 
 /*----- Data structures ---------------------------------------------------*/
 
@@ -107,7 +47,7 @@ static addr *un_read(scanner *sc, unsigned type)
   dstr d = DSTR_INIT;
   un_addr *ua;
 
-  conf_name(sc, '/', &d);
+  conf_fname(sc, &d);
   ua = xmalloc(sizeof(addr) +
 	       offsetof(struct sockaddr_un, sun_path) +
 	       d.len + 1);
@@ -151,7 +91,7 @@ static addr_opts *un_initopts(void)
 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;
@@ -179,8 +119,8 @@ 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;
-    size_t sunsz = sizeof(buf);
- 
+    socklen_t sunsz = sizeof(buf);
+
     if ((nfd = accept(fd, (struct sockaddr *)sun, &sunsz)) < 0)
       return (0);
   }