As per the developers handbook (5.3.1 step 1), prepare the vendor trees for

import of new ipfilter vendor sources by flattening them.

To keep the tags consistent with dist, the tags are also flattened.

Approved by:	glebius (Mentor)

1 files changed, 0 insertions, 1732 deletions

diff --git a/contrib/ipfilter/tools/ipmon.c b/contrib/ipfilter/tools/ipmon.c
deleted file mode 100644
index f07396d..0000000
--- a/contrib/ipfilter/tools/ipmon.c
+++ /dev/null
@@ -1,1732 +0,0 @@
-/*
- * Copyright (C) 2001-2006 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- */
-#ifndef SOLARIS
-#define SOLARIS (defined(__SVR4) || defined(__svr4__)) && defined(sun)
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#define _KERNEL
-#include <sys/uio.h>
-#undef _KERNEL
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <time.h>
-#if !defined(__SVR4) && !defined(__svr4__)
-# if (__FreeBSD_version >= 300000)
-#  include <sys/dirent.h>
-# else
-#  include <sys/dir.h>
-# endif
-#else
-# include <sys/filio.h>
-# include <sys/byteorder.h>
-#endif
-#if !defined(__hpux) && (!defined(__SVR4) && !defined(__GNUC__))
-# include <strings.h>
-#endif
-#include <signal.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <net/if.h>
-#include <netinet/ip.h>
-#if !defined(__hpux) && !defined(linux)
-# include <netinet/tcp_fsm.h>
-#endif
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#ifdef	__hpux
-# undef	NOERROR
-#endif
-#include <resolv.h>
-
-#if !defined(linux)
-# include <sys/protosw.h>
-# include <netinet/ip_var.h>
-#endif
-
-#include <netinet/tcp.h>
-#include <netinet/ip_icmp.h>
-
-#include <ctype.h>
-#include <syslog.h>
-
-#include "netinet/ip_compat.h"
-#include <netinet/tcpip.h>
-#include "netinet/ip_fil.h"
-#include "netinet/ip_nat.h"
-#include "netinet/ip_state.h"
-#include "netinet/ip_proxy.h"
-#include "ipmon.h"
-
-#if !defined(lint)
-static const char sccsid[] = "@(#)ipmon.c	1.21 6/5/96 (C)1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ipmon.c,v 1.33.2.20 2007/09/20 12:51:56 darrenr Exp $";
-#endif
-
-
-#if	defined(sun) && !defined(SOLARIS2)
-#define	STRERROR(x)	sys_errlist[x]
-extern	char	*sys_errlist[];
-#else
-#define	STRERROR(x)	strerror(x)
-#endif
-
-
-struct	flags {
-	int	value;
-	char	flag;
-};
-
-
-typedef	struct	icmp_subtype {
-	int	ist_val;
-	char	*ist_name;
-} icmp_subtype_t;
-
-typedef	struct	icmp_type {
-	int	it_val;
-	struct	icmp_subtype *it_subtable;
-	size_t	it_stsize;
-	char	*it_name;
-} icmp_type_t;
-
-
-#define	IST_SZ(x)	(sizeof(x)/sizeof(icmp_subtype_t))
-
-
-struct	flags	tcpfl[] = {
-	{ TH_ACK, 'A' },
-	{ TH_RST, 'R' },
-	{ TH_SYN, 'S' },
-	{ TH_FIN, 'F' },
-	{ TH_URG, 'U' },
-	{ TH_PUSH,'P' },
-	{ TH_ECN, 'E' },
-	{ TH_CWR, 'C' },
-	{ 0, '\0' }
-};
-
-#ifdef	MENTAT
-static	char	*pidfile = "/etc/opt/ipf/ipmon.pid";
-#else
-# if BSD >= 199306
-static	char	*pidfile = "/var/run/ipmon.pid";
-# else
-static	char	*pidfile = "/etc/ipmon.pid";
-# endif
-#endif
-
-static	char	line[2048];
-static	int	opts = 0;
-static	char	*logfile = NULL;
-static	FILE	*binarylog = NULL;
-static	char	*binarylogfile = NULL;
-static	int	donehup = 0;
-static	void	usage __P((char *));
-static	void	handlehup __P((int));
-static	void	flushlogs __P((char *, FILE *));
-static	void	print_log __P((int, FILE *, char *, int));
-static	void	print_ipflog __P((FILE *, char *, int));
-static	void	print_natlog __P((FILE *, char *, int));
-static	void	print_statelog __P((FILE *, char *, int));
-static	int	read_log __P((int, int *, char *, int));
-static	void	write_pid __P((char *));
-static	char	*icmpname __P((u_int, u_int));
-static	char	*icmpname6 __P((u_int, u_int));
-static	icmp_type_t *find_icmptype __P((int, icmp_type_t *, size_t));
-static	icmp_subtype_t *find_icmpsubtype __P((int, icmp_subtype_t *, size_t));
-#ifdef __hpux
-static	struct	tm	*get_tm __P((u_32_t));
-#else
-static	struct	tm	*get_tm __P((time_t));
-#endif
-
-char	*hostname __P((int, int, u_32_t *));
-char	*portname __P((int, char *, u_int));
-int	main __P((int, char *[]));
-
-static	void	logopts __P((int, char *));
-static	void	init_tabs __P((void));
-static	char	*getproto __P((u_int));
-
-static	char	**protocols = NULL;
-static	char	**udp_ports = NULL;
-static	char	**tcp_ports = NULL;
-static	char	*conf_file = NULL;
-
-
-#define	OPT_SYSLOG	0x001
-#define	OPT_RESOLVE	0x002
-#define	OPT_HEXBODY	0x004
-#define	OPT_VERBOSE	0x008
-#define	OPT_HEXHDR	0x010
-#define	OPT_TAIL	0x020
-#define	OPT_NAT		0x080
-#define	OPT_STATE	0x100
-#define	OPT_FILTER	0x200
-#define	OPT_PORTNUM	0x400
-#define	OPT_LOGALL	(OPT_NAT|OPT_STATE|OPT_FILTER)
-#define	OPT_LOGBODY	0x800
-
-#define	HOSTNAME_V4(a,b)	hostname((a), 4, (u_32_t *)&(b))
-
-#ifndef	LOGFAC
-#define	LOGFAC	LOG_LOCAL0
-#endif
-int	logfac = LOGFAC;
-
-
-static icmp_subtype_t icmpunreachnames[] = {
-	{ ICMP_UNREACH_NET,		"net" },
-	{ ICMP_UNREACH_HOST,		"host" },
-	{ ICMP_UNREACH_PROTOCOL,	"protocol" },
-	{ ICMP_UNREACH_PORT,		"port" },
-	{ ICMP_UNREACH_NEEDFRAG,	"needfrag" },
-	{ ICMP_UNREACH_SRCFAIL,		"srcfail" },
-	{ ICMP_UNREACH_NET_UNKNOWN,	"net_unknown" },
-	{ ICMP_UNREACH_HOST_UNKNOWN,	"host_unknown" },
-	{ ICMP_UNREACH_NET,		"isolated" },
-	{ ICMP_UNREACH_NET_PROHIB,	"net_prohib" },
-	{ ICMP_UNREACH_NET_PROHIB,	"host_prohib" },
-	{ ICMP_UNREACH_TOSNET,		"tosnet" },
-	{ ICMP_UNREACH_TOSHOST,		"toshost" },
-	{ ICMP_UNREACH_ADMIN_PROHIBIT,	"admin_prohibit" },
-	{ -2,				NULL }
-};
-
-static icmp_subtype_t redirectnames[] = {
-	{ ICMP_REDIRECT_NET,		"net" },
-	{ ICMP_REDIRECT_HOST,		"host" },
-	{ ICMP_REDIRECT_TOSNET,		"tosnet" },
-	{ ICMP_REDIRECT_TOSHOST,	"toshost" },
-	{ -2,				NULL }
-};
-
-static icmp_subtype_t timxceednames[] = {
-	{ ICMP_TIMXCEED_INTRANS,	"transit" },
-	{ ICMP_TIMXCEED_REASS,		"reassem" },
-	{ -2,				NULL }
-};
-
-static icmp_subtype_t paramnames[] = {
-	{ ICMP_PARAMPROB_ERRATPTR,	"errata_pointer" },
-	{ ICMP_PARAMPROB_OPTABSENT,	"optmissing" },
-	{ ICMP_PARAMPROB_LENGTH,	"length" },
-	{ -2,				NULL }
-};
-
-static icmp_type_t icmptypes[] = {
-	{ ICMP_ECHOREPLY,	NULL,	0,		"echoreply" },
-	{ -1,			NULL,	0,		NULL },
-	{ -1,			NULL,	0,		NULL },
-	{ ICMP_UNREACH,		icmpunreachnames,
-				IST_SZ(icmpunreachnames),"unreach" },
-	{ ICMP_SOURCEQUENCH,	NULL,	0,		"sourcequench" },
-	{ ICMP_REDIRECT,	redirectnames,
-				IST_SZ(redirectnames),	"redirect" },
-	{ -1,			NULL,	0,		NULL },
-	{ -1,			NULL,	0,		NULL },
-	{ ICMP_ECHO,		NULL,	0,		"echo" },
-	{ ICMP_ROUTERADVERT,	NULL,	0,		"routeradvert" },
-	{ ICMP_ROUTERSOLICIT,	NULL,	0,		"routersolicit" },
-	{ ICMP_TIMXCEED,	timxceednames,
-				IST_SZ(timxceednames),	"timxceed" },
-	{ ICMP_PARAMPROB,	paramnames,
-				IST_SZ(paramnames),	"paramprob" },
-	{ ICMP_TSTAMP,		NULL,	0,		"timestamp" },
-	{ ICMP_TSTAMPREPLY,	NULL,	0,		"timestampreply" },
-	{ ICMP_IREQ,		NULL,	0,		"inforeq" },
-	{ ICMP_IREQREPLY,	NULL,	0,		"inforeply" },
-	{ ICMP_MASKREQ,		NULL,	0,		"maskreq" },
-	{ ICMP_MASKREPLY,	NULL,	0,		"maskreply" },
-	{ -2,			NULL,	0,		NULL }
-};
-
-static icmp_subtype_t icmpredirect6[] = {
-	{ ICMP6_DST_UNREACH_NOROUTE,		"noroute" },
-	{ ICMP6_DST_UNREACH_ADMIN,		"admin" },
-	{ ICMP6_DST_UNREACH_NOTNEIGHBOR,	"neighbour" },
-	{ ICMP6_DST_UNREACH_ADDR,		"address" },
-	{ ICMP6_DST_UNREACH_NOPORT,		"noport" },
-	{ -2,					NULL }
-};
-
-static icmp_subtype_t icmptimexceed6[] = {
-	{ ICMP6_TIME_EXCEED_TRANSIT,		"intransit" },
-	{ ICMP6_TIME_EXCEED_REASSEMBLY,		"reassem" },
-	{ -2,					NULL }
-};
-
-static icmp_subtype_t icmpparamprob6[] = {
-	{ ICMP6_PARAMPROB_HEADER,		"header" },
-	{ ICMP6_PARAMPROB_NEXTHEADER,		"nextheader" },
-	{ ICMP6_PARAMPROB_OPTION,		"option" },
-	{ -2,					NULL }
-};
-
-static icmp_subtype_t icmpquerysubject6[] = {
-	{ ICMP6_NI_SUBJ_IPV6,			"ipv6" },
-	{ ICMP6_NI_SUBJ_FQDN,			"fqdn" },
-	{ ICMP6_NI_SUBJ_IPV4,			"ipv4" },
-	{ -2,					NULL },
-};
-
-static icmp_subtype_t icmpnodeinfo6[] = {
-	{ ICMP6_NI_SUCCESS,			"success" },
-	{ ICMP6_NI_REFUSED,			"refused" },
-	{ ICMP6_NI_UNKNOWN,			"unknown" },
-	{ -2,					NULL }
-};
-
-static icmp_subtype_t icmprenumber6[] = {
-	{ ICMP6_ROUTER_RENUMBERING_COMMAND,		"command" },
-	{ ICMP6_ROUTER_RENUMBERING_RESULT,		"result" },
-	{ ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET,	"seqnum_reset" },
-	{ -2,						NULL }
-};
-
-static icmp_type_t icmptypes6[] = {
-	{ 0,			NULL,	0,		NULL },
-	{ ICMP6_DST_UNREACH,	icmpredirect6,
-			IST_SZ(icmpredirect6),		"unreach" },
-	{ ICMP6_PACKET_TOO_BIG,	NULL,	0,		"toobig" },
-	{ ICMP6_TIME_EXCEEDED,	icmptimexceed6,
-			IST_SZ(icmptimexceed6),		"timxceed" },
-	{ ICMP6_PARAM_PROB,	icmpparamprob6,
-			IST_SZ(icmpparamprob6),		"paramprob" },
-	{ ICMP6_ECHO_REQUEST,	NULL,	0,		"echo" },
-	{ ICMP6_ECHO_REPLY,	NULL,	0,		"echoreply" },
-	{ ICMP6_MEMBERSHIP_QUERY, icmpquerysubject6,
-			IST_SZ(icmpquerysubject6),	"groupmemberquery" },
-	{ ICMP6_MEMBERSHIP_REPORT,NULL,	0,		"groupmemberreport" },
-	{ ICMP6_MEMBERSHIP_REDUCTION,NULL,	0,	"groupmemberterm" },
-	{ ND_ROUTER_SOLICIT,	NULL,	0,		"routersolicit" },
-	{ ND_ROUTER_ADVERT,	NULL,	0,		"routeradvert" },
-	{ ND_NEIGHBOR_SOLICIT,	NULL,	0,		"neighborsolicit" },
-	{ ND_NEIGHBOR_ADVERT,	NULL,	0,		"neighboradvert" },
-	{ ND_REDIRECT,		NULL,	0,		"redirect" },
-	{ ICMP6_ROUTER_RENUMBERING,	icmprenumber6,
-			IST_SZ(icmprenumber6),		"routerrenumber" },
-	{ ICMP6_WRUREQUEST,	NULL,	0,		"whoareyourequest" },
-	{ ICMP6_WRUREPLY,	NULL,	0,		"whoareyoureply" },
-	{ ICMP6_FQDN_QUERY,	NULL,	0,		"fqdnquery" },
-	{ ICMP6_FQDN_REPLY,	NULL,	0,		"fqdnreply" },
-	{ ICMP6_NI_QUERY,	icmpnodeinfo6,
-			IST_SZ(icmpnodeinfo6),		"nodeinforequest" },
-	{ ICMP6_NI_REPLY,	NULL,	0,		"nodeinforeply" },
-	{ MLD6_MTRACE_RESP,	NULL,	0,		"mtraceresponse" },
-	{ MLD6_MTRACE,		NULL,	0,		"mtracerequest" },
-	{ -2,			NULL,	0,		NULL }
-};
-
-static icmp_subtype_t *find_icmpsubtype(type, table, tablesz)
-int type;
-icmp_subtype_t *table;
-size_t tablesz;
-{
-	icmp_subtype_t *ist;
-	int i;
-
-	if (tablesz < 2)
-		return NULL;
-
-	if ((type < 0) || (type > table[tablesz - 2].ist_val))
-		return NULL;
-
-	i = type;
-	if (table[type].ist_val == type)
-		return table + type;
-
-	for (i = 0, ist = table; ist->ist_val != -2; i++, ist++)
-		if (ist->ist_val == type)
-			return ist;
-	return NULL;
-}
-
-
-static icmp_type_t *find_icmptype(type, table, tablesz)
-int type;
-icmp_type_t *table;
-size_t tablesz;
-{
-	icmp_type_t *it;
-	int i;
-
-	if (tablesz < 2)
-		return NULL;
-
-	if ((type < 0) || (type > table[tablesz - 2].it_val))
-		return NULL;
-
-	i = type;
-	if (table[type].it_val == type)
-		return table + type;
-
-	for (i = 0, it = table; it->it_val != -2; i++, it++)
-		if (it->it_val == type)
-			return it;
-	return NULL;
-}
-
-
-static void handlehup(sig)
-int sig;
-{
-	signal(SIGHUP, handlehup);
-	donehup = 1;
-}
-
-
-static void init_tabs()
-{
-	struct	protoent	*p;
-	struct	servent	*s;
-	char	*name, **tab;
-	int	port, i;
-
-	if (protocols != NULL) {
-		for (i = 0; i < 256; i++)
-			if (protocols[i] != NULL) {
-				free(protocols[i]);
-				protocols[i] = NULL;
-			}
-		free(protocols);
-		protocols = NULL;
-	}
-	protocols = (char **)malloc(256 * sizeof(*protocols));
-	if (protocols != NULL) {
-		bzero((char *)protocols, 256 * sizeof(*protocols));
-
-		setprotoent(1);
-		while ((p = getprotoent()) != NULL)
-			if (p->p_proto >= 0 && p->p_proto <= 255 &&
-			    p->p_name != NULL && protocols[p->p_proto] == NULL)
-				protocols[p->p_proto] = strdup(p->p_name);
-		endprotoent();
-#if defined(_AIX51)
-		if (protocols[0])
-			free(protocols[0]);
-		if (protocols[252])
-			free(protocols[252]);
-		protocols[0] = "ip";
-		protocols[252] = NULL;
-#endif
-	}
-
-	if (udp_ports != NULL) {
-		for (i = 0; i < 65536; i++)
-			if (udp_ports[i] != NULL) {
-				free(udp_ports[i]);
-				udp_ports[i] = NULL;
-			}
-		free(udp_ports);
-		udp_ports = NULL;
-	}
-	udp_ports = (char **)malloc(65536 * sizeof(*udp_ports));
-	if (udp_ports != NULL)
-		bzero((char *)udp_ports, 65536 * sizeof(*udp_ports));
-
-	if (tcp_ports != NULL) {
-		for (i = 0; i < 65536; i++)
-			if (tcp_ports[i] != NULL) {
-				free(tcp_ports[i]);
-				tcp_ports[i] = NULL;
-			}
-		free(tcp_ports);
-		tcp_ports = NULL;
-	}
-	tcp_ports = (char **)malloc(65536 * sizeof(*tcp_ports));
-	if (tcp_ports != NULL)
-		bzero((char *)tcp_ports, 65536 * sizeof(*tcp_ports));
-
-	setservent(1);
-	while ((s = getservent()) != NULL) {
-		if (s->s_proto == NULL)
-			continue;
-		else if (!strcmp(s->s_proto, "tcp")) {
-			port = ntohs(s->s_port);
-			name = s->s_name;
-			tab = tcp_ports;
-		} else if (!strcmp(s->s_proto, "udp")) {
-			port = ntohs(s->s_port);
-			name = s->s_name;
-			tab = udp_ports;
-		} else
-			continue;
-		if ((port < 0 || port > 65535) || (name == NULL))
-			continue;
-		if (tab != NULL)
-			tab[port] = strdup(name);
-	}
-	endservent();
-}
-
-
-static char *getproto(p)
-u_int p;
-{
-	static char pnum[4];
-	char *s;
-
-	p &= 0xff;
-	s = protocols ? protocols[p] : NULL;
-	if (s == NULL) {
-		sprintf(pnum, "%u", p);
-		s = pnum;
-	}
-	return s;
-}
-
-
-static int read_log(fd, lenp, buf, bufsize)
-int fd, bufsize, *lenp;
-char *buf;
-{
-	int	nr;
-
-	nr = read(fd, buf, bufsize);
-	if (!nr)
-		return 2;
-	if ((nr < 0) && (errno != EINTR))
-		return -1;
-	*lenp = nr;
-	return 0;
-}
-
-
-char	*hostname(res, v, ip)
-int	res, v;
-u_32_t	*ip;
-{
-# define MAX_INETA	16
-	static char hname[MAXHOSTNAMELEN + MAX_INETA + 3];
-#ifdef	USE_INET6
-	static char hostbuf[MAXHOSTNAMELEN+1];
-#endif
-	struct hostent *hp;
-	struct in_addr ipa;
-
-	if (v == 4) {
-		ipa.s_addr = *ip;
-		if (!res)
-			return inet_ntoa(ipa);
-		hp = gethostbyaddr((char *)ip, sizeof(*ip), AF_INET);
-		if (!hp)
-			return inet_ntoa(ipa);
-		sprintf(hname, "%.*s[%s]", MAXHOSTNAMELEN, hp->h_name,
-			inet_ntoa(ipa));
-		return hname;
-	}
-#ifdef	USE_INET6
-	(void) inet_ntop(AF_INET6, ip, hostbuf, sizeof(hostbuf) - 1);
-	hostbuf[MAXHOSTNAMELEN] = '\0';
-	return hostbuf;
-#else
-	return "IPv6";
-#endif
-}
-
-
-char	*portname(res, proto, port)
-int	res;
-char	*proto;
-u_int	port;
-{
-	static	char	pname[8];
-	char	*s;
-
-	port = ntohs(port);
-	port &= 0xffff;
-	(void) sprintf(pname, "%u", port);
-	if (!res || (opts & OPT_PORTNUM))
-		return pname;
-	s = NULL;
-	if (!strcmp(proto, "tcp"))
-		s = tcp_ports[port];
-	else if (!strcmp(proto, "udp"))
-		s = udp_ports[port];
-	if (s == NULL)
-		s = pname;
-	return s;
-}
-
-
-static	char	*icmpname(type, code)
-u_int	type;
-u_int	code;
-{
-	static char name[80];
-	icmp_subtype_t *ist;
-	icmp_type_t *it;
-	char *s;
-
-	s = NULL;
-	it = find_icmptype(type, icmptypes, sizeof(icmptypes) / sizeof(*it));
-	if (it != NULL)
-		s = it->it_name;
-
-	if (s == NULL)
-		sprintf(name, "icmptype(%d)/", type);
-	else
-		sprintf(name, "%s/", s);
-
-	ist = NULL;
-	if (it != NULL && it->it_subtable != NULL)
-		ist = find_icmpsubtype(code, it->it_subtable, it->it_stsize);
-
-	if (ist != NULL && ist->ist_name != NULL)
-		strcat(name, ist->ist_name);
-	else
-		sprintf(name + strlen(name), "%d", code);
-
-	return name;
-}
-
-static	char	*icmpname6(type, code)
-u_int	type;
-u_int	code;
-{
-	static char name[80];
-	icmp_subtype_t *ist;
-	icmp_type_t *it;
-	char *s;
-
-	s = NULL;
-	it = find_icmptype(type, icmptypes6, sizeof(icmptypes6) / sizeof(*it));
-	if (it != NULL)
-		s = it->it_name;
-
-	if (s == NULL)
-		sprintf(name, "icmpv6type(%d)/", type);
-	else
-		sprintf(name, "%s/", s);
-
-	ist = NULL;
-	if (it != NULL && it->it_subtable != NULL)
-		ist = find_icmpsubtype(code, it->it_subtable, it->it_stsize);
-
-	if (ist != NULL && ist->ist_name != NULL)
-		strcat(name, ist->ist_name);
-	else
-		sprintf(name + strlen(name), "%d", code);
-
-	return name;
-}
-
-
-void	dumphex(log, dopts, buf, len)
-FILE	*log;
-int	dopts;
-char	*buf;
-int	len;
-{
-	char	hline[80];
-	int	i, j, k;
-	u_char	*s = (u_char *)buf, *t = (u_char *)hline;
-
-	if (buf == NULL || len == 0)
-		return;
-
-	*hline = '\0';
-
-	for (i = len, j = 0; i; i--, j++, s++) {
-		if (j && !(j & 0xf)) {
-			*t++ = '\n';
-			*t = '\0';
-			if ((dopts & OPT_SYSLOG))
-				syslog(LOG_INFO, "%s", hline);
-			else if (log != NULL)
-				fputs(hline, log);
-			t = (u_char *)hline;
-			*t = '\0';
-		}
-		sprintf((char *)t, "%02x", *s & 0xff);
-		t += 2;
-		if (!((j + 1) & 0xf)) {
-			s -= 15;
-			sprintf((char *)t, "        ");
-			t += 8;
-			for (k = 16; k; k--, s++)
-				*t++ = (ISPRINT(*s) ? *s : '.');
-			s--;
-		}
-			
-		if ((j + 1) & 0xf)
-			*t++ = ' ';;
-	}
-
-	if (j & 0xf) {
-		for (k = 16 - (j & 0xf); k; k--) {
-			*t++ = ' ';
-			*t++ = ' ';
-			*t++ = ' ';
-		}
-		sprintf((char *)t, "       ");
-		t += 7;
-		s -= j & 0xf;
-		for (k = j & 0xf; k; k--, s++)
-			*t++ = (ISPRINT(*s) ? *s : '.');
-		*t++ = '\n';
-		*t = '\0';
-	}
-	if ((dopts & OPT_SYSLOG) != 0)
-		syslog(LOG_INFO, "%s", hline);
-	else if (log != NULL) {
-		fputs(hline, log);
-		fflush(log);
-	}
-}
-
-
-static	struct	tm	*get_tm(sec)
-#ifdef __hpux
-u_32_t	sec;
-#else
-time_t	sec;
-#endif
-{
-	struct tm *tm;
-	time_t t;
-
-	t = sec;
-	tm = localtime(&t);
-	return tm;
-}
-
-static	void	print_natlog(log, buf, blen)
-FILE	*log;
-char	*buf;
-int	blen;
-{
-	struct	natlog	*nl;
-	iplog_t	*ipl = (iplog_t *)buf;
-	char	*t = line;
-	struct	tm	*tm;
-	int	res, i, len;
-	char	*proto;
-
-	nl = (struct natlog *)((char *)ipl + sizeof(*ipl));
-	res = (opts & OPT_RESOLVE) ? 1 : 0;
-	tm = get_tm(ipl->ipl_sec);
-	len = sizeof(line);
-	if (!(opts & OPT_SYSLOG)) {
-		(void) strftime(t, len, "%d/%m/%Y ", tm);
-		i = strlen(t);
-		len -= i;
-		t += i;
-	}
-	(void) strftime(t, len, "%T", tm);
-	t += strlen(t);
-	(void) sprintf(t, ".%-.6ld @%hd ", ipl->ipl_usec, nl->nl_rule + 1);
-	t += strlen(t);
-
-	if (nl->nl_type == NL_NEWMAP)
-		strcpy(t, "NAT:MAP ");
-	else if (nl->nl_type == NL_NEWRDR)
-		strcpy(t, "NAT:RDR ");
-	else if (nl->nl_type == NL_FLUSH)
-		strcpy(t, "NAT:FLUSH ");
-	else if (nl->nl_type == NL_EXPIRE)
-		strcpy(t, "NAT:EXPIRE ");
-	else if (nl->nl_type == NL_NEWBIMAP)
-		strcpy(t, "NAT:BIMAP ");
-	else if (nl->nl_type == NL_NEWBLOCK)
-		strcpy(t, "NAT:MAPBLOCK ");
-	else if (nl->nl_type == NL_CLONE)
-		strcpy(t, "NAT:CLONE ");
-	else if (nl->nl_type == NL_DESTROY)
-		strcpy(t, "NAT:DESTROY ");
-	else
-		sprintf(t, "Type: %d ", nl->nl_type);
-	t += strlen(t);
-
-	proto = getproto(nl->nl_p);
-
-	(void) sprintf(t, "%s,%s <- -> ", HOSTNAME_V4(res, nl->nl_inip),
-		portname(res, proto, (u_int)nl->nl_inport));
-	t += strlen(t);
-	(void) sprintf(t, "%s,%s ", HOSTNAME_V4(res, nl->nl_outip),
-		portname(res, proto, (u_int)nl->nl_outport));
-	t += strlen(t);
-	(void) sprintf(t, "[%s,%s PR %s]", HOSTNAME_V4(res, nl->nl_origip),
-		portname(res, proto, (u_int)nl->nl_origport),
-		getproto(nl->nl_p));
-	t += strlen(t);
-	if (nl->nl_type == NL_EXPIRE) {
-#ifdef	USE_QUAD_T
-		(void) sprintf(t, " Pkts %qd/%qd Bytes %qd/%qd",
-				(long long)nl->nl_pkts[0],
-				(long long)nl->nl_pkts[1],
-				(long long)nl->nl_bytes[0],
-				(long long)nl->nl_bytes[1]);
-#else
-		(void) sprintf(t, " Pkts %ld/%ld Bytes %ld/%ld",
-				nl->nl_pkts[0], nl->nl_pkts[1],
-				nl->nl_bytes[0], nl->nl_bytes[1]);
-#endif
-		t += strlen(t);
-	}
-
-	*t++ = '\n';
-	*t++ = '\0';
-	if (opts & OPT_SYSLOG)
-		syslog(LOG_INFO, "%s", line);
-	else if (log != NULL)
-		(void) fprintf(log, "%s", line);
-}
-
-
-static	void	print_statelog(log, buf, blen)
-FILE	*log;
-char	*buf;
-int	blen;
-{
-	struct	ipslog *sl;
-	iplog_t	*ipl = (iplog_t *)buf;
-	char	*t = line, *proto;
-	struct	tm	*tm;
-	int	res, i, len;
-
-	sl = (struct ipslog *)((char *)ipl + sizeof(*ipl));
-	res = (opts & OPT_RESOLVE) ? 1 : 0;
-	tm = get_tm(ipl->ipl_sec);
-	len = sizeof(line);
-	if (!(opts & OPT_SYSLOG)) {
-		(void) strftime(t, len, "%d/%m/%Y ", tm);
-		i = strlen(t);
-		len -= i;
-		t += i;
-	}
-	(void) strftime(t, len, "%T", tm);
-	t += strlen(t);
-	(void) sprintf(t, ".%-.6ld ", ipl->ipl_usec);
-	t += strlen(t);
-
-	switch (sl->isl_type)
-	{
-	case ISL_NEW :
-		strcpy(t, "STATE:NEW ");
-		break;
-
-	case ISL_CLONE :
-		strcpy(t, "STATE:CLONED ");
-		break;
-
-	case ISL_EXPIRE :
-		if ((sl->isl_p == IPPROTO_TCP) &&
-		    (sl->isl_state[0] > IPF_TCPS_ESTABLISHED ||
-		     sl->isl_state[1] > IPF_TCPS_ESTABLISHED))
-			strcpy(t, "STATE:CLOSE ");
-		else
-			strcpy(t, "STATE:EXPIRE ");
-		break;
-
-	case ISL_FLUSH :
-		strcpy(t, "STATE:FLUSH ");
-		break;
-
-	case ISL_INTERMEDIATE :
-		strcpy(t, "STATE:INTERMEDIATE ");
-		break;
-
-	case ISL_REMOVE :
-		strcpy(t, "STATE:REMOVE ");
-		break;
-
-	case ISL_KILLED :
-		strcpy(t, "STATE:KILLED ");
-		break;
-
-	case ISL_UNLOAD :
-		strcpy(t, "STATE:UNLOAD ");
-		break;
-
-	default :
-		sprintf(t, "Type: %d ", sl->isl_type);
-		break;
-	}
-	t += strlen(t);
-
-	proto = getproto(sl->isl_p);
-
-	if (sl->isl_p == IPPROTO_TCP || sl->isl_p == IPPROTO_UDP) {
-		(void) sprintf(t, "%s,%s -> ",
-			hostname(res, sl->isl_v, (u_32_t *)&sl->isl_src),
-			portname(res, proto, (u_int)sl->isl_sport));
-		t += strlen(t);
-		(void) sprintf(t, "%s,%s PR %s",
-			hostname(res, sl->isl_v, (u_32_t *)&sl->isl_dst),
-			portname(res, proto, (u_int)sl->isl_dport), proto);
-	} else if (sl->isl_p == IPPROTO_ICMP) {
-		(void) sprintf(t, "%s -> ", hostname(res, sl->isl_v,
-						     (u_32_t *)&sl->isl_src));
-		t += strlen(t);
-		(void) sprintf(t, "%s PR icmp %d",
-			hostname(res, sl->isl_v, (u_32_t *)&sl->isl_dst),
-			sl->isl_itype);
-	} else if (sl->isl_p == IPPROTO_ICMPV6) {
-		(void) sprintf(t, "%s -> ", hostname(res, sl->isl_v,
-						     (u_32_t *)&sl->isl_src));
-		t += strlen(t);
-		(void) sprintf(t, "%s PR icmpv6 %d",
-			hostname(res, sl->isl_v, (u_32_t *)&sl->isl_dst),
-			sl->isl_itype);
-	} else {
-		(void) sprintf(t, "%s -> ",
-			hostname(res, sl->isl_v, (u_32_t *)&sl->isl_src));
-		t += strlen(t);
-		(void) sprintf(t, "%s PR %s",
-			hostname(res, sl->isl_v, (u_32_t *)&sl->isl_dst),
-			proto);
-	}
-	t += strlen(t);
-	if (sl->isl_tag != FR_NOLOGTAG) {
-		(void) sprintf(t, " tag %u", sl->isl_tag);
-		t += strlen(t);
-	}
-	if (sl->isl_type != ISL_NEW) {
-		sprintf(t,
-#ifdef	USE_QUAD_T
-#ifdef	PRId64
-			" Forward: Pkts in %" PRId64 " Bytes in %" PRId64
-			" Pkts out %" PRId64 " Bytes out %" PRId64
-			" Backward: Pkts in %" PRId64 " Bytes in %" PRId64
-			" Pkts out %" PRId64 " Bytes out %" PRId64,
-#else
-			" Forward: Pkts in %qd Bytes in %qd Pkts out %qd Bytes out %qd Backward: Pkts in %qd Bytes in %qd Pkts out %qd Bytes out %qd",
-#endif /* PRId64 */
-#else
-			" Forward: Pkts in %ld Bytes in %ld Pkts out %ld Bytes out %ld Backward: Pkts in %ld Bytes in %ld Pkts out %ld Bytes out %ld",
-#endif
-			sl->isl_pkts[0], sl->isl_bytes[0],
-			sl->isl_pkts[1], sl->isl_bytes[1],
-			sl->isl_pkts[2], sl->isl_bytes[2],
-			sl->isl_pkts[3], sl->isl_bytes[3]);
-
-		t += strlen(t);
-	}
-
-	*t++ = '\n';
-	*t++ = '\0';
-	if (opts & OPT_SYSLOG)
-		syslog(LOG_INFO, "%s", line);
-	else if (log != NULL)
-		(void) fprintf(log, "%s", line);
-}
-
-
-static	void	print_log(logtype, log, buf, blen)
-FILE	*log;
-char	*buf;
-int	logtype, blen;
-{
-	iplog_t	*ipl;
-	char *bp = NULL, *bpo = NULL;
-	int psize;
-
-	while (blen > 0) {
-		ipl = (iplog_t *)buf;
-		if ((u_long)ipl & (sizeof(long)-1)) {
-			if (bp)
-				bpo = bp;
-			bp = (char *)malloc(blen);
-			bcopy((char *)ipl, bp, blen);
-			if (bpo) {
-				free(bpo);
-				bpo = NULL;
-			}
-			buf = bp;
-			continue;
-		}
-
-		psize = ipl->ipl_dsize;
-		if (psize > blen)
-			break;
-
-		if (binarylog) {
-			fwrite(buf, psize, 1, binarylog);
-			fflush(binarylog);
-		}
-
-		if (logtype == IPL_LOGIPF) {
-			if (ipl->ipl_magic == IPL_MAGIC)
-				print_ipflog(log, buf, psize);
-
-		} else if (logtype == IPL_LOGNAT) {
-			if (ipl->ipl_magic == IPL_MAGIC_NAT)
-				print_natlog(log, buf, psize);
-
-		} else if (logtype == IPL_LOGSTATE) {
-			if (ipl->ipl_magic == IPL_MAGIC_STATE)
-				print_statelog(log, buf, psize);
-		}
-
-		blen -= psize;
-		buf += psize;
-	}
-	if (bp)
-		free(bp);
-	return;
-}
-
-
-static	void	print_ipflog(log, buf, blen)
-FILE	*log;
-char	*buf;
-int	blen;
-{
-	tcphdr_t	*tp;
-	struct	icmp	*ic;
-	struct	icmp	*icmp;
-	struct	tm	*tm;
-	char	*t, *proto;
-	int	i, v, lvl, res, len, off, plen, ipoff, defaction;
-	ip_t	*ipc, *ip;
-	u_32_t	*s, *d;
-	u_short	hl, p;
-	ipflog_t *ipf;
-	iplog_t	*ipl;
-#ifdef	USE_INET6
-	struct ip6_ext *ehp;
-	u_short ehl;
-	ip6_t *ip6;
-	int go;
-#endif
-
-	ipl = (iplog_t *)buf;
-	ipf = (ipflog_t *)((char *)buf + sizeof(*ipl));
-	ip = (ip_t *)((char *)ipf + sizeof(*ipf));
-	v = IP_V(ip);
-	res = (opts & OPT_RESOLVE) ? 1 : 0;
-	t = line;
-	*t = '\0';
-	tm = get_tm(ipl->ipl_sec);
-
-	len = sizeof(line);
-	if (!(opts & OPT_SYSLOG)) {
-		(void) strftime(t, len, "%d/%m/%Y ", tm);
-		i = strlen(t);
-		len -= i;
-		t += i;
-	}
-	(void) strftime(t, len, "%T", tm);
-	t += strlen(t);
-	(void) sprintf(t, ".%-.6ld ", ipl->ipl_usec);
-	t += strlen(t);
-	if (ipl->ipl_count > 1) {
-		(void) sprintf(t, "%dx ", ipl->ipl_count);
-		t += strlen(t);
-	}
-#if (defined(MENTAT) || \
-	(defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
-	(defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \
-	(defined(OpenBSD) && (OpenBSD >= 199603))) || defined(linux)
-	{
-	char	ifname[sizeof(ipf->fl_ifname) + 1];
-
-	strncpy(ifname, ipf->fl_ifname, sizeof(ipf->fl_ifname));
-	ifname[sizeof(ipf->fl_ifname)] = '\0';
-	(void) sprintf(t, "%s", ifname);
-	t += strlen(t);
-# if defined(MENTAT) || defined(linux)
-	if (ISALPHA(*(t - 1))) {
-		sprintf(t, "%d", ipf->fl_unit);
-		t += strlen(t);
-	}
-# endif
-	}
-#else
-	for (len = 0; len < 3; len++)
-		if (ipf->fl_ifname[len] == '\0')
-			break;
-	if (ipf->fl_ifname[len])
-		len++;
-	(void) sprintf(t, "%*.*s%u", len, len, ipf->fl_ifname, ipf->fl_unit);
-	t += strlen(t);
-#endif
-	if ((ipf->fl_group[0] == (char)~0) && (ipf->fl_group[1] == '\0'))
-		strcat(t, " @-1:");
-	else if (ipf->fl_group[0] == '\0')
-		(void) strcpy(t, " @0:");
-	else
-		(void) sprintf(t, " @%s:", ipf->fl_group);
-	t += strlen(t);
-	if (ipf->fl_rule == 0xffffffff)
-		strcat(t, "-1 ");
-	else
-		(void) sprintf(t, "%u ", ipf->fl_rule + 1);
-	t += strlen(t);
-
-	lvl = LOG_NOTICE;
-
- 	if (ipf->fl_lflags & FI_SHORT) {
-		*t++ = 'S';
-		lvl = LOG_ERR;
-	}
-
-	if (FR_ISPASS(ipf->fl_flags)) {
-		if (ipf->fl_flags & FR_LOGP)
-			*t++ = 'p';
-		else
-			*t++ = 'P';
-	} else if (FR_ISBLOCK(ipf->fl_flags)) {
-		if (ipf->fl_flags & FR_LOGB)
-			*t++ = 'b';
-		else
-			*t++ = 'B';
-		lvl = LOG_WARNING;
-	} else if ((ipf->fl_flags & FR_LOGMASK) == FR_LOG) {
-		*t++ = 'L';
-		lvl = LOG_INFO;
-	} else if (ipf->fl_flags & FF_LOGNOMATCH) {
-		*t++ = 'n';
-	} else {
-		*t++ = '?';
-		lvl = LOG_EMERG;
-	}
-	if (ipf->fl_loglevel != 0xffff)
-		lvl = ipf->fl_loglevel;
-	*t++ = ' ';
-	*t = '\0';
-
-	if (v == 6) {
-#ifdef	USE_INET6
-		off = 0;
-		ipoff = 0;
-		hl = sizeof(ip6_t);
-		ip6 = (ip6_t *)ip;
-		p = (u_short)ip6->ip6_nxt;
-		s = (u_32_t *)&ip6->ip6_src;
-		d = (u_32_t *)&ip6->ip6_dst;
-		plen = hl + ntohs(ip6->ip6_plen);
-		go = 1;
-		ehp = (struct ip6_ext *)((char *)ip6 + hl);
-		while (go == 1) {
-			switch (p)
-			{
-			case IPPROTO_HOPOPTS :
-			case IPPROTO_MOBILITY :
-			case IPPROTO_DSTOPTS :
-			case IPPROTO_ROUTING :
-			case IPPROTO_AH :
-				p = ehp->ip6e_nxt;
-				ehl = 8 + (ehp->ip6e_len << 3);
-				hl += ehl;
-				ehp = (struct ip6_ext *)((char *)ehp + ehl);
-				break;
-			case IPPROTO_FRAGMENT :
-				hl += sizeof(struct ip6_frag);
-				/* FALLTHROUGH */
-			default :
-				go = 0;
-				break;
-			}
-		}
-#else
-		sprintf(t, "ipv6");
-		goto printipflog;
-#endif
-	} else if (v == 4) {
-		hl = IP_HL(ip) << 2;
-		ipoff = ip->ip_off;
-		off = ipoff & IP_OFFMASK;
-		p = (u_short)ip->ip_p;
-		s = (u_32_t *)&ip->ip_src;
-		d = (u_32_t *)&ip->ip_dst;
-		plen = ip->ip_len;
-	} else {
-		goto printipflog;
-	}
-	proto = getproto(p);
-
-	if ((p == IPPROTO_TCP || p == IPPROTO_UDP) && !off) {
-		tp = (tcphdr_t *)((char *)ip + hl);
-		if (!(ipf->fl_lflags & FI_SHORT)) {
-			(void) sprintf(t, "%s,%s -> ", hostname(res, v, s),
-				portname(res, proto, (u_int)tp->th_sport));
-			t += strlen(t);
-			(void) sprintf(t, "%s,%s PR %s len %hu %hu",
-				hostname(res, v, d),
-				portname(res, proto, (u_int)tp->th_dport),
-				proto, hl, plen);
-			t += strlen(t);
-
-			if (p == IPPROTO_TCP) {
-				*t++ = ' ';
-				*t++ = '-';
-				for (i = 0; tcpfl[i].value; i++)
-					if (tp->th_flags & tcpfl[i].value)
-						*t++ = tcpfl[i].flag;
-				if (opts & OPT_VERBOSE) {
-					(void) sprintf(t, " %lu %lu %hu",
-						(u_long)(ntohl(tp->th_seq)),
-						(u_long)(ntohl(tp->th_ack)),
-						ntohs(tp->th_win));
-					t += strlen(t);
-				}
-			}
-			*t = '\0';
-		} else {
-			(void) sprintf(t, "%s -> ", hostname(res, v, s));
-			t += strlen(t);
-			(void) sprintf(t, "%s PR %s len %hu %hu",
-				hostname(res, v, d), proto, hl, plen);
-		}
-	} else if ((p == IPPROTO_ICMPV6) && !off && (v == 6)) {
-		ic = (struct icmp *)((char *)ip + hl);
-		(void) sprintf(t, "%s -> ", hostname(res, v, s));
-		t += strlen(t);
-		(void) sprintf(t, "%s PR icmpv6 len %hu %hu icmpv6 %s",
-			hostname(res, v, d), hl, plen,
-			icmpname6(ic->icmp_type, ic->icmp_code));
-	} else if ((p == IPPROTO_ICMP) && !off && (v == 4)) {
-		ic = (struct icmp *)((char *)ip + hl);
-		(void) sprintf(t, "%s -> ", hostname(res, v, s));
-		t += strlen(t);
-		(void) sprintf(t, "%s PR icmp len %hu %hu icmp %s",
-			hostname(res, v, d), hl, plen,
-			icmpname(ic->icmp_type, ic->icmp_code));
-		if (ic->icmp_type == ICMP_UNREACH ||
-		    ic->icmp_type == ICMP_SOURCEQUENCH ||
-		    ic->icmp_type == ICMP_PARAMPROB ||
-		    ic->icmp_type == ICMP_REDIRECT ||
-		    ic->icmp_type == ICMP_TIMXCEED) {
-			ipc = &ic->icmp_ip;
-			i = ntohs(ipc->ip_len);
-			/*
-			 * XXX - try to guess endian of ip_len in ICMP
-			 * returned data.
-			 */
-			if (i > 1500)
-				i = ipc->ip_len;
-			ipoff = ntohs(ipc->ip_off);
-			proto = getproto(ipc->ip_p);
-
-			if (!(ipoff & IP_OFFMASK) &&
-			    ((ipc->ip_p == IPPROTO_TCP) ||
-			     (ipc->ip_p == IPPROTO_UDP))) {
-				tp = (tcphdr_t *)((char *)ipc + hl);
-				t += strlen(t);
-				(void) sprintf(t, " for %s,%s -",
-					HOSTNAME_V4(res, ipc->ip_src),
-					portname(res, proto,
-						 (u_int)tp->th_sport));
-				t += strlen(t);
-				(void) sprintf(t, " %s,%s PR %s len %hu %hu",
-					HOSTNAME_V4(res, ipc->ip_dst),
-					portname(res, proto,
-						 (u_int)tp->th_dport),
-					proto, IP_HL(ipc) << 2, i);
-			} else if (!(ipoff & IP_OFFMASK) &&
-				   (ipc->ip_p == IPPROTO_ICMP)) {
-				icmp = (icmphdr_t *)((char *)ipc + hl);
-
-				t += strlen(t);
-				(void) sprintf(t, " for %s -",
-					HOSTNAME_V4(res, ipc->ip_src));
-				t += strlen(t);
-				(void) sprintf(t,
-					" %s PR icmp len %hu %hu icmp %d/%d",
-					HOSTNAME_V4(res, ipc->ip_dst),
-					IP_HL(ipc) << 2, i,
-					icmp->icmp_type, icmp->icmp_code);
-			} else {
-				t += strlen(t);
-				(void) sprintf(t, " for %s -",
-						HOSTNAME_V4(res, ipc->ip_src));
-				t += strlen(t);
-				(void) sprintf(t, " %s PR %s len %hu (%hu)",
-					HOSTNAME_V4(res, ipc->ip_dst), proto,
-					IP_HL(ipc) << 2, i);
-				t += strlen(t);
-				if (ipoff & IP_OFFMASK) {
-					(void) sprintf(t,
-						"(frag %d:%hu@%hu%s%s)",
-						ntohs(ipc->ip_id),
-						i - (IP_HL(ipc) << 2),
-						(ipoff & IP_OFFMASK) << 3,
-						ipoff & IP_MF ? "+" : "",
-						ipoff & IP_DF ? "-" : "");
-				}
-			}
-
-		}
-	} else {
-		(void) sprintf(t, "%s -> ", hostname(res, v, s));
-		t += strlen(t);
-		(void) sprintf(t, "%s PR %s len %hu (%hu)",
-			hostname(res, v, d), proto, hl, plen);
-		t += strlen(t);
-		if (off & IP_OFFMASK)
-			(void) sprintf(t, " (frag %d:%hu@%hu%s%s)",
-				ntohs(ip->ip_id),
-				plen - hl, (off & IP_OFFMASK) << 3,
-				ipoff & IP_MF ? "+" : "",
-				ipoff & IP_DF ? "-" : "");
-	}
-	t += strlen(t);
-
-printipflog:
-	if (ipf->fl_flags & FR_KEEPSTATE) {
-		(void) strcpy(t, " K-S");
-		t += strlen(t);
-	}
-
-	if (ipf->fl_flags & FR_KEEPFRAG) {
-		(void) strcpy(t, " K-F");
-		t += strlen(t);
-	}
-
-	if (ipf->fl_dir == 0)
-		strcpy(t, " IN");
-	else if (ipf->fl_dir == 1)
-		strcpy(t, " OUT");
-	t += strlen(t);
-	if (ipf->fl_logtag != 0) {
-		sprintf(t, " log-tag %d", ipf->fl_logtag);
-		t += strlen(t);
-	}
-	if (ipf->fl_nattag.ipt_num[0] != 0) {
-		strcpy(t, " nat-tag ");
-		t += strlen(t);
-		strncpy(t, ipf->fl_nattag.ipt_tag, sizeof(ipf->fl_nattag));
-		t += strlen(t);
-	}
-	if ((ipf->fl_lflags & FI_LOWTTL) != 0) {
-			strcpy(t, " low-ttl");
-			t += 8;
-	}
-	if ((ipf->fl_lflags & FI_OOW) != 0) {
-			strcpy(t, " OOW");
-			t += 4;
-	}
-	if ((ipf->fl_lflags & FI_BAD) != 0) {
-			strcpy(t, " bad");
-			t += 4;
-	}
-	if ((ipf->fl_lflags & FI_NATED) != 0) {
-			strcpy(t, " NAT");
-			t += 4;
-	}
-	if ((ipf->fl_lflags & FI_BADNAT) != 0) {
-			strcpy(t, " bad-NAT");
-			t += 8;
-	}
-	if ((ipf->fl_lflags & FI_BADSRC) != 0) {
-			strcpy(t, " bad-src");
-			t += 8;
-	}
-	if ((ipf->fl_lflags & FI_MULTICAST) != 0) {
-			strcpy(t, " multicast");
-			t += 10;
-	}
-	if ((ipf->fl_lflags & FI_BROADCAST) != 0) {
-			strcpy(t, " broadcast");
-			t += 10;
-	}
-	if ((ipf->fl_lflags & (FI_MULTICAST|FI_BROADCAST|FI_MBCAST)) ==
-	    FI_MBCAST) {
-			strcpy(t, " mbcast");
-			t += 7;
-	}
-	*t++ = '\n';
-	*t++ = '\0';
-	defaction = 0;
-	if (conf_file != NULL)
-		defaction = check_action(buf, line, opts, lvl);
-	if (defaction == 0) {
-		if (opts & OPT_SYSLOG)
-			syslog(lvl, "%s", line);
-		else if (log != NULL)
-			(void) fprintf(log, "%s", line);
-
-		if (opts & OPT_HEXHDR)
-			dumphex(log, opts, buf,
-				sizeof(iplog_t) + sizeof(*ipf));
-		if (opts & OPT_HEXBODY)
-			dumphex(log, opts, (char *)ip,
-				ipf->fl_plen + ipf->fl_hlen);
-		else if ((opts & OPT_LOGBODY) && (ipf->fl_flags & FR_LOGBODY))
-			dumphex(log, opts, (char *)ip + ipf->fl_hlen,
-				ipf->fl_plen);
-	}
-}
-
-
-static void usage(prog)
-char *prog;
-{
-	fprintf(stderr, "%s: [-NFhstvxX] [-f <logfile>]\n", prog);
-	exit(1);
-}
-
-
-static void write_pid(file)
-char *file;
-{
-	FILE *fp = NULL;
-	int fd;
-
-	if ((fd = open(file, O_CREAT|O_TRUNC|O_WRONLY, 0644)) >= 0) {
-		fp = fdopen(fd, "w");
-		if (fp == NULL) {
-			close(fd);
-			fprintf(stderr,
-				"unable to open/create pid file: %s\n", file);
-			return;
-		}
-		fprintf(fp, "%d", getpid());
-		fclose(fp);
-	}
-}
-
-
-static void flushlogs(file, log)
-char *file;
-FILE *log;
-{
-	int	fd, flushed = 0;
-
-	if ((fd = open(file, O_RDWR)) == -1) {
-		(void) fprintf(stderr, "%s: open: %s\n",
-			       file, STRERROR(errno));
-		exit(1);
-	}
-
-	if (ioctl(fd, SIOCIPFFB, &flushed) == 0) {
-		printf("%d bytes flushed from log buffer\n",
-			flushed);
-		fflush(stdout);
-	} else
-		perror("SIOCIPFFB");
-	(void) close(fd);
-
-	if (flushed) {
-		if (opts & OPT_SYSLOG) {
-			syslog(LOG_INFO, "%d bytes flushed from log\n",
-				flushed);
-		} else if ((log != stdout) && (log != NULL)) {
-			fprintf(log, "%d bytes flushed from log\n", flushed);
-		}
-	}
-}
-
-
-static void logopts(turnon, options)
-int turnon;
-char *options;
-{
-	int flags = 0;
-	char *s;
-
-	for (s = options; *s; s++)
-	{
-		switch (*s)
-		{
-		case 'N' :
-			flags |= OPT_NAT;
-			break;
-		case 'S' :
-			flags |= OPT_STATE;
-			break;
-		case 'I' :
-			flags |= OPT_FILTER;
-			break;
-		default :
-			fprintf(stderr, "Unknown log option %c\n", *s);
-			exit(1);
-		}
-	}
-
-	if (turnon)
-		opts |= flags;
-	else
-		opts &= ~(flags);
-}
-
-
-int main(argc, argv)
-int argc;
-char *argv[];
-{
-	struct	stat	sb;
-	FILE	*log = stdout;
-	FILE	*fp;
-	int	fd[3], doread, n, i;
-	int	tr, nr, regular[3], c;
-	int	fdt[3], devices = 0, make_daemon = 0;
-	char	buf[DEFAULT_IPFLOGSIZE], *iplfile[3], *s;
-	extern	int	optind;
-	extern	char	*optarg;
-
-	fd[0] = fd[1] = fd[2] = -1;
-	fdt[0] = fdt[1] = fdt[2] = -1;
-	iplfile[0] = IPL_NAME;
-	iplfile[1] = IPNAT_NAME;
-	iplfile[2] = IPSTATE_NAME;
-
-	while ((c = getopt(argc, argv,
-			   "?abB:C:Df:FhL:nN:o:O:pP:sS:tvxX")) != -1)
-		switch (c)
-		{
-		case 'a' :
-			opts |= OPT_LOGALL;
-			fdt[0] = IPL_LOGIPF;
-			fdt[1] = IPL_LOGNAT;
-			fdt[2] = IPL_LOGSTATE;
-			break;
-		case 'b' :
-			opts |= OPT_LOGBODY;
-			break;
-		case 'B' :
-			binarylogfile = optarg;
-			binarylog = fopen(optarg, "a");
-			break;
-		case 'C' :
-			conf_file = optarg;
-			break;
-		case 'D' :
-			make_daemon = 1;
-			break;
-		case 'f' : case 'I' :
-			opts |= OPT_FILTER;
-			fdt[0] = IPL_LOGIPF;
-			iplfile[0] = optarg;
-			break;
-		case 'F' :
-			flushlogs(iplfile[0], log);
-			flushlogs(iplfile[1], log);
-			flushlogs(iplfile[2], log);
-			break;
-		case 'L' :
-			logfac = fac_findname(optarg);
-			if (logfac == -1) {
-				fprintf(stderr,
-					"Unknown syslog facility '%s'\n",
-					 optarg);
-				exit(1);
-			}
-			break;
-		case 'n' :
-			opts |= OPT_RESOLVE;
-			break;
-		case 'N' :
-			opts |= OPT_NAT;
-			fdt[1] = IPL_LOGNAT;
-			iplfile[1] = optarg;
-			break;
-		case 'o' : case 'O' :
-			logopts(c == 'o', optarg);
-			fdt[0] = fdt[1] = fdt[2] = -1;
-			if (opts & OPT_FILTER)
-				fdt[0] = IPL_LOGIPF;
-			if (opts & OPT_NAT)
-				fdt[1] = IPL_LOGNAT;
-			if (opts & OPT_STATE)
-				fdt[2] = IPL_LOGSTATE;
-			break;
-		case 'p' :
-			opts |= OPT_PORTNUM;
-			break;
-		case 'P' :
-			pidfile = optarg;
-			break;
-		case 's' :
-			s = strrchr(argv[0], '/');
-			if (s == NULL)
-				s = argv[0];
-			else
-				s++;
-			openlog(s, LOG_NDELAY|LOG_PID, logfac);
-			s = NULL;
-			opts |= OPT_SYSLOG;
-			log = NULL;
-			break;
-		case 'S' :
-			opts |= OPT_STATE;
-			fdt[2] = IPL_LOGSTATE;
-			iplfile[2] = optarg;
-			break;
-		case 't' :
-			opts |= OPT_TAIL;
-			break;
-		case 'v' :
-			opts |= OPT_VERBOSE;
-			break;
-		case 'x' :
-			opts |= OPT_HEXBODY;
-			break;
-		case 'X' :
-			opts |= OPT_HEXHDR;
-			break;
-		default :
-		case 'h' :
-		case '?' :
-			usage(argv[0]);
-		}
-
-	init_tabs();
-	if (conf_file)
-		if (load_config(conf_file) == -1)
-			exit(1);
-
-	/*
-	 * Default action is to only open the filter log file.
-	 */
-	if ((fdt[0] == -1) && (fdt[1] == -1) && (fdt[2] == -1))
-		fdt[0] = IPL_LOGIPF;
-
-	for (i = 0; i < 3; i++) {
-		if (fdt[i] == -1)
-			continue;
-		if (!strcmp(iplfile[i], "-"))
-			fd[i] = 0;
-		else {
-			if ((fd[i] = open(iplfile[i], O_RDONLY)) == -1) {
-				(void) fprintf(stderr,
-					       "%s: open: %s\n", iplfile[i],
-					       STRERROR(errno));
-				exit(1);
-				/* NOTREACHED */
-			}
-			if (fstat(fd[i], &sb) == -1) {
-				(void) fprintf(stderr, "%d: fstat: %s\n",
-					       fd[i], STRERROR(errno));
-				exit(1);
-				/* NOTREACHED */
-			}
-			if (!(regular[i] = !S_ISCHR(sb.st_mode)))
-				devices++;
-		}
-	}
-
-	if (!(opts & OPT_SYSLOG)) {
-		logfile = argv[optind];
-		log = logfile ? fopen(logfile, "a") : stdout;
-		if (log == NULL) {
-			(void) fprintf(stderr, "%s: fopen: %s\n",
-				       argv[optind], STRERROR(errno));
-			exit(1);
-			/* NOTREACHED */
-		}
-		setvbuf(log, NULL, _IONBF, 0);
-	} else
-		log = NULL;
-
-	if (make_daemon && ((log != stdout) || (opts & OPT_SYSLOG))) {
-#if BSD >= 199306
-		daemon(0, !(opts & OPT_SYSLOG));
-#else
-		int pid;
-		if ((pid = fork()) > 0)
-			exit(0);
-		if (pid < 0) {
-			(void) fprintf(stderr, "%s: fork() failed: %s\n",
-				       argv[0], STRERROR(errno));
-			exit(1);
-			/* NOTREACHED */
-		}
-		setsid();
-		if ((opts & OPT_SYSLOG))
-			close(2);
-#endif /* !BSD */
-		close(0);
-		close(1);
-		write_pid(pidfile);
-	}
-
-	signal(SIGHUP, handlehup);
-
-	for (doread = 1; doread; ) {
-		nr = 0;
-
-		for (i = 0; i < 3; i++) {
-			tr = 0;
-			if (fdt[i] == -1)
-				continue;
-			if (!regular[i]) {
-				if (ioctl(fd[i], FIONREAD, &tr) == -1) {
-					if (opts & OPT_SYSLOG)
-						syslog(LOG_CRIT,
-						       "ioctl(FIONREAD): %m");
-					else
-						perror("ioctl(FIONREAD)");
-					exit(1);
-					/* NOTREACHED */
-				}
-			} else {
-				tr = (lseek(fd[i], 0, SEEK_CUR) < sb.st_size);
-				if (!tr && !(opts & OPT_TAIL))
-					doread = 0;
-			}
-			if (!tr)
-				continue;
-			nr += tr;
-			n = 0;
-
-			tr = read_log(fd[i], &n, buf, sizeof(buf));
-			if (donehup) {
-				if (logfile && (fp = fopen(logfile, "a"))) {
-					fclose(log);
-					log = fp;
-				}
-				if (binarylogfile &&
-				    (fp = fopen(binarylogfile, "a"))) {
-					fclose(binarylog);
-					binarylog = fp;
-				}
-				init_tabs();
-				if (conf_file != NULL)
-					load_config(conf_file);
-				donehup = 0;
-			}
-
-			switch (tr)
-			{
-			case -1 :
-				if (opts & OPT_SYSLOG)
-					syslog(LOG_CRIT, "read: %m\n");
-				else
-					perror("read");
-				doread = 0;
-				break;
-			case 1 :
-				if (opts & OPT_SYSLOG)
-					syslog(LOG_CRIT, "aborting logging\n");
-				else if (log != NULL)
-					fprintf(log, "aborting logging\n");
-				doread = 0;
-				break;
-			case 2 :
-				break;
-			case 0 :
-				if (n > 0) {
-					print_log(fdt[i], log, buf, n);
-					if (!(opts & OPT_SYSLOG))
-						fflush(log);
-				}
-				break;
-			}
-		}
-		if (!nr && ((opts & OPT_TAIL) || devices))
-			sleep(1);
-	}
-	return(0);
-	/* NOTREACHED */
-}