diff options
author | suz <suz@FreeBSD.org> | 2002-04-19 04:46:24 +0000 |
---|---|---|
committer | suz <suz@FreeBSD.org> | 2002-04-19 04:46:24 +0000 |
commit | 553226e8e16639b00d61d81e0125330dbfb7eed8 (patch) | |
tree | 100274bd96d0c95cafbe1a4a5961b54fc403fd47 /sys/netinet6/ah_output.c | |
parent | ae841d33c320c4185ecaa0e982c744039b1ba10f (diff) | |
download | FreeBSD-src-553226e8e16639b00d61d81e0125330dbfb7eed8.zip FreeBSD-src-553226e8e16639b00d61d81e0125330dbfb7eed8.tar.gz |
just merged cosmetic changes from KAME to ease sync between KAME and FreeBSD.
(based on freebsd4-snap-20020128)
Reviewed by: ume
MFC after: 1 week
Diffstat (limited to 'sys/netinet6/ah_output.c')
-rw-r--r-- | sys/netinet6/ah_output.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c index 983ecab..e850752 100644 --- a/sys/netinet6/ah_output.c +++ b/sys/netinet6/ah_output.c @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $KAME: ah_output.c,v 1.30 2001/02/21 00:50:53 itojun Exp $ */ +/* $KAME: ah_output.c,v 1.31 2001/07/26 06:53:15 jinmei Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -151,9 +151,9 @@ ah4_output(m, isr) u_int32_t spi; u_char *ahdrpos; u_char *ahsumpos = NULL; - size_t hlen = 0; /*IP header+option in bytes*/ - size_t plen = 0; /*AH payload size in bytes*/ - size_t ahlen = 0; /*plen + sizeof(ah)*/ + size_t hlen = 0; /* IP header+option in bytes */ + size_t plen = 0; /* AH payload size in bytes */ + size_t ahlen = 0; /* plen + sizeof(ah) */ struct ip *ip; struct in_addr dst; struct in_addr *finaldst; @@ -189,11 +189,11 @@ ah4_output(m, isr) */ if (sav->flags & SADB_X_EXT_OLD) { /* RFC 1826 */ - plen = ((*algo->sumsiz)(sav) + 3) & ~(4 - 1); /*XXX pad to 8byte?*/ + plen = ((*algo->sumsiz)(sav) + 3) & ~(4 - 1); /* XXX pad to 8byte? */ ahlen = plen + sizeof(struct ah); } else { /* RFC 2402 */ - plen = ((*algo->sumsiz)(sav) + 3) & ~(4 - 1); /*XXX pad to 8byte?*/ + plen = ((*algo->sumsiz)(sav) + 3) & ~(4 - 1); /* XXX pad to 8byte? */ ahlen = plen + sizeof(struct newah); } @@ -230,7 +230,7 @@ ah4_output(m, isr) ahdrpos = mtod(m->m_next, u_char *); } - ip = mtod(m, struct ip *); /*just to be sure*/ + ip = mtod(m, struct ip *); /* just to be sure */ /* * initialize AH. @@ -315,7 +315,7 @@ ah4_output(m, isr) } if (finaldst) { - ip = mtod(m, struct ip *); /*just to make sure*/ + ip = mtod(m, struct ip *); /* just to make sure */ ip->ip_dst.s_addr = dst.s_addr; } ipsecstat.out_success++; @@ -339,11 +339,11 @@ ah_hdrlen(sav) return 0; if (sav->flags & SADB_X_EXT_OLD) { /* RFC 1826 */ - plen = ((*algo->sumsiz)(sav) + 3) & ~(4 - 1); /*XXX pad to 8byte?*/ + plen = ((*algo->sumsiz)(sav) + 3) & ~(4 - 1); /* XXX pad to 8byte? */ ahlen = plen + sizeof(struct ah); } else { /* RFC 2402 */ - plen = ((*algo->sumsiz)(sav) + 3) & ~(4 - 1); /*XXX pad to 8byte?*/ + plen = ((*algo->sumsiz)(sav) + 3) & ~(4 - 1); /* XXX pad to 8byte? */ ahlen = plen + sizeof(struct newah); } @@ -367,7 +367,7 @@ ah6_output(m, nexthdrp, md, isr) const struct ah_algorithm *algo; u_int32_t spi; u_char *ahsumpos = NULL; - size_t plen; /*AH payload size in bytes*/ + size_t plen; /* AH payload size in bytes */ int error = 0; int ahlen; struct ip6_hdr *ip6; |