diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-03-31 14:27:39 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-03-31 14:27:39 +0000 |
| commit | 1e30a9e562b4cc683dad031fba68de073895bcd2 (patch) | |
| tree | ff8f2ba74756b2f713f5aa5d0771acc7ed4c33e8 /sbin/isakmpd/pf_encap.c | |
| parent | 0ec447b528a219adc9d4f77a296381351cf82611 (diff) | |
ipsec.c: Merge with EOM 1.86
ipsec.h: Merge with EOM 1.33
pf_encap.c: Merge with EOM 1.52
pf_key_v2.c: Merge with EOM 1.3
Fix case of missing client ID payloads, a case the standards allow. Thanks
to Michael Paddon (mwp@aba.net.au) for the diffs I based my fix upon. His
diff also made me realize I stored the address information in host order in
internal structures where I had planned to use network order. Fix this,
and remove the XXXes I had due to this elsewhere. Add commentary.
Diffstat (limited to 'sbin/isakmpd/pf_encap.c')
| -rw-r--r-- | sbin/isakmpd/pf_encap.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sbin/isakmpd/pf_encap.c b/sbin/isakmpd/pf_encap.c index 2790140b27a..2a437a7512e 100644 --- a/sbin/isakmpd/pf_encap.c +++ b/sbin/isakmpd/pf_encap.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pf_encap.c,v 1.9 1999/03/31 00:51:50 niklas Exp $ */ -/* $EOM: pf_encap.c,v 1.51 1999/03/30 21:43:08 niklas Exp $ */ +/* $OpenBSD: pf_encap.c,v 1.10 1999/03/31 14:27:38 niklas Exp $ */ +/* $EOM: pf_encap.c,v 1.52 1999/03/31 14:19:53 niklas Exp $ */ /* * Copyright (c) 1998 Niklas Hallqvist. All rights reserved. @@ -712,10 +712,8 @@ pf_encap_enable_sa (struct sa *sa) sa->transport->vtbl->get_dst (sa->transport, &dst, &dstlen); - /* XXX Check why byte ordering is backwards. */ - return pf_encap_enable_spi (htonl (isa->src_net), htonl (isa->src_mask), - htonl (isa->dst_net), htonl (isa->dst_mask), - proto->spi[0], proto->proto, + return pf_encap_enable_spi (isa->src_net, isa->src_mask, isa->dst_net, + isa->dst_mask, proto->spi[0], proto->proto, ((struct sockaddr_in *)dst)->sin_addr.s_addr); } |