PSARC 2006/082 IP Filter Code Merge on ip_fil4.1.9

4912568 ipftest ipf ipfstat ipnat ippool need a non-name resolution flag
5040248 ipfs -W fails to save kernel state tables
5081834 syntax parser reports wrong error position and line number
5094575 keyword "netmask" is un-supported in ipnat.conf (4)
6181751 ipf parser fails on wrong subnet notations
6181773 ipf parser fails on wrong port ranges
6248745 ipnat drops packets if the IP header is not 32 bit aligned
6340621 RFE: IP Filter code merge on ip_fil4.1.9
6359805 ipf command incorrectly check options in rules and core dumps
6395837 ipnat tcpudp parsing is incomplete
6426469 IPFilter rejects IPv6 neighbour discovery packets
6447872 usr/src/common/ipf/ip_compat.h should not be CDDL

--HG--
rename : usr/src/common/ipf/bpf-ipf.h => usr/src/uts/common/inet/ipf/bpf-ipf.h
rename : usr/src/common/ipf/fil.c => usr/src/uts/common/inet/ipf/fil.c
rename : usr/src/common/ipf/ip_auth.c => usr/src/uts/common/inet/ipf/ip_auth.c
rename : usr/src/common/ipf/ip_fil_solaris.c => usr/src/uts/common/inet/ipf/ip_fil_solaris.c
rename : usr/src/common/ipf/ip_frag.c => usr/src/uts/common/inet/ipf/ip_frag.c
rename : usr/src/common/ipf/ip_htable.c => usr/src/uts/common/inet/ipf/ip_htable.c
rename : usr/src/common/ipf/ip_log.c => usr/src/uts/common/inet/ipf/ip_log.c
rename : usr/src/common/ipf/ip_lookup.c => usr/src/uts/common/inet/ipf/ip_lookup.c
rename : usr/src/common/ipf/ip_nat.c => usr/src/uts/common/inet/ipf/ip_nat.c
rename : usr/src/common/ipf/ip_pool.c => usr/src/uts/common/inet/ipf/ip_pool.c
rename : usr/src/common/ipf/ip_proxy.c => usr/src/uts/common/inet/ipf/ip_proxy.c
rename : usr/src/common/ipf/ip_state.c => usr/src/uts/common/inet/ipf/ip_state.c
rename : usr/src/common/ipf/ipf.h => usr/src/uts/common/inet/ipf/ipf.h
rename : usr/src/common/ipf/ipmon.h => usr/src/uts/common/inet/ipf/ipmon.h
rename : usr/src/common/ipf/ipt.h => usr/src/uts/common/inet/ipf/ipt.h
rename : usr/src/common/ipf/Makefile => usr/src/uts/common/inet/ipf/netinet/Makefile
rename : usr/src/common/ipf/ip_auth.h => usr/src/uts/common/inet/ipf/netinet/ip_auth.h
rename : usr/src/common/ipf/ip_compat.h => usr/src/uts/common/inet/ipf/netinet/ip_compat.h
rename : usr/src/common/ipf/ip_fil.h => usr/src/uts/common/inet/ipf/netinet/ip_fil.h
rename : usr/src/common/ipf/ip_frag.h => usr/src/uts/common/inet/ipf/netinet/ip_frag.h
rename : usr/src/common/ipf/ip_ftp_pxy.c => usr/src/uts/common/inet/ipf/netinet/ip_ftp_pxy.c
rename : usr/src/common/ipf/ip_h323_pxy.c => usr/src/uts/common/inet/ipf/netinet/ip_h323_pxy.c
rename : usr/src/common/ipf/ip_htable.h => usr/src/uts/common/inet/ipf/netinet/ip_htable.h
rename : usr/src/common/ipf/ip_ipsec_pxy.c => usr/src/uts/common/inet/ipf/netinet/ip_ipsec_pxy.c
rename : usr/src/common/ipf/ip_irc_pxy.c => usr/src/uts/common/inet/ipf/netinet/ip_irc_pxy.c
rename : usr/src/common/ipf/ip_lookup.h => usr/src/uts/common/inet/ipf/netinet/ip_lookup.h
rename : usr/src/common/ipf/ip_nat.h => usr/src/uts/common/inet/ipf/netinet/ip_nat.h
rename : usr/src/common/ipf/ip_netbios_pxy.c => usr/src/uts/common/inet/ipf/netinet/ip_netbios_pxy.c
rename : usr/src/common/ipf/ip_pool.h => usr/src/uts/common/inet/ipf/netinet/ip_pool.h
rename : usr/src/common/ipf/ip_proxy.h => usr/src/uts/common/inet/ipf/netinet/ip_proxy.h
rename : usr/src/common/ipf/ip_raudio_pxy.c => usr/src/uts/common/inet/ipf/netinet/ip_raudio_pxy.c
rename : usr/src/common/ipf/ip_rcmd_pxy.c => usr/src/uts/common/inet/ipf/netinet/ip_rcmd_pxy.c
rename : usr/src/common/ipf/ip_rpcb_pxy.c => usr/src/uts/common/inet/ipf/netinet/ip_rpcb_pxy.c
rename : usr/src/common/ipf/ip_state.h => usr/src/uts/common/inet/ipf/netinet/ip_state.h
rename : usr/src/common/ipf/ipl.h => usr/src/uts/common/inet/ipf/netinet/ipl.h
rename : usr/src/common/ipf/opts.h => usr/src/uts/common/inet/ipf/opts.h
rename : usr/src/common/ipf/radix.c => usr/src/uts/common/inet/ipf/radix.c
rename : usr/src/common/ipf/radix.h => usr/src/uts/common/inet/ipf/radix.h
rename : usr/src/common/ipf/solaris.c => usr/src/uts/common/inet/ipf/solaris.c
rename : usr/src/uts/common/inet/ipf/compat.h => usr/src/uts/common/inet/pfil/compat.h
rename : usr/src/uts/common/inet/ipf/misc.c => usr/src/uts/common/inet/pfil/misc.c
rename : usr/src/uts/common/inet/ipf/ndd.c => usr/src/uts/common/inet/pfil/ndd.c
rename : usr/src/uts/common/inet/ipf/os.h => usr/src/uts/common/inet/pfil/os.h
rename : usr/src/uts/common/inet/ipf/pfil.c => usr/src/uts/common/inet/pfil/pfil.c
rename : usr/src/uts/common/inet/ipf/pfil.conf => usr/src/uts/common/inet/pfil/pfil.conf
rename : usr/src/uts/common/inet/ipf/pfil.h => usr/src/uts/common/inet/pfil/pfil.h
rename : usr/src/common/ipf/pfild.h => usr/src/uts/common/inet/pfil/pfild.h
rename : usr/src/uts/common/inet/ipf/pfildrv.c => usr/src/uts/common/inet/pfil/pfildrv.c
rename : usr/src/uts/common/inet/ipf/pfilstream.c => usr/src/uts/common/inet/pfil/pfilstream.c
rename : usr/src/uts/common/inet/ipf/pkt.c => usr/src/uts/common/inet/pfil/pkt.c
rename : usr/src/uts/common/inet/ipf/qif.c => usr/src/uts/common/inet/pfil/qif.c
rename : usr/src/uts/common/inet/ipf/qif.h => usr/src/uts/common/inet/pfil/qif.h

1 files changed, 116 insertions, 0 deletions

diff --git a/usr/src/uts/common/inet/pfil/misc.c b/usr/src/uts/common/inet/pfil/misc.c
new file mode 100644
index 0000000000..2a8c84dd4c
--- /dev/null
+++ b/usr/src/uts/common/inet/pfil/misc.c
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2003 by Darren Reed.
+ *
+ * See the IPFILTER.LICENCE file for details on licencing.
+ */
+#ifndef __hpux
+#pragma ident "@(#)$Id: misc.c,v 1.12 2003/11/29 07:11:03 darrenr Exp $"
+#else
+struct uio;
+#endif
+
+#include <sys/systm.h>
+#include <sys/types.h>
+#include <sys/stream.h>
+
+#include "compat.h"
+
+#ifdef	__hpux
+# define	BCOPY(a,b,c)	bcopy((caddr_t)a, (caddr_t)b, c)
+#endif
+#ifdef	sun
+# define	BCOPY(a,b,c)	bcopy((char *)a, (char *)b, c)
+#endif
+
+void mb_copydata(min, off, len, buf)
+mblk_t *min;
+size_t off, len;
+char *buf;
+{
+	u_char *s, *bp = (u_char *)buf;
+	size_t mlen, olen, clen;
+	mblk_t *m;
+
+	for (m = min; (m != NULL) && (len > 0); m = m->b_cont) {
+		if (MTYPE(m) != M_DATA)
+			continue;
+		s = m->b_rptr;
+		mlen = m->b_wptr - s;
+		olen = MIN(off, mlen);
+		if ((olen == mlen) || (olen < off)) {
+			off -= olen;
+			continue;
+		} else if (olen) {
+			off -= olen;
+			s += olen;
+			mlen -= olen;
+		}
+		clen = MIN(mlen, len);
+		BCOPY(s, bp, clen);
+		len -= clen;
+		bp += clen;
+	}
+}
+
+
+void mb_copyback(min, off, len, buf)
+mblk_t *min;
+size_t off, len;
+char *buf;
+{
+	u_char *s, *bp = (u_char *)buf;
+	size_t mlen, olen, clen;
+	mblk_t *m, *mp;
+
+	for (m = min, mp = NULL; (m != NULL) && (len > 0); m = m->b_cont) {
+		mp = m;
+		if (MTYPE(m) != M_DATA)
+			continue;
+
+		s = m->b_rptr;
+		mlen = m->b_wptr - s;
+		olen = MIN(off, mlen);
+		if ((olen == mlen) || (olen < off)) {
+			off -= olen;
+			continue;
+		} else if (olen) {
+			off -= olen;
+			s += olen;
+			mlen -= olen;
+		}
+		clen = MIN(mlen, len);
+		BCOPY(bp, s, clen);
+		len -= clen;
+		bp += clen;
+	}
+
+	if ((m == NULL) && (mp != NULL)) {
+		if (len > 0) {
+			mlen = mp->b_datap->db_lim - mp->b_wptr;
+			if (mlen > 0) {
+				if (mlen > len)
+					mlen = len;
+				bcopy((char *)bp, (char *)mp->b_wptr, mlen);
+				bp += mlen;
+				len -= mlen;
+				mp->b_wptr += mlen;
+#ifdef  STRUIO_IP
+# if SOLARIS2 < 10
+				mp->b_datap->db_struiolim = mp->b_wptr;
+# endif
+				mp->b_datap->db_struioflag &= ~STRUIO_IP;
+#endif
+			}
+		}
+
+		if (len > 0) {
+			m = allocb(len, BPRI_MED);
+			if (m != NULL) {
+				bcopy((char *)bp, (char *)m->b_wptr, len);
+				m->b_band = mp->b_band;
+				m->b_wptr += len;
+				linkb(mp, m);
+			}
+		}
+	}
+}