diff options
| author | Archie Cobbs <archie@FreeBSD.org> | 1998-11-17 03:24:13 +0000 |
|---|---|---|
| committer | Archie Cobbs <archie@FreeBSD.org> | 1998-11-17 03:24:13 +0000 |
| commit | e90831f9b9247a6d5b2c32014f00d63d8d719534 (patch) | |
| tree | 8713c67a7d5d95bf5d90ac350e01ea9abaf75f8a /security/skip | |
| parent | Move fonts from misc to local. (diff) | |
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>
Notes
Notes:
svn path=/head/; revision=14588
Diffstat (limited to 'security/skip')
| -rw-r--r-- | security/skip/files/patch-bf | 22 | ||||
| -rw-r--r-- | security/skip/files/patch-cl | 13 |
2 files changed, 33 insertions, 2 deletions
diff --git a/security/skip/files/patch-bf b/security/skip/files/patch-bf index ebd38cf05397..2afa0884eb1f 100644 --- a/security/skip/files/patch-bf +++ b/security/skip/files/patch-bf @@ -1,6 +1,6 @@ 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 13:12:42 1996 -+++ skipsrc-1.0/skip/freebsd/skip_es.c Sun Apr 12 15:51:32 1998 +--- 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]; @@ -71,6 +71,15 @@ diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_es.c skips 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(¶ms.tunnel_addr, &newip->ip_dst); @@ -126,3 +135,12 @@ diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_es.c skips /* * 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)) { diff --git a/security/skip/files/patch-cl b/security/skip/files/patch-cl new file mode 100644 index 000000000000..1b0679a5a0d1 --- /dev/null +++ b/security/skip/files/patch-cl @@ -0,0 +1,13 @@ +diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_if.h skipsrc-1.0/skip/freebsd/skip_if.h +--- skipsrc-1.0.orig/skip/freebsd/skip_if.h Fri Oct 25 20:12:43 1996 ++++ skipsrc-1.0/skip/freebsd/skip_if.h Mon Nov 16 22:55:25 1998 +@@ -104,7 +104,7 @@ + /* + * returns TRUE if SKIP has processed this buffer + */ +-#define SKIP_DECRYPTED(m) ((m)->m_flags & M_EOR) ++#define SKIP_DECRYPTED(m) ((m)->m_flags & M_PROTO1) + + /* + * Macro to retrieve an ifnet +diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_os.h skipsrc-1.0/skip/freebsd/skip_os.h |