ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/src/trunk/sbin/natd/natd.c

Comparing trunk/sbin/natd/natd.c (file contents):
Revision 11105 by laffer1, Sat Sep 17 22:51:26 2016 UTC vs.
Revision 11106 by laffer1, Tue Jun 19 18:30:07 2018 UTC

#	Line 1 | Line 1
1	+	/* $MidnightBSD$ */
2		/*
3		* natd - Network Address Translation Daemon for FreeBSD.
4		*
#	Line 11 | Line 12
12		*/
13
14		#include <sys/cdefs.h>
15	<	__MBSDID("$MidnightBSD$");
15	>	__FBSDID("$FreeBSD: stable/10/sbin/natd/natd.c 293290 2016-01-07 00:40:51Z bdrewery $");
16
17		#define SYSLOG_NAMES
18
#	Line 71 | Line 72 | struct instance {
72		static LIST_HEAD(, instance) root = LIST_HEAD_INITIALIZER(root);
73
74		struct libalias *mla;
75	<	struct instance *mip;
76	<	int ninstance = 1;
75	>	static struct instance *mip;
76	>	static int ninstance = 1;
77
78		/*
79		* Default values for input and output
#	Line 223 | Line 224 | int main (int argc, char** argv)
224		/*
225		* Create divert sockets. Use only one socket if -p was specified
226		* on command line. Otherwise, create separate sockets for
227	<	* outgoing and incoming connnections.
227	>	* outgoing and incoming connections.
228		*/
229		if (mip->inOutPort) {
230
#	Line 1330 | Line 1331 | static void ParseOption (const char* option, const cha
1331		struct in_addr          addrValue;
1332		int                     max;
1333		char*                   end;
1334	<	CODE*                   fac_record = NULL;
1334	>	const CODE*             fac_record = NULL;
1335		/*
1336		* Find option from table.
1337		*/
#	Line 1509 | Line 1510 | static void ParseOption (const char* option, const cha
1510		break;
1511
1512		case LogIpfwDenied:
1513	<	logIpfwDenied = yesNoValue;;
1513	>	logIpfwDenied = yesNoValue;
1514		break;
1515
1516		case PidFile:

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines