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

diff --git a/inet.c b/inet.c
index 3a4dbd5..ad93beb 100644
--- a/inet.c
+++ b/inet.c
@@ -1,89 +1,30 @@
 /* -*-c-*-
  *
- * $Id: inet.c,v 1.6 2003/11/29 20:36:07 mdw Exp $
- *
  * Protocol specific definitions for IPv4 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: inet.c,v $
- * Revision 1.6  2003/11/29 20:36:07  mdw
- * Privileged outgoing connections.
- *
- * Revision 1.5  2003/11/25 14:08:23  mdw
- * Debianization.  Socket target options.  Internet binding.
- *
- * Revision 1.4  2002/01/13 14:49:56  mdw
- * Conditional compilation for @getnetbyname@, since Cygwin doesn't have
- * it.
- *
- * Revision 1.3  2000/08/01 17:59:56  mdw
- * Switch over to using `size_t' for socket address lengths.
- *
- * 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"
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#include <mLib/alloc.h>
-#include <mLib/dstr.h>
-#include <mLib/fdflags.h>
-#include <mLib/report.h>
-#include <mLib/sub.h>
-
-#include "acl.h"
-#include "addr.h"
-#include "conf.h"
-#include "fw.h"
-#include "identify.h"
-#include "inet.h"
-#include "privconn.h"
-#include "reffd.h"
-#include "scan.h"
-#include "socket.h"
+#include "fwd.h"
 
 /*----- Data structures ---------------------------------------------------*/
 
@@ -293,7 +234,7 @@ static int srcopt(scanner *sc, addr_opts *ao)
       /* --- Find the netmask, if any --- */
 
       if (sc->t != '/')
-	m.s_addr = ~0ul;
+	m.s_addr = (in_addr_t)~0ul;
       else {
 	token(sc);
 	DRESET(&d);
@@ -424,7 +365,7 @@ static reffd *inet_accept(int fd, addr_opts *ao, const char *desc)
   inet_srcopts *io = (inet_srcopts *)ao;
   int nfd;
   id_req q;
-  size_t lsinsz = sizeof(q.lsin), rsinsz = sizeof(q.rsin);
+  socklen_t lsinsz = sizeof(q.lsin), rsinsz = sizeof(q.rsin);
   int act = ACL_ALLOW;
 
   /* --- Accept the new connection --- */
@@ -499,7 +440,7 @@ addr_ops inet_ops = {
   inet_initsrcopts, inet_option, inet_confirm, inet_freesrcopts,
   inet_bind, 0, inet_accept,
   inet_inittargopts, inet_freetargopts,
-  inet_connect  
+  inet_connect
 };
 
 /*----- That's all, folks -------------------------------------------------*/