head	1.7;
access;
symbols
	RELEASE_6_1_0:1.6
	RELEASE_5_5_0:1.6
	RELEASE_6_0_0:1.6
	RELEASE_5_4_0:1.6
	RELEASE_4_11_0:1.6
	RELEASE_5_3_0:1.6
	RELEASE_4_10_0:1.6
	RELEASE_5_2_1:1.6
	RELEASE_5_2_0:1.6
	RELEASE_4_9_0:1.6
	RELEASE_5_1_0:1.6
	RELEASE_4_8_0:1.6
	RELEASE_5_0_0:1.6
	RELEASE_4_7_0:1.6
	RELEASE_4_6_2:1.6
	RELEASE_4_6_1:1.6
	RELEASE_4_6_0:1.6
	RELEASE_5_0_DP1:1.6
	RELEASE_4_5_0:1.6
	RELEASE_4_4_0:1.6
	RELEASE_4_3_0:1.6
	RELEASE_4_2_0:1.6
	RELEASE_4_1_1:1.6
	RELEASE_4_1_0:1.6
	RELEASE_3_5_0:1.6
	RELEASE_4_0_0:1.6
	RELEASE_3_4_0:1.5
	RELEASE_3_3_0:1.5
	RELEASE_3_2_0:1.5
	RELEASE_3_1_0:1.4
	RELEASE_2_2_8:1.4
	RELEASE_3_0_0:1.3
	RELEASE_2_2_7:1.3
	RELEASE_2_2_6:1.2
	ARCHIE_1:1.1.1.1
	WHISTLE_ARCHIE:1.1.1;
locks; strict;
comment	@# @;


1.7
date	2006.04.06.13.54.44;	author archie;	state dead;
branches;
next	1.6;

1.6
date	2000.01.26.01.55.12;	author archie;	state Exp;
branches;
next	1.5;

1.5
date	99.03.10.22.27.52;	author archie;	state Exp;
branches;
next	1.4;

1.4
date	98.11.17.03.24.13;	author archie;	state Exp;
branches;
next	1.3;

1.3
date	98.04.13.00.17.43;	author julian;	state Exp;
branches;
next	1.2;

1.2
date	98.03.07.00.34.09;	author julian;	state Exp;
branches;
next	1.1;

1.1
date	98.01.09.23.23.49;	author julian;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	98.01.09.23.23.49;	author julian;	state Exp;
branches;
next	;


desc
@@


1.7
log
@Remove the skip port. Created before there was an IPSec implementation on
FreeBSD, it is now extremely obsolete. In any case it doesn't compile. Earlier
version of this port can still be used on older versions of FreeBSD of course.
@
text
@diff -ur --unidirectional-new-file skipsrc-1.0.orig/libdb/hash/hash.h work.new/libdb/hash/hash.h
--- skipsrc-1.0.orig/libdb/hash/hash.h	Fri Oct 25 13:12:21 1996
+++ work.new/libdb/hash/hash.h	Mon Jan 24 12:35:38 2000
@@@@ -103,7 +103,7 @@@@
 	BUFHEAD 	*cpage;		/* Current page */
 	int		cbucket;	/* Current bucket */
 	int		cndx;		/* Index of next item on cpage */
-	int		errno;		/* Error Number -- for DBM 
+	int		errnum;		/* Error Number -- for DBM 
 					 * compatability */
 	int		new_file;	/* Indicates if fd is backing store 
 					 * or no */
@


1.6
log
@Bash this port until it compiles under -current again.
@
text
@@


1.5
log
@Build SKIP port as a KLD instead of an LKM.
@
text
@d1 12
a12 30
diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/common/skip_keystore.c work.new/skip/common/skip_keystore.c
--- skipsrc-1.0.orig/skip/common/skip_keystore.c	Fri Oct 25 13:12:41 1996
+++ work.new/skip/common/skip_keystore.c	Tue Mar  9 20:23:43 1999
@@@@ -308,7 +308,7 @@@@
 		/*
 	 	 * SKIP tunneling mode
 	 	 */
-		params->payload_type = IPPROTO_ENCAP;
+		params->payload_type = IPPROTO_IPIP;
 	}
 	/*
 	 * Return offset of data to decrypt
@@@@ -1177,7 +1177,7 @@@@
  * Returns: none
  */
 void
-skip_key_iterate(int (*f)(), void *arg)
+skip_key_iterate(int (*f)(skip_keycb_t *, void *), void *arg)
 {
 	skip_keycb_t	*cp, *ncp;
 	int		i, rc;
@@@@ -1209,7 +1209,7 @@@@
 		for (cp = skip_decrypt_hashtable[i]; cp; cp = ncp) {
 			ncp = cp->next;
 
-			rc = (*f)(cp);
+			rc = (*f)(cp, arg);
 
 			if (rc) {
 				skip_hash_remove(cp, skip_decrypt_hashtable,
@


1.4
log
@SKIP needs a custom mbuf flag; use M_PROTO1 instead of M_EOR.
PR:		ports/8712
Reviewed by:	Archie Cobbs <archie@@whistle.com>
Submitted by:	Christopher N . Harrell <cnh@@eng.mindspring.net>
@
text
@d1 14
a14 14
diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_es.c skipsrc-1.0/skip/freebsd/skip_es.c
--- skipsrc-1.0.orig/skip/freebsd/skip_es.c	Fri Oct 25 20:12:42 1996
+++ skipsrc-1.0/skip/freebsd/skip_es.c	Mon Nov 16 22:55:18 1998
@@@@ -81,6 +81,11 @@@@
 static unsigned short	skip_pktid;
 static skip_softc_t	skip_softc[SKIP_MAX_OPENS];
 
+#ifdef NEW_TIMEOUT_INTERFACE
+static struct callout_handle
+	skip_timeout_handle = CALLOUT_HANDLE_INITIALIZER(&skip_timeout_handle);
+#endif
+
 /*
  * statistics
d16 3
a18 27
@@@@ -252,7 +257,10 @@@@
 		for (pr = inetdomain.dom_protosw;
 			pr < inetdomain.dom_protoswNPROTOSW; pr++) {
 
-			pr->pr_input = skip_ifinput;
+			if (pr->pr_protocol == IPPROTO_DIVERT)
+				continue;
+			pr->pr_input =
+				(void (*)(struct mbuf *, int)) skip_ifinput;
 		}
 		splx(s);
 	}
@@@@ -788,7 +796,11 @@@@
 static void
 skip_inittimers()
 {
+#ifdef NEW_TIMEOUT_INTERFACE
+	skip_timeout_handle = timeout(skip_timer, NULL, skip_key_tick * hz);
+#else
 	timeout(skip_timer, NULL, skip_key_tick * hz);
+#endif
 }
  
 /* skip_uninittimers()
@@@@ -800,7 +812,12 @@@@
 static void
 skip_uninittimers()
d20 5
a24 42
+#ifdef NEW_TIMEOUT_INTERFACE
+	untimeout(skip_timer, NULL, skip_timeout_handle);
+	callout_handle_init(&skip_timeout_handle);
+#else
 	untimeout(skip_timer, NULL);
+#endif
 }
  
 /* skip_timer()
@@@@ -819,7 +836,11 @@@@
 	 * run through the key store
 	 */
 	skip_key_iterate(skip_key_check, NULL);
+#ifdef NEW_TIMEOUT_INTERFACE
+	skip_timeout_handle = timeout(skip_timer, NULL, skip_key_tick * hz);
+#else
 	timeout(skip_timer, NULL, skip_key_tick * hz);
+#endif
 }
 
 #ifdef notdef
@@@@ -1718,7 +1739,7 @@@@
 		 */
 		decryptbuf->m_data += iphlen;
 	
-                SKIP_DEBUG2("skip_ifinput: decryptbuf m_len=%d m_data=%d\n",
+                SKIP_DEBUG2("skip_ifinput: decryptbuf m_len=%d m_data=%p\n",
                                         decryptbuf->m_len, decryptbuf->m_data);
 
 	} 
@@@@ -1745,7 +1766,7 @@@@
 	ip->ip_id = ntohs(ip->ip_id);
 	ip->ip_off = ntohs(ip->ip_off);
 pass:
-	m->m_flags &= ~ M_EOR;
+	m->m_flags &= ~ M_PROTO1;
 	(*inetsw_default[ip_protox[ip->ip_p]].pr_input)(m, hlen);
 	return (0);
 }
@@@@ -1910,6 +1931,13 @@@@
 		 */
                 IPADDRCOPY(&params.tunnel_addr, &newip->ip_dst);
d26 2
a27 8
+		/* 
+		 * insert different source address if specified 
+		 */
+
+		if(params.source != 0)
+			(&newip->ip_src)->s_addr = params.source;
+
 		encryptbuf->m_len += sizeof (struct ip);
d29 2
a30 51
 		/*
@@@@ -2005,7 +2033,7 @@@@
 			if (params.kp_alg) {
 				newip->ip_p = SKIP_NEXT_ESP;
 			} else {
-				newip->ip_p = IPPROTO_ENCAP;
+				newip->ip_p = IPPROTO_IPIP;
 			}
 		}
 		skip_if->stats.skip_if_raw_out++;
@@@@ -2028,6 +2056,13 @@@@
 		 * insert tunnel address as destination
 		 */
 		IPADDRCOPY(&params.tunnel_addr, &newip->ip_dst);
+
+		/* 
+		 * insert different source address if specified 
+		 */
+
+		if(params.source != 0) 
+			(&newip->ip_src)->s_addr = params.source;
 	}
 
 	if (params.s_nsid == 0) {
@@@@ -2097,7 +2132,7 @@@@
 	register skip_param_t   *params = &res->params;
 	register struct ip      *ip = mtod(original, struct ip *);
 	int                     rc, s, iphlen;
-	struct mbuf             *outbuf, *new_hdr;
+	struct mbuf             *outbuf;
 
 	SKIP_PRINT("skip_decrypt_done", params);
 
@@@@ -2125,7 +2160,7 @@@@
 	 */
 	outbuf = (res->modes & SKIP_CRYPT_ON) ? m : original;
 
-	if (res->proto != IPPROTO_ENCAP) {
+	if (res->proto != IPPROTO_IPIP) {
 		/*
 		 * transport mode, need to copy original IP header
 		 */
@@@@ -2195,7 +2230,7 @@@@
 	/*
 	 * tag the start of the header buffer so SKIP can recognise it
 	 */
-	outbuf->m_flags |= M_EOR | M_PKTHDR;
+	outbuf->m_flags |= M_PROTO1 | M_PKTHDR;
     
 	s = splimp();
 	if (IF_QFULL(&ipintrq)) {
@


1.3
log
@Submitted by:	archie Cobbs (archie@@whistle.com)
updates to make skip port work better, from the original porter.
@
text
@d2 2
a3 2
--- skipsrc-1.0.orig/skip/freebsd/skip_es.c	Fri Oct 25 13:12:42 1996
+++ skipsrc-1.0/skip/freebsd/skip_es.c	Sun Apr 12 15:51:32 1998
d74 9
d138 9
@


1.2
log
@PR:		5911
Submitted by:	archie@@whistle.com (archie cobbs)

take into account interraction between IPDIVERT and SKIP
@
text
@d3 1
a3 1
+++ skipsrc-1.0/skip/freebsd/skip_es.c	Tue Mar  3 16:58:54 1998
d74 15
a88 1
@@@@ -2005,7 +2026,7 @@@@
d97 15
a111 1
@@@@ -2097,7 +2118,7 @@@@
d120 1
a120 1
@@@@ -2125,7 +2146,7 @@@@
@


1.1
log
@Initial revision
@
text
@d3 1
a3 1
+++ skipsrc-1.0/skip/freebsd/skip_es.c	Mon Dec 15 17:41:37 1997
d16 1
a16 1
@@@@ -252,7 +257,8 @@@@
d21 2
d28 1
a28 1
@@@@ -788,7 +794,11 @@@@
d40 1
a40 1
@@@@ -800,7 +810,12 @@@@
d53 1
a53 1
@@@@ -819,7 +834,11 @@@@
d65 1
a65 1
@@@@ -1718,7 +1737,7 @@@@
d74 1
a74 1
@@@@ -2005,7 +2024,7 @@@@
d83 1
a83 1
@@@@ -2097,7 +2116,7 @@@@
d92 1
a92 1
@@@@ -2125,7 +2144,7 @@@@
@


1.1.1.1
log
@Add a package for the SKIP package from Sun Microsystems,
for making secure pipes across the internet (etc.)
@
text
@@
