* Someone imported a lot of files with the wrong CVS tag, so lots of files need

  that fixed in them....
* Keep unnecessary files out of the non-vendor part of this CVS repository.

3 files changed, 13 insertions, 31 deletions

diff --git a/contrib/ipfilter/iplang/iplang.h b/contrib/ipfilter/iplang/iplang.h
index 675897b..2b2d1db 100644
--- a/contrib/ipfilter/iplang/iplang.h
+++ b/contrib/ipfilter/iplang/iplang.h
@@ -1,4 +1,4 @@
-/*	$NetBSD$	*/
+/*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
diff --git a/contrib/ipfilter/iplang/iplang_l.l b/contrib/ipfilter/iplang/iplang_l.l
index 0a97ec9..71e478b 100644
--- a/contrib/ipfilter/iplang/iplang_l.l
+++ b/contrib/ipfilter/iplang/iplang_l.l
@@ -1,4 +1,4 @@
-/*	$NetBSD$	*/
+/*	$FreeBSD$	*/
 
 %{
 /*
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/contrib/ipfilter/iplang/iplang_y.y
index 5b7608b..22ea40b 100644
--- a/contrib/ipfilter/iplang/iplang_y.y
+++ b/contrib/ipfilter/iplang/iplang_y.y
@@ -1,18 +1,15 @@
+/*	$FreeBSD$	*/
+
 %{
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
  *
- * 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.
+ * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: iplang_y.y,v 2.2 1999/12/04 03:37:04 darrenr Exp $
+ * Id: iplang_y.y,v 2.9.2.2 2004/12/09 19:41:10 darrenr Exp
  * $FreeBSD$
  */
 
-#if defined(__sgi) && (IRIX > 602)
-# include <sys/ptimers.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
@@ -32,12 +29,9 @@
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
 #ifndef	linux
 #include <netinet/ip_var.h>
 #endif
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
 #include <net/if.h>
 #ifndef	linux
 #include <netinet/if_ether.h>
@@ -53,7 +47,7 @@
 #include "iplang.h"
 
 #if !defined(__NetBSD__) && (!defined(__FreeBSD_version) && \
-    __FreeBSD_version < 400020 ) && SOLARIS2 < 10 
+    __FreeBSD_version < 400020) && (!SOLARIS || SOLARIS2 < 10)
 extern	struct ether_addr *ether_aton __P((char *));
 #endif
 
@@ -774,7 +768,7 @@ char **arg;
 
 	while ((c = *s++)) {
 		if (todo) {
-			if (isdigit(c)) {
+			if (ISDIGIT(c)) {
 				todo--;
 				if (c > '7') {
 					fprintf(stderr, "octal with %c!\n", c);
@@ -783,7 +777,7 @@ char **arg;
 				val <<= 3;
 				val |= (c - '0');
 			}
-			if (!isdigit(c) || !todo) {
+			if (!ISDIGIT(c) || !todo) {
 				*t++ = (u_char)(val & 0xff);
 				todo = 0;
 			}
@@ -791,7 +785,7 @@ char **arg;
 				continue;
 		}
 		if (quote) {
-			if (isdigit(c)) {
+			if (ISDIGIT(c)) {
 				todo = 2;
 				if (c > '7') {
 					fprintf(stderr, "octal with %c!\n", c);
@@ -1295,7 +1289,7 @@ void prep_packet()
 		return;
 	}
 	if (ifp->if_fd == -1)
-		ifp->if_fd = initdevice(ifp->if_name, 0, 5);
+		ifp->if_fd = initdevice(ifp->if_name, 5);
 	gwip = sending.snd_gw;
 	if (!gwip.s_addr)
 		gwip = aniphead->ah_ip->ip_dst;
@@ -1327,7 +1321,7 @@ void packet_done()
 				sprintf((char *)t, "	");
 				t += 8;
 				for (k = 16; k; k--, s++)
-					*t++ = (isprint(*s) ? *s : '.');
+					*t++ = (ISPRINT(*s) ? *s : '.');
 				s--;
 			}
 
@@ -1345,7 +1339,7 @@ void packet_done()
 			t += 7;
 			s -= j & 0xf;
 			for (k = j & 0xf; k; k--, s++)
-				*t++ = (isprint(*s) ? *s : '.');
+				*t++ = (ISPRINT(*s) ? *s : '.');
 			*t++ = '\n';
 			*t = '\0';
 		}
@@ -1519,11 +1513,6 @@ int type;
 }
 
 
-static	char	*icmpcodes[] = {
-	"net-unr", "host-unr", "proto-unr", "port-unr", "needfrag", "srcfail",
-	"net-unk", "host-unk", "isolate", "net-prohib", "host-prohib",
-	"net-tos", "host-tos", NULL };
-
 void set_icmpcodetok(code)
 char **code;
 {
@@ -1542,13 +1531,6 @@ char **code;
 }
 
 
-static	char	*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"
-};
-
 void set_icmptypetok(type)
 char **type;
 {