diff options
| author | Archie Cobbs <archie@FreeBSD.org> | 2000-01-26 01:55:28 +0000 |
|---|---|---|
| committer | Archie Cobbs <archie@FreeBSD.org> | 2000-01-26 01:55:28 +0000 |
| commit | a3dd62941f5a3293aace76538667e68ba52e12c4 (patch) | |
| tree | 9a66dfd2813b90bae64681c94871563c1efd38c6 /security/skip/files/patch-bt | |
| parent | We were forgetting to install "README.FreeBSD+NAT". (diff) | |
Bash this port until it compiles under -current again.
Notes
Notes:
svn path=/head/; revision=25078
Diffstat (limited to 'security/skip/files/patch-bt')
| -rw-r--r-- | security/skip/files/patch-bt | 63 |
1 files changed, 41 insertions, 22 deletions
diff --git a/security/skip/files/patch-bt b/security/skip/files/patch-bt index 5e6d78fc77fb..097999241e8a 100644 --- a/security/skip/files/patch-bt +++ b/security/skip/files/patch-bt @@ -1,24 +1,43 @@ -diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/keymgrd/skip_init.C work.new/skip/keymgrd/skip_init.C ---- skipsrc-1.0.orig/skip/keymgrd/skip_init.C Fri Oct 25 13:12:49 1996 -+++ work.new/skip/keymgrd/skip_init.C Mon Mar 8 21:33:38 1999 -@@ -81,7 +81,7 @@ - return; - } +diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_if.h work.new/skip/freebsd/skip_if.h +--- skipsrc-1.0.orig/skip/freebsd/skip_if.h Fri Oct 25 13:12:43 1996 ++++ work.new/skip/freebsd/skip_if.h Mon Jan 24 12:35:39 2000 +@@ -86,7 +86,9 @@ + struct skip_es *next; + char if_name[SKIPSZ];/* e.g. "le0" */ + struct ifnet *ifp; /* network interface */ +- int (*if_output)(); /* default output handler */ ++ int (*if_output) /* default output handler */ ++ (struct ifnet *, struct mbuf *, ++ struct sockaddr *, struct rtentry *); + void *sd; /* skip descriptor */ + unsigned char if_mode; /* interface mode */ + int notifier; /* who to send events to */ +@@ -104,7 +106,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) -- skip_log(SKIP_NOTICE, "local name nsid=%d mkid=%s", -+ skip_log(SKIP_INFO, "local name nsid=%d mkid=%s", - nsid, keyid.get_info_str()); - } + /* + * Macro to retrieve an ifnet +@@ -114,14 +116,15 @@ + /* + * function prototypes + */ ++ ++int skip_init(void); ++int skip_uninit(void); + int skip_ifopen(dev_t, int, int, struct proc *); + int skip_ifclose(dev_t, int, int, struct proc *); +-int skip_ifioctl(dev_t, int, caddr_t, int, struct proc *); +-int skip_ifselect(dev_t, int, struct proc *); ++int skip_ifioctl(dev_t, u_long, caddr_t, int, struct proc *); ++int skip_ifpoll(dev_t, int, struct proc *); + int skip_ifwrite(dev_t, struct uio *, int); + int skip_ifread(dev_t, struct uio *, int); +- +-void skip_key_tellkm( enum skip_msgs, skip_keycb_t *); -@@ -135,9 +135,9 @@ - { - // Let the random number generator kick off its entropy gathering - -- skip_log(SKIP_NOTICE, "Initializing random number generator..."); -+ skip_log(SKIP_INFO, "Initializing random number generator..."); - Bstream dummy = get_random_bytes(1); -- skip_log(SKIP_NOTICE, "done"); -+ skip_log(SKIP_INFO, "done"); - } - - auth.load(SKIP_DIR); + /* + * exported functions |