diff options
| author | Lawrence Teo <lteo@cvs.openbsd.org> | 2013-11-15 16:46:16 +0000 |
|---|---|---|
| committer | Lawrence Teo <lteo@cvs.openbsd.org> | 2013-11-15 16:46:16 +0000 |
| commit | ba4d7f2131403c12cd7c55eba1d326f2f224c7b8 (patch) | |
| tree | 1d0e97800be0bbef4e748e59b7a84519887e1e7f | |
| parent | 9e635fbf8ac834c0adb363f89719810da1594832 (diff) | |
Rename the struct pf_divert variable in divert_packet() and
divert6_packet() from "pd" to "divert" to match the rest of the source.
I think "pd" was not a good name for a struct pf_divert because "pd"
usually refers to a pf_pdesc.
No object file change.
OK benno@ bluhm@ henning@
| -rw-r--r-- | sys/netinet/ip_divert.c | 10 | ||||
| -rw-r--r-- | sys/netinet6/ip6_divert.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index ea85eff682e..60d1a9d512e 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_divert.c,v 1.13 2013/04/08 15:32:23 lteo Exp $ */ +/* $OpenBSD: ip_divert.c,v 1.14 2013/11/15 16:46:15 lteo Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -203,7 +203,7 @@ divert_packet(struct mbuf *m, int dir) struct inpcb *inp; struct socket *sa = NULL; struct sockaddr_in addr; - struct pf_divert *pd; + struct pf_divert *divert; inp = NULL; divstat.divs_ipackets++; @@ -214,15 +214,15 @@ divert_packet(struct mbuf *m, int dir) return (0); } - pd = pf_find_divert(m); - if (pd == NULL) { + divert = pf_find_divert(m); + if (divert == NULL) { divstat.divs_errors++; m_freem(m); return (0); } CIRCLEQ_FOREACH(inp, &divbtable.inpt_queue, inp_queue) { - if (inp->inp_lport != pd->port) + if (inp->inp_lport != divert->port) continue; if (inp->inp_divertfl == 0) break; diff --git a/sys/netinet6/ip6_divert.c b/sys/netinet6/ip6_divert.c index fab183b8f97..7d84dfa484e 100644 --- a/sys/netinet6/ip6_divert.c +++ b/sys/netinet6/ip6_divert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_divert.c,v 1.14 2013/10/17 16:27:46 bluhm Exp $ */ +/* $OpenBSD: ip6_divert.c,v 1.15 2013/11/15 16:46:15 lteo Exp $ */ /* * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org> @@ -199,7 +199,7 @@ divert6_packet(struct mbuf *m, int dir) struct inpcb *inp; struct socket *sa = NULL; struct sockaddr_in6 addr; - struct pf_divert *pd; + struct pf_divert *divert; inp = NULL; div6stat.divs_ipackets++; @@ -210,15 +210,15 @@ divert6_packet(struct mbuf *m, int dir) return (0); } - pd = pf_find_divert(m); - if (pd == NULL) { + divert = pf_find_divert(m); + if (divert == NULL) { div6stat.divs_errors++; m_freem(m); return (0); } CIRCLEQ_FOREACH(inp, &divb6table.inpt_queue, inp_queue) { - if (inp->inp_lport != pd->port) + if (inp->inp_lport != divert->port) continue; if (inp->inp_divertfl == 0) break; |