summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_ah.h5
-rw-r--r--sys/netinet/ip_ah_new.c5
-rw-r--r--sys/netinet/ip_ah_old.c5
-rw-r--r--sys/netinet/ip_esp.h5
-rw-r--r--sys/netinet/ip_esp_new.c5
-rw-r--r--sys/netinet/ip_esp_old.c5
-rw-r--r--sys/netinet/ip_ipsp.h20
-rw-r--r--sys/netinet/ip_output.c5
-rw-r--r--sys/netinet/tcp_subr.c5
9 files changed, 23 insertions, 37 deletions
diff --git a/sys/netinet/ip_ah.h b/sys/netinet/ip_ah.h
index 2bf947df5c3..c08e18a9c58 100644
--- a/sys/netinet/ip_ah.h
+++ b/sys/netinet/ip_ah.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ah.h,v 1.16 1999/04/11 19:41:37 niklas Exp $ */
+/* $OpenBSD: ip_ah.h,v 1.17 1999/10/29 02:10:01 angelos Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
@@ -96,8 +96,7 @@ struct ah_new
#ifdef _KERNEL
void ah_input __P((struct mbuf *, ...));
-int ah_output __P((struct mbuf *, struct sockaddr_encap *,
- struct tdb *, struct mbuf **));
+int ah_output __P((struct mbuf *, struct tdb *, struct mbuf **));
int ah_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
extern int ah_enable;
diff --git a/sys/netinet/ip_ah_new.c b/sys/netinet/ip_ah_new.c
index d82bfe2c26b..73b91396791 100644
--- a/sys/netinet/ip_ah_new.c
+++ b/sys/netinet/ip_ah_new.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ah_new.c,v 1.27 1999/06/30 17:23:59 deraadt Exp $ */
+/* $OpenBSD: ip_ah_new.c,v 1.28 1999/10/29 02:10:01 angelos Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
@@ -432,8 +432,7 @@ ah_new_input(struct mbuf *m, struct tdb *tdb)
}
int
-ah_new_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
- struct mbuf **mp)
+ah_new_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp)
{
struct auth_hash *ahx = (struct auth_hash *) tdb->tdb_authalgxform;
struct ip *ip, ipo;
diff --git a/sys/netinet/ip_ah_old.c b/sys/netinet/ip_ah_old.c
index b209b73e272..c669107f47a 100644
--- a/sys/netinet/ip_ah_old.c
+++ b/sys/netinet/ip_ah_old.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ah_old.c,v 1.24 1999/06/30 17:23:59 deraadt Exp $ */
+/* $OpenBSD: ip_ah_old.c,v 1.25 1999/10/29 02:10:01 angelos Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
@@ -375,8 +375,7 @@ ah_old_input(struct mbuf *m, struct tdb *tdb)
}
int
-ah_old_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
- struct mbuf **mp)
+ah_old_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp)
{
struct auth_hash *ahx = (struct auth_hash *) tdb->tdb_authalgxform;
struct ip *ip, ipo;
diff --git a/sys/netinet/ip_esp.h b/sys/netinet/ip_esp.h
index 6f9d9e76673..1a93d8b8554 100644
--- a/sys/netinet/ip_esp.h
+++ b/sys/netinet/ip_esp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_esp.h,v 1.23 1999/04/11 19:41:38 niklas Exp $ */
+/* $OpenBSD: ip_esp.h,v 1.24 1999/10/29 02:10:01 angelos Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
@@ -92,8 +92,7 @@ struct espstat
#ifdef _KERNEL
void esp_input __P((struct mbuf *, ...));
-int esp_output __P((struct mbuf *, struct sockaddr_encap *,
- struct tdb *, struct mbuf **));
+int esp_output __P((struct mbuf *, struct tdb *, struct mbuf **));
int esp_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
extern int esp_enable;
diff --git a/sys/netinet/ip_esp_new.c b/sys/netinet/ip_esp_new.c
index 33e6ea4b831..2f37fea483d 100644
--- a/sys/netinet/ip_esp_new.c
+++ b/sys/netinet/ip_esp_new.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_esp_new.c,v 1.46 1999/10/06 22:27:57 jason Exp $ */
+/* $OpenBSD: ip_esp_new.c,v 1.47 1999/10/29 02:10:01 angelos Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
@@ -582,8 +582,7 @@ esp_new_input(struct mbuf *m, struct tdb *tdb)
}
int
-esp_new_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
- struct mbuf **mp)
+esp_new_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp)
{
struct enc_xform *espx = (struct enc_xform *) tdb->tdb_encalgxform;
struct auth_hash *esph = (struct auth_hash *) tdb->tdb_authalgxform;
diff --git a/sys/netinet/ip_esp_old.c b/sys/netinet/ip_esp_old.c
index 0d3f876455d..dc4ebe2b118 100644
--- a/sys/netinet/ip_esp_old.c
+++ b/sys/netinet/ip_esp_old.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_esp_old.c,v 1.36 1999/10/06 22:27:57 jason Exp $ */
+/* $OpenBSD: ip_esp_old.c,v 1.37 1999/10/29 02:10:02 angelos Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
@@ -428,8 +428,7 @@ esp_old_input(struct mbuf *m, struct tdb *tdb)
}
int
-esp_old_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb,
- struct mbuf **mp)
+esp_old_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp)
{
struct enc_xform *espx = (struct enc_xform *) tdb->tdb_encalgxform;
struct ip *ip, ipo;
diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h
index 791233a1815..3b4cdcc6eea 100644
--- a/sys/netinet/ip_ipsp.h
+++ b/sys/netinet/ip_ipsp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipsp.h,v 1.44 1999/10/29 02:02:33 angelos Exp $ */
+/* $OpenBSD: ip_ipsp.h,v 1.45 1999/10/29 02:10:02 angelos Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
@@ -352,8 +352,7 @@ struct xformsw
int (*xf_init)(struct tdb *, struct xformsw *, struct ipsecinit *);
int (*xf_zeroize)(struct tdb *); /* termination */
struct mbuf *(*xf_input)(struct mbuf *, struct tdb *); /* input */
- int (*xf_output)(struct mbuf *, struct sockaddr_encap *,
- struct tdb *, struct mbuf **); /* output */
+ int (*xf_output)(struct mbuf *, struct tdb *, struct mbuf **); /* output */
};
/* xform IDs */
@@ -479,32 +478,28 @@ extern void etherip_input __P((struct mbuf *, ...));
extern int ah_old_attach(void);
extern int ah_old_init(struct tdb *, struct xformsw *, struct ipsecinit *);
extern int ah_old_zeroize(struct tdb *);
-extern int ah_old_output(struct mbuf *, struct sockaddr_encap *, struct tdb *,
- struct mbuf **);
+extern int ah_old_output(struct mbuf *, struct tdb *, struct mbuf **);
extern struct mbuf *ah_old_input(struct mbuf *, struct tdb *);
/* XF_NEW_AH */
extern int ah_new_attach(void);
extern int ah_new_init(struct tdb *, struct xformsw *, struct ipsecinit *);
extern int ah_new_zeroize(struct tdb *);
-extern int ah_new_output(struct mbuf *, struct sockaddr_encap *, struct tdb *,
- struct mbuf **);
+extern int ah_new_output(struct mbuf *, struct tdb *, struct mbuf **);
extern struct mbuf *ah_new_input(struct mbuf *, struct tdb *);
/* XF_OLD_ESP */
extern int esp_old_attach(void);
extern int esp_old_init(struct tdb *, struct xformsw *, struct ipsecinit *);
extern int esp_old_zeroize(struct tdb *);
-extern int esp_old_output(struct mbuf *, struct sockaddr_encap *, struct tdb *,
- struct mbuf **);
+extern int esp_old_output(struct mbuf *, struct tdb *, struct mbuf **);
extern struct mbuf *esp_old_input(struct mbuf *, struct tdb *);
/* XF_NEW_ESP */
extern int esp_new_attach(void);
extern int esp_new_init(struct tdb *, struct xformsw *, struct ipsecinit *);
extern int esp_new_zeroize(struct tdb *);
-extern int esp_new_output(struct mbuf *, struct sockaddr_encap *, struct tdb *,
- struct mbuf **);
+extern int esp_new_output(struct mbuf *, struct tdb *, struct mbuf **);
extern struct mbuf *esp_new_input(struct mbuf *, struct tdb *);
/* XF_TCPSIGNATURE */
@@ -513,8 +508,7 @@ extern int tcp_signature_tdb_init __P((struct tdb *, struct xformsw *,
struct ipsecinit *));
extern int tcp_signature_tdb_zeroize __P((struct tdb *));
extern struct mbuf *tcp_signature_tdb_input __P((struct mbuf *, struct tdb *));
-extern int tcp_signature_tdb_output __P((struct mbuf *,
- struct sockaddr_encap *, struct tdb *,
+extern int tcp_signature_tdb_output __P((struct mbuf *, struct tdb *,
struct mbuf **));
/* Padding */
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 845804e3c0f..d29cafe4dc2 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_output.c,v 1.50 1999/10/29 02:04:02 angelos Exp $ */
+/* $OpenBSD: ip_output.c,v 1.51 1999/10/29 02:10:02 angelos Exp $ */
/* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */
/*
@@ -472,8 +472,7 @@ ip_output(m0, va_alist)
ip->ip_sum = in_cksum(m, hlen);
}
- error = (*(tdb->tdb_xform->xf_output))(m, gw,
- tdb, &mp);
+ error = (*(tdb->tdb_xform->xf_output))(m, tdb, &mp);
if (!error && mp == NULL)
error = EFAULT;
if (error) {
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index b32bd84e4e8..b8aa47c4e05 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_subr.c,v 1.19 1999/08/27 08:15:50 millert Exp $ */
+/* $OpenBSD: tcp_subr.c,v 1.20 1999/10/29 02:10:02 angelos Exp $ */
/* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */
/*
@@ -830,9 +830,8 @@ tcp_signature_tdb_input(m, tdbp)
}
int
-tcp_signature_tdb_output(m, gw, tdbp, mp)
+tcp_signature_tdb_output(m, tdbp, mp)
struct mbuf *m;
- struct sockaddr_encap *gw;
struct tdb *tdbp;
struct mbuf **mp;
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 10:44:03 +0000