diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-05-30 12:29:05 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2001-05-30 12:29:05 +0000 |
| commit | 0c498213aaebf1d4bd58afb2abbc6793287e8835 (patch) | |
| tree | 00a5ebe471f15abc17149eae4543a61f84c15f00 /sys/netinet/ipsec_output.c | |
| parent | ab00697c26b16b955dbba4c10ba65fdf9d3dc088 (diff) | |
Update to match prototypes.
Diffstat (limited to 'sys/netinet/ipsec_output.c')
| -rw-r--r-- | sys/netinet/ipsec_output.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c index f613e32c475..604a8f8f06a 100644 --- a/sys/netinet/ipsec_output.c +++ b/sys/netinet/ipsec_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_output.c,v 1.12 2001/05/29 01:19:37 angelos Exp $ */ +/* $OpenBSD: ipsec_output.c,v 1.13 2001/05/30 12:29:04 angelos Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -63,8 +63,7 @@ * place. */ int -ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready, - struct tdb *tdb2) +ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready) { int i, off, error; struct mbuf *mp; @@ -220,7 +219,7 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready, #endif /* INET6 */ /* Encapsulate -- the last two arguments are unused */ - error = ipip_output(m, tdb, &mp, 0, 0, NULL); + error = ipip_output(m, tdb, &mp, 0, 0); if ((mp == NULL) && (!error)) error = EFAULT; if (error) @@ -240,7 +239,7 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready, /* We may be done with this TDB */ if (tdb->tdb_xform->xf_type == XF_IP4) - return ipsp_process_done(m, tdb, tdb2); + return ipsp_process_done(m, tdb); } else { @@ -249,7 +248,7 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready, * encapsulation header, move on. */ if (tdb->tdb_xform->xf_type == XF_IP4) - return ipsp_process_done(m, tdb, tdb2); + return ipsp_process_done(m, tdb); } /* Extract some information off the headers */ @@ -273,7 +272,7 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready, } /* Invoke the IPsec transform */ - return (*(tdb->tdb_xform->xf_output))(m, tdb, NULL, i, off, tdb2); + return (*(tdb->tdb_xform->xf_output))(m, tdb, NULL, i, off); } /* @@ -281,7 +280,7 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready, * or do further processing, as necessary. */ int -ipsp_process_done(struct mbuf *m, struct tdb *tdb, struct tdb *tdb2) +ipsp_process_done(struct mbuf *m, struct tdb *tdb) { #ifdef INET struct ip *ip; @@ -365,11 +364,7 @@ ipsp_process_done(struct mbuf *m, struct tdb *tdb, struct tdb *tdb2) /* If there's another (bundled) TDB to apply, do so */ if (tdb->tdb_onext) return ipsp_process_packet(m, tdb->tdb_onext, tdb->tdb_dst.sa.sa_family, - 0, tdb2); - - /* Otherwise, if there's a secondary TDB to apply, do so */ - if (tdb2) - return ipsp_process_packet(m, tdb2, tdb->tdb_dst.sa.sa_family, 0, NULL); + 0); /* * We're done with IPsec processing, transmit the packet using the |