ipfilter 3.1.0

11 files changed, 146 insertions, 47 deletions

diff --git a/usr.sbin/ipftest/ipft_ef.c b/usr.sbin/ipftest/ipft_ef.c
index 0febf3a6c3c..f2af0bc6a61 100644
--- a/usr.sbin/ipftest/ipft_ef.c
+++ b/usr.sbin/ipftest/ipft_ef.c
@@ -47,6 +47,7 @@ etherfind -n -t
 
 #ifndef lint
 static char sccsid[] = "@(#)ipft_ef.c	1.6 2/4/96 (C)1995 Darren Reed";
+static	char	rcsid[] = "$Id: ipft_ef.c,v 1.4 1996/07/18 04:59:22 dm Exp $";
 #endif
 
 static	int	etherf_open(), etherf_close(), etherf_readip();
diff --git a/usr.sbin/ipftest/ipft_hx.c b/usr.sbin/ipftest/ipft_hx.c
index ceed1189dfb..46c795778cf 100644
--- a/usr.sbin/ipftest/ipft_hx.c
+++ b/usr.sbin/ipftest/ipft_hx.c
@@ -30,6 +30,7 @@
 #include <netinet/ip_icmp.h>
 #include <netinet/tcpip.h>
 #include <net/if.h>
+#include "ip_fil_compat.h"
 #include <netdb.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
@@ -38,6 +39,7 @@
 
 #ifndef	lint
 static	char	sccsid[] = "@(#)ipft_hx.c	1.1 3/9/96 (C) 1996 Darren Reed";
+static	char	rcsid[] = "$Id: ipft_hx.c,v 1.2 1996/07/18 04:59:23 dm Exp $";
 #endif
 
 extern	int	opts;
diff --git a/usr.sbin/ipftest/ipft_pc.c b/usr.sbin/ipftest/ipft_pc.c
index 72f94900fc0..e4020efb3fa 100644
--- a/usr.sbin/ipftest/ipft_pc.c
+++ b/usr.sbin/ipftest/ipft_pc.c
@@ -30,6 +30,10 @@
 #include "ipt.h"
 #include "pcap.h"
 
+#ifndef	lint
+static	char	rcsid[] = "$Id: ipft_pc.c,v 1.4 1996/07/18 04:59:23 dm Exp $";
+#endif
+
 struct	llc	{
 	int	lc_sz;	/* LLC header length */
 	int	lc_to;	/* LLC Type offset */
diff --git a/usr.sbin/ipftest/ipft_sn.c b/usr.sbin/ipftest/ipft_sn.c
index 68978d8dc37..2e2b3370591 100644
--- a/usr.sbin/ipftest/ipft_sn.c
+++ b/usr.sbin/ipftest/ipft_sn.c
@@ -33,6 +33,10 @@
 #include "ipt.h"
 #include "snoop.h"
 
+#ifndef	lint
+static	char	rcsid[] = "$Id: ipft_sn.c,v 1.3 1996/07/18 04:59:24 dm Exp $";
+#endif
+
 struct	llc	{
 	int	lc_sz;	/* LLC header length */
 	int	lc_to;	/* LLC Type offset */
diff --git a/usr.sbin/ipftest/ipft_td.c b/usr.sbin/ipftest/ipft_td.c
index 828ac4e4fe1..6ce649dea8a 100644
--- a/usr.sbin/ipftest/ipft_td.c
+++ b/usr.sbin/ipftest/ipft_td.c
@@ -56,6 +56,7 @@ tcpdump -nqte
 
 #ifndef lint
 static char sccsid[] = "@(#)ipft_td.c	1.8 2/4/96 (C)1995 Darren Reed";
+static	char	rcsid[] = "$Id: ipft_td.c,v 1.4 1996/07/18 04:59:24 dm Exp $";
 #endif
 
 static	int	tcpd_open(), tcpd_close(), tcpd_readip();
diff --git a/usr.sbin/ipftest/ipft_tx.c b/usr.sbin/ipftest/ipft_tx.c
index 277613ad356..af71291e8c8 100644
--- a/usr.sbin/ipftest/ipft_tx.c
+++ b/usr.sbin/ipftest/ipft_tx.c
@@ -30,27 +30,113 @@
 #include <netinet/ip_icmp.h>
 #include <netinet/tcpip.h>
 #include <net/if.h>
+#include "ip_fil_compat.h"
 #include <netdb.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
-#include "ip_fil.h"
 #include "ipf.h"
 #include "ipt.h"
 
 #ifndef	lint
-static	char	sccsid[] = "@(#)ipft_tx.c	1.6 2/4/96 (C) 1993 Darren Reed";
+static	char	sccsid[] = "@(#)ipft_tx.c	1.7 6/5/96 (C) 1993 Darren Reed";
+static	char	rcsid[] = "$Id: ipft_tx.c,v 1.4 1996/07/18 04:59:24 dm Exp $";
 #endif
 
 extern	int	opts;
-extern	u_short	portnum();
 extern	u_long	buildopts();
 
+static	char	*tx_proto = "";
+
 static	int	text_open(), text_close(), text_readip(), parseline();
 
+static	char	tcp_flagset[] = "FSRPAU";
+static	u_char	tcp_flags[] = { TH_FIN, TH_SYN, TH_RST, TH_PUSH,
+				TH_ACK, TH_URG };
+
 struct	ipread	iptext = { text_open, text_close, text_readip };
 static	FILE	*tfp = NULL;
 static	int	tfd = -1;
 
+static	u_long	tx_hostnum();
+static	u_short	tx_portnum();
+
+
+/*
+ * returns an ip address as a long var as a result of either a DNS lookup or
+ * straight inet_addr() call
+ */
+u_long	tx_hostnum(host, resolved)
+char	*host;
+int	*resolved;
+{
+	struct	hostent	*hp;
+	struct	netent	*np;
+
+	*resolved = 0;
+	if (!strcasecmp("any",host))
+		return 0L;
+	if (isdigit(*host))
+		return inet_addr(host);
+
+	if (!(hp = gethostbyname(host))) {
+		if (!(np = getnetbyname(host))) {
+			*resolved = -1;
+			fprintf(stderr, "can't resolve hostname: %s\n", host);
+			return 0;
+		}
+		return np->n_net;
+	}
+	return *(u_long *)hp->h_addr;
+}
+
+
+/*
+ * find the port number given by the name, either from getservbyname() or
+ * straight atoi()
+ */
+u_short	tx_portnum(name)
+char	*name;
+{
+	struct	servent	*sp, *sp2;
+	u_short	p1 = 0;
+
+	if (isdigit(*name))
+		return (u_short)atoi(name);
+	if (!tx_proto)
+		tx_proto = "tcp/udp";
+	if (strcasecmp(tx_proto, "tcp/udp")) {
+		sp = getservbyname(name, tx_proto);
+		if (sp)
+			return ntohs(sp->s_port);
+		(void) fprintf(stderr, "unknown service \"%s\".\n", name);
+		return 0;
+	}
+	sp = getservbyname(name, "tcp");
+	if (sp)
+		p1 = sp->s_port;
+	sp2 = getservbyname(name, "udp");
+	if (!sp || !sp2) {
+		(void) fprintf(stderr, "unknown tcp/udp service \"%s\".\n",
+			name);
+		return 0;
+	}
+	if (p1 != sp2->s_port) {
+		(void) fprintf(stderr, "%s %d/tcp is a different port to ",
+			name, p1);
+		(void) fprintf(stderr, "%s %d/udp\n", name, sp->s_port);
+		return 0;
+	}
+	return ntohs(p1);
+}
+
+
+char	*tx_icmptypes[] = {
+	"echorep", (char *)NULL, (char *)NULL, "unreach", "squench",
+	"redir", (char *)NULL, (char *)NULL, "echo", (char *)NULL,
+	(char *)NULL, "timex", "paramprob", "timest", "timestrep",
+	"inforeq", "inforep", "maskreq", "maskrep", "END"
+};
+
 static	int	text_open(fname)
 char	*fname;
 {
@@ -119,16 +205,15 @@ struct	ip	*ip;
 char	**ifn;
 int	*out;
 {
-	extern	char	*proto;
 	tcphdr_t	th, *tcp = &th;
 	struct	icmp	icmp, *ic = &icmp;
-	char	*cps[20], **cpp, c, opts[68];
+	char	*cps[20], **cpp, c, ipopts[68];
 	int	i, r;
 
 	bzero((char *)ip, MAX(sizeof(*tcp), sizeof(*ic)) + sizeof(*ip));
 	bzero((char *)tcp, sizeof(*tcp));
 	bzero((char *)ic, sizeof(*ic));
-	bzero(opts, sizeof(opts));
+	bzero(ipopts, sizeof(ipopts));
 	ip->ip_hl = sizeof(*ip) >> 2;
 	ip->ip_v = IPVERSION;
 	for (i = 0, cps[0] = strtok(line, " \b\t\r\n"); cps[i] && i < 19; )
@@ -160,15 +245,15 @@ int	*out;
 		if (c == 't') {
 			ip->ip_p = IPPROTO_TCP;
 			ip->ip_len += sizeof(struct tcphdr);
-			proto = "tcp";
+			tx_proto = "tcp";
 		} else if (c == 'u') {
 			ip->ip_p = IPPROTO_UDP;
 			ip->ip_len += sizeof(struct udphdr);
-			proto = "udp";
+			tx_proto = "udp";
 		} else {
 			ip->ip_p = IPPROTO_ICMP;
 			ip->ip_len += sizeof(struct icmp);
-			proto = "icmp";
+			tx_proto = "icmp";
 		}
 		cpp++;
 	} else
@@ -185,9 +270,9 @@ int	*out;
 			return 1;
 		}
 		*last++ = '\0';
-		tcp->th_sport = htons(portnum(last));
+		tcp->th_sport = htons(tx_portnum(last));
 	}
-	ip->ip_src.s_addr = hostnum(*cpp, &r);
+	ip->ip_src.s_addr = tx_hostnum(*cpp, &r);
 	cpp++;
 	if (!*cpp)
 		return 1;
@@ -201,27 +286,28 @@ int	*out;
 			return 1;
 		}
 		*last++ = '\0';
-		tcp->th_dport = htons(portnum(last));
+		tcp->th_dport = htons(tx_portnum(last));
 	}
-	ip->ip_dst.s_addr = hostnum(*cpp, &r);
+	ip->ip_dst.s_addr = tx_hostnum(*cpp, &r);
 	cpp++;
 	if (*cpp && ip->ip_p == IPPROTO_TCP) {
-		extern	char	flagset[];
-		extern	u_char	flags[];
+		extern	char	tcp_flagset[];
+		extern	u_char	tcp_flags[];
 		char	*s, *t;
 
 		for (s = *cpp; *s; s++)
-			if ((t  = index(flagset, *s)))
-				tcp->th_flags |= flags[t - flagset];
+			if ((t  = index(tcp_flagset, *s)))
+				tcp->th_flags |= tcp_flags[t - tcp_flagset];
 		if (tcp->th_flags)
 			cpp++;
 		assert(tcp->th_flags != 0);
 	} else if (*cpp && ip->ip_p == IPPROTO_ICMP) {
-		extern	char	*icmptypes[];
+		extern	char	*tx_icmptypes[];
 		char	**s, *t;
 		int	i;
 
-		for (s = icmptypes, i = 0; !*s || strcmp(*s, "END"); s++, i++)
+		for (s = tx_icmptypes, i = 0; !*s || strcmp(*s, "END");
+		     s++, i++)
 			if (*s && !strncasecmp(*cpp, *s, strlen(*s))) {
 				ic->icmp_type = i;
 				if ((t = index(*cpp, ',')))
@@ -235,9 +321,9 @@ int	*out;
 		u_long	olen;
 
 		cpp++;
-		olen = buildopts(*cpp, opts);
+		olen = buildopts(*cpp, ipopts);
 		if (olen) {
-			bcopy(opts, (char *)(ip + 1), olen);
+			bcopy(ipopts, (char *)(ip + 1), olen);
 			ip->ip_hl += olen >> 2;
 		}
 	}
diff --git a/usr.sbin/ipftest/ipftest.1 b/usr.sbin/ipftest/ipftest.1
index 2e6991a0d09..72591402fa2 100644
--- a/usr.sbin/ipftest/ipftest.1
+++ b/usr.sbin/ipftest/ipftest.1
@@ -3,7 +3,7 @@
 .SH NAME
 ipftest - test packet filter rules with arbitary input.
 .SH SYNOPSIS
-ipftest [-vbdPSTE] [-I interface] -r <filename> [-i <filename>]
+ipftest [-vbdPSTEHX] [-I interface] -r <filename> [-i <filename>]
 .SH DESCRIPTION
 .LP
 .PP
@@ -77,6 +77,12 @@ option combinations:
 		tcpdump -nqte
 .fi
 .LP
+.IP -H
+The input file is to be hex digits, representing the binary makeup of the
+packet.  No length correction is made, if an incorrect length is put in
+the IP header.
+.IP -X
+The input file is composed of text descriptions of IP packets.
 .IP -E
 The input file is to be text output from etherfind.  The text formats which
 are currently supported are those which result from the following etherfind
diff --git a/usr.sbin/ipftest/ipt.c b/usr.sbin/ipftest/ipt.c
index 315ffd992c0..4ec9a8a5c39 100644
--- a/usr.sbin/ipftest/ipt.c
+++ b/usr.sbin/ipftest/ipt.c
@@ -39,7 +39,8 @@
 #include <ctype.h>
 
 #ifndef	lint
-static	char	sccsid[] = "@(#)ipt.c	1.17 3/9/96 (C) 1993-1996 Darren Reed";
+static	char	sccsid[] = "@(#)ipt.c	1.19 6/3/96 (C) 1993-1996 Darren Reed";
+static	char	rcsid[] = "$Id: ipt.c,v 1.5 1996/07/18 04:59:25 dm Exp $";
 #endif
 
 extern	int	fr_check();
@@ -49,8 +50,6 @@ extern	struct	ipread	snoop, etherf, tcpd, pcap, iptext, iphex;
 extern	void	debug(), verbose();
 
 struct frentry	*ft_in  = NULL, *ft_out = NULL;
-struct	ipread 	*readers[] = { &iptext, &etherf, &tcpd, &snoop, &pcap, &iphex,
-				NULL };
 
 int	opts = 0;
 
@@ -58,7 +57,7 @@ int main(argc,argv)
 int argc;
 char *argv[];
 {
-	struct	ipread	**r = readers;
+	struct	ipread	*r = &iptext;
 	struct	frentry	*f;
 	struct	ip	*ip;
 	u_long	buf[64];
@@ -66,7 +65,7 @@ char *argv[];
 	char	*rules = NULL, *datain = NULL, *iface = NULL;
 	int	fd, i, dir = 0;
 
-	while ((c = getopt(argc, argv, "bdEHi:I:Pr:STv")) != -1)
+	while ((c = getopt(argc, argv, "bdEHi:I:Pr:STvX")) != -1)
 		switch (c)
 		{
 		case 'b' :
@@ -88,29 +87,22 @@ char *argv[];
 			opts |= OPT_VERBOSE;
 			break;
 		case 'E' :
-			for (i = 0, r = readers; *r; i++, r++)
-				if (*r == &etherf)
-					break;
+			r = &etherf;
 			break;
 		case 'H' :
-			for (i = 0, r = readers; *r; i++, r++)
-				if (*r == &iphex)
-					break;
+			r = &iphex;
 			break;
 		case 'P' :
-			for (i = 0, r = readers; *r; i++, r++)
-				if (*r == &pcap)
-					break;
+			r = &pcap;
 			break;
 		case 'S' :
-			for (i = 0, r = readers; *r; i++, r++)
-				if (*r == &snoop)
-					break;
+			r = &snoop;
 			break;
 		case 'T' :
-			for (i = 0, r = readers; *r; i++, r++)
-				if (*r == &tcpd)
-					break;
+			r = &tcpd;
+			break;
+		case 'X' :
+			r = &iptext;
 			break;
 		}
 
@@ -119,7 +111,7 @@ char *argv[];
 		exit(-1);
 	}
 
-	initparse ();
+	initparse();
 
 	if (rules) {
 		struct	frentry *fr;
@@ -171,15 +163,15 @@ char *argv[];
 	}
 
 	if (datain)
-		fd = (*(*r)->r_open)(datain);
+		fd = (*r->r_open)(datain);
 	else
-		fd = (*(*r)->r_open)("-");
+		fd = (*r->r_open)("-");
 
 	if (fd < 0)
 		exit(-1);
 
 	ip = (struct ip *)buf;
-	while ((i = (*(*r)->r_readip)(buf, sizeof(buf), &iface, &dir)) > 0) {
+	while ((i = (*r->r_readip)(buf, sizeof(buf), &iface, &dir)) > 0) {
 		ip->ip_off = ntohs(ip->ip_off);
 		ip->ip_len = ntohs(ip->ip_len);
 		switch (fr_check(ip, ip->ip_hl << 2, iface, dir))
@@ -202,6 +194,6 @@ char *argv[];
 		putchar('\n');
 		dir = 0;
 	}
-	(*(*r)->r_close)();
+	(*r->r_close)();
 	return 0;
 }
diff --git a/usr.sbin/ipftest/ipt.h b/usr.sbin/ipftest/ipt.h
index fd0e5acf3e0..4545e1b39c4 100644
--- a/usr.sbin/ipftest/ipt.h
+++ b/usr.sbin/ipftest/ipt.h
@@ -4,6 +4,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
+ * $Id: ipt.h,v 1.2 1996/07/18 04:59:25 dm Exp $
  */
 
 #include <fcntl.h>
diff --git a/usr.sbin/ipftest/pcap.h b/usr.sbin/ipftest/pcap.h
index 94373c9c52d..5ffb01c7484 100644
--- a/usr.sbin/ipftest/pcap.h
+++ b/usr.sbin/ipftest/pcap.h
@@ -4,6 +4,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
+ * $Id: pcap.h,v 1.3 1996/07/18 04:59:26 dm Exp $
  */
 /*
  * This header file is constructed to match the version described by
diff --git a/usr.sbin/ipftest/snoop.h b/usr.sbin/ipftest/snoop.h
index 37503ea29f8..e351a1f7c7d 100644
--- a/usr.sbin/ipftest/snoop.h
+++ b/usr.sbin/ipftest/snoop.h
@@ -8,6 +8,7 @@
 
 /*
  * written to comply with the RFC (1761) from Sun.
+ * $Id: snoop.h,v 1.2 1996/07/18 04:59:26 dm Exp $
  */
 struct	snoophdr	{
 	char	s_id[8];