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/esp_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/esp_output.c')
| -rw-r--r-- | sys/netinet6/esp_output.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c index 7770b78..3e89c5d 100644 --- a/sys/netinet6/esp_output.c +++ b/sys/netinet6/esp_output.c @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $KAME: esp_output.c,v 1.43 2001/03/01 07:10:45 itojun Exp $ */ +/* $KAME: esp_output.c,v 1.44 2001/07/26 06:53:15 jinmei Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -189,7 +189,7 @@ esp_output(m, nexthdrp, md, isr, af) const struct esp_algorithm *algo; u_int32_t spi; u_int8_t nxt = 0; - size_t plen; /*payload length to be encrypted*/ + size_t plen; /* payload length to be encrypted */ size_t espoff; int ivlen; int afnumber; @@ -232,7 +232,7 @@ esp_output(m, nexthdrp, md, isr, af) ipsecstat.out_inval++; break; } -#endif /*INET*/ +#endif /* INET */ #ifdef INET6 case AF_INET6: ipseclog((LOG_DEBUG, "esp6_output: internal error: " @@ -240,7 +240,7 @@ esp_output(m, nexthdrp, md, isr, af) (u_int32_t)ntohl(sav->spi))); ipsec6stat.out_inval++; break; -#endif /*INET6*/ +#endif /* INET6 */ default: panic("esp_output: should not reach here"); } @@ -275,9 +275,9 @@ esp_output(m, nexthdrp, md, isr, af) #ifdef INET6 struct ip6_hdr *ip6 = NULL; #endif - size_t esplen; /*sizeof(struct esp/newesp)*/ - size_t esphlen; /*sizeof(struct esp/newesp) + ivlen*/ - size_t hlen = 0; /*ip header len*/ + size_t esplen; /* sizeof(struct esp/newesp) */ + size_t esphlen; /* sizeof(struct esp/newesp) + ivlen */ + size_t hlen = 0; /* ip header len */ if (sav->flags & SADB_X_EXT_OLD) { /* RFC 1827 */ @@ -617,7 +617,7 @@ esp_output(m, nexthdrp, md, isr, af) while (n->m_next) n = n->m_next; - if (!(n->m_flags & M_EXT) && siz < M_TRAILINGSPACE(n)) { /*XXX*/ + if (!(n->m_flags & M_EXT) && siz < M_TRAILINGSPACE(n)) { /* XXX */ n->m_len += siz; m->m_pkthdr.len += siz; p = mtod(n, u_char *) + n->m_len - siz; @@ -700,7 +700,7 @@ esp4_output(m, isr) /* XXX assumes that m->m_next points to payload */ return esp_output(m, &ip->ip_p, m->m_next, isr, AF_INET); } -#endif /*INET*/ +#endif /* INET */ #ifdef INET6 int @@ -717,4 +717,4 @@ esp6_output(m, nexthdrp, md, isr) } return esp_output(m, nexthdrp, md, isr, AF_INET6); } -#endif /*INET6*/ +#endif /* INET6 */ |
