diff options
author | bz <bz@FreeBSD.org> | 2008-12-27 23:24:59 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2008-12-27 23:24:59 +0000 |
commit | 2207460cee95d965aa49abeb406f1ce11850d8fd (patch) | |
tree | 7729e6918acb6b0dcc830c3aa6d842ab6c89b11d | |
parent | 14a7b2c5e1ac639b66e27c75bea739cfeceb5c3e (diff) | |
download | FreeBSD-src-2207460cee95d965aa49abeb406f1ce11850d8fd.zip FreeBSD-src-2207460cee95d965aa49abeb406f1ce11850d8fd.tar.gz |
Like in the rest of the file and the network stack use inp as
variable name for the inpcb.
For consistency with the other *_hdrsiz functions use 'size'
instead of 'siz' as variable name.
No functional change.
MFC after: 4 weeks
-rw-r--r-- | sys/netipsec/ipsec.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c index 05ec57a..c8d27d2 100644 --- a/sys/netipsec/ipsec.c +++ b/sys/netipsec/ipsec.c @@ -228,9 +228,9 @@ SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet6_ipsec6, IPSECCTL_STATS, "IPsec IPv6 statistics."); #endif /* INET6 */ -static int ipsec4_setspidx_inpcb __P((struct mbuf *, struct inpcb *pcb)); +static int ipsec4_setspidx_inpcb __P((struct mbuf *, struct inpcb *)); #ifdef INET6 -static int ipsec6_setspidx_inpcb __P((struct mbuf *, struct inpcb *pcb)); +static int ipsec6_setspidx_inpcb __P((struct mbuf *, struct inpcb *)); #endif static int ipsec_setspidx __P((struct mbuf *, struct secpolicyindex *, int)); static void ipsec4_get_ulp __P((struct mbuf *m, struct secpolicyindex *, int)); @@ -538,50 +538,50 @@ ipsec4_checkpolicy(struct mbuf *m, u_int dir, u_int flag, int *error, } static int -ipsec4_setspidx_inpcb(struct mbuf *m, struct inpcb *pcb) +ipsec4_setspidx_inpcb(struct mbuf *m, struct inpcb *inp) { int error; - IPSEC_ASSERT(pcb != NULL, ("null pcb")); - IPSEC_ASSERT(pcb->inp_sp != NULL, ("null inp_sp")); - IPSEC_ASSERT(pcb->inp_sp->sp_out != NULL && pcb->inp_sp->sp_in != NULL, + IPSEC_ASSERT(inp != NULL, ("null inp")); + IPSEC_ASSERT(inp->inp_sp != NULL, ("null inp_sp")); + IPSEC_ASSERT(inp->inp_sp->sp_out != NULL && inp->inp_sp->sp_in != NULL, ("null sp_in || sp_out")); - error = ipsec_setspidx(m, &pcb->inp_sp->sp_in->spidx, 1); + error = ipsec_setspidx(m, &inp->inp_sp->sp_in->spidx, 1); if (error == 0) { - pcb->inp_sp->sp_in->spidx.dir = IPSEC_DIR_INBOUND; - pcb->inp_sp->sp_out->spidx = pcb->inp_sp->sp_in->spidx; - pcb->inp_sp->sp_out->spidx.dir = IPSEC_DIR_OUTBOUND; + inp->inp_sp->sp_in->spidx.dir = IPSEC_DIR_INBOUND; + inp->inp_sp->sp_out->spidx = inp->inp_sp->sp_in->spidx; + inp->inp_sp->sp_out->spidx.dir = IPSEC_DIR_OUTBOUND; } else { - bzero(&pcb->inp_sp->sp_in->spidx, - sizeof (pcb->inp_sp->sp_in->spidx)); - bzero(&pcb->inp_sp->sp_out->spidx, - sizeof (pcb->inp_sp->sp_in->spidx)); + bzero(&inp->inp_sp->sp_in->spidx, + sizeof (inp->inp_sp->sp_in->spidx)); + bzero(&inp->inp_sp->sp_out->spidx, + sizeof (inp->inp_sp->sp_in->spidx)); } return (error); } #ifdef INET6 static int -ipsec6_setspidx_inpcb(struct mbuf *m, struct inpcb *pcb) +ipsec6_setspidx_inpcb(struct mbuf *m, struct inpcb *inp) { int error; - IPSEC_ASSERT(pcb != NULL, ("null pcb")); - IPSEC_ASSERT(pcb->inp_sp != NULL, ("null inp_sp")); - IPSEC_ASSERT(pcb->inp_sp->sp_out != NULL && pcb->inp_sp->sp_in != NULL, + IPSEC_ASSERT(inp != NULL, ("null inp")); + IPSEC_ASSERT(inp->inp_sp != NULL, ("null inp_sp")); + IPSEC_ASSERT(inp->inp_sp->sp_out != NULL && inp->inp_sp->sp_in != NULL, ("null sp_in || sp_out")); - error = ipsec_setspidx(m, &pcb->inp_sp->sp_in->spidx, 1); + error = ipsec_setspidx(m, &inp->inp_sp->sp_in->spidx, 1); if (error == 0) { - pcb->inp_sp->sp_in->spidx.dir = IPSEC_DIR_INBOUND; - pcb->inp_sp->sp_out->spidx = pcb->inp_sp->sp_in->spidx; - pcb->inp_sp->sp_out->spidx.dir = IPSEC_DIR_OUTBOUND; + inp->inp_sp->sp_in->spidx.dir = IPSEC_DIR_INBOUND; + inp->inp_sp->sp_out->spidx = inp->inp_sp->sp_in->spidx; + inp->inp_sp->sp_out->spidx.dir = IPSEC_DIR_OUTBOUND; } else { - bzero(&pcb->inp_sp->sp_in->spidx, - sizeof(pcb->inp_sp->sp_in->spidx)); - bzero(&pcb->inp_sp->sp_out->spidx, - sizeof(pcb->inp_sp->sp_in->spidx)); + bzero(&inp->inp_sp->sp_in->spidx, + sizeof(inp->inp_sp->sp_in->spidx)); + bzero(&inp->inp_sp->sp_out->spidx, + sizeof(inp->inp_sp->sp_in->spidx)); } return (error); @@ -1523,7 +1523,7 @@ ipsec_hdrsiz(struct secpolicy *sp) { INIT_VNET_IPSEC(curvnet); struct ipsecrequest *isr; - size_t siz; + size_t size; KEYDEBUG(KEYDEBUG_IPSEC_DATA, printf("%s: using SP\n", __func__); kdebug_secpolicy(sp)); @@ -1538,7 +1538,7 @@ ipsec_hdrsiz(struct secpolicy *sp) IPSEC_ASSERT(sp->policy == IPSEC_POLICY_IPSEC, ("invalid policy %u", sp->policy)); - siz = 0; + size = 0; for (isr = sp->req; isr != NULL; isr = isr->next) { size_t clen = 0; @@ -1571,10 +1571,10 @@ ipsec_hdrsiz(struct secpolicy *sp) break; } } - siz += clen; + size += clen; } - return (siz); + return (size); } /* This function is called from ip_forward() and ipsec4_hdrsize_tcp(). */ |