[Midnightbsd-cvs] src [11106] trunk/sbin/natd/natd.c: sync

[laffer1 at midnightbsd.org]

Revision: 11106
          http://svnweb.midnightbsd.org/src/?rev=11106
Author:   laffer1
Date:     2018-06-19 14:30:07 -0400 (Tue, 19 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/sbin/natd/Makefile
    trunk/sbin/natd/icmp.c
    trunk/sbin/natd/natd.8
    trunk/sbin/natd/natd.c

Property Changed:
----------------
    trunk/sbin/natd/natd.8

Modified: trunk/sbin/natd/Makefile
===================================================================
--- trunk/sbin/natd/Makefile	2018-06-19 18:29:20 UTC (rev 11105)
+++ trunk/sbin/natd/Makefile	2018-06-19 18:30:07 UTC (rev 11106)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sbin/natd/Makefile 202532 2010-01-17 21:56:27Z ed $
 
 PROG		= natd
 SRCS		= natd.c icmp.c

Modified: trunk/sbin/natd/icmp.c
===================================================================
--- trunk/sbin/natd/icmp.c	2018-06-19 18:29:20 UTC (rev 11105)
+++ trunk/sbin/natd/icmp.c	2018-06-19 18:30:07 UTC (rev 11106)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * natd - Network Address Translation Daemon for FreeBSD.
  *
@@ -9,7 +10,7 @@
  *
  * Ari Suutari <suutari at iki.fi>
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sbin/natd/icmp.c 131567 2004-07-04 12:53:54Z phk $
  */
 
 #include <stdlib.h>

Modified: trunk/sbin/natd/natd.8
===================================================================
--- trunk/sbin/natd/natd.8	2018-06-19 18:29:20 UTC (rev 11105)
+++ trunk/sbin/natd/natd.8	2018-06-19 18:30:07 UTC (rev 11106)
@@ -1,5 +1,6 @@
 .\" $MidnightBSD$
-.Dd June 23, 2008
+.\" $FreeBSD: stable/10/sbin/natd/natd.8 307442 2016-10-16 23:50:09Z sevan $
+.Dd October 5, 2016
 .Dt NATD 8
 .Os
 .Sh NAME
@@ -130,9 +131,9 @@
 172.16.0.0/12 and 192.168.0.0/16.
 .It Fl redirect_port Ar proto Xo
 .Ar targetIP Ns : Ns Xo
-.Ar targetPORT Ns Op - Ns Ar targetPORT Xc
-.Op Ar aliasIP Ns : Ns Xo
-.Ar aliasPORT Ns Op - Ns Ar aliasPORT Xc
+.Ar targetPORT Ns Oo - Ns Ar targetPORT Oc Xc
+.Oo Ar aliasIP Ns : Oc Ns Xo
+.Ar aliasPORT Ns Oo - Ns Ar aliasPORT Oc Xc
 .Oo Ar remoteIP Ns Oo : Ns
 .Ar remotePORT Ns Op - Ns Ar remotePORT
 .Oc Oc
@@ -247,10 +248,8 @@
 .Ar targetIP Ns : Ns Xo
 .Ar targetPORT Ns Oo , Ns
 .Ar ...\&
-.Oc Oc
-.Xc
-.Xc
-.Op Ar aliasIP Ns : Ns Xo
+.Oc Xc Oc Xc
+.Oo Ar aliasIP Ns : Oc Ns Xo
 .Ar aliasPORT
 .Xc
 .Oo Ar remoteIP Ns
@@ -428,7 +427,7 @@
 Each section applies to own
 .Nm
 instance.
-This ability allows to configure one
+This ability allows the configuration of one
 .Nm
 process for several NAT instances.
 The first instance that always exists is a "default" instance.
@@ -811,23 +810,28 @@
 .Xr init 8 ,
 .Xr ipfw 8 ,
 .Xr ppp 8
+.Sh HISTORY
+The
+.Nm
+utility appeared in
+.Fx 3.0 .
 .Sh AUTHORS
 This program is the result of the efforts of many people at different
 times:
 .Pp
-.An Archie Cobbs Aq archie at FreeBSD.org
+.An Archie Cobbs Aq Mt archie at FreeBSD.org
 (divert sockets)
-.An Charles Mott Aq cm at linktel.net
+.An Charles Mott Aq Mt cm at linktel.net
 (packet aliasing)
-.An Eivind Eklund Aq perhaps at yes.no
+.An Eivind Eklund Aq Mt perhaps at yes.no
 (IRC support & misc additions)
-.An Ari Suutari Aq suutari at iki.fi
+.An Ari Suutari Aq Mt suutari at iki.fi
 (natd)
-.An Dru Nelson Aq dnelson at redwoodsoft.com
+.An Dru Nelson Aq Mt dnelson at redwoodsoft.com
 (early PPTP support)
-.An Brian Somers Aq brian at awfulhak.org
+.An Brian Somers Aq Mt brian at awfulhak.org
 (glue)
-.An Ruslan Ermilov Aq ru at FreeBSD.org
+.An Ruslan Ermilov Aq Mt ru at FreeBSD.org
 (natd, packet aliasing, glue)
-.An Poul-Henning Kamp Aq phk at FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk at FreeBSD.org
 (multiple instances)


Property changes on: trunk/sbin/natd/natd.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/natd/natd.c
===================================================================
--- trunk/sbin/natd/natd.c	2018-06-19 18:29:20 UTC (rev 11105)
+++ trunk/sbin/natd/natd.c	2018-06-19 18:30:07 UTC (rev 11106)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * natd - Network Address Translation Daemon for FreeBSD.
  *
@@ -11,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sbin/natd/natd.c 293290 2016-01-07 00:40:51Z bdrewery $");
 
 #define SYSLOG_NAMES
 
@@ -71,8 +72,8 @@
 static LIST_HEAD(, instance) root = LIST_HEAD_INITIALIZER(root);
 
 struct libalias *mla;
-struct instance *mip;
-int ninstance = 1;
+static struct instance *mip;
+static int ninstance = 1;
 
 /* 
  * Default values for input and output
@@ -223,7 +224,7 @@
 /*
  * Create divert sockets. Use only one socket if -p was specified
  * on command line. Otherwise, create separate sockets for
- * outgoing and incoming connnections.
+ * outgoing and incoming connections.
  */
 		if (mip->inOutPort) {
 
@@ -1330,7 +1331,7 @@
 	struct in_addr		addrValue;
 	int			max;
 	char*			end;
-	CODE* 			fac_record = NULL;
+	const CODE* 		fac_record = NULL;
 /*
  * Find option from table.
  */
@@ -1509,7 +1510,7 @@
 		break;
 
 	case LogIpfwDenied:
-		logIpfwDenied = yesNoValue;;
+		logIpfwDenied = yesNoValue;
 		break;
 
 	case PidFile: