pf: remove unused 'dir' argument in pf_reassemble()
pf_reassemble() only uses it to pass to pf_ip2key(), which also does not use it.
Sponsored by: Rubicon Communications, LLC ("Netgate")
This commit is contained in:
@@ -147,7 +147,7 @@ static struct pf_fragment *pf_fillup_fragment(struct pf_fragment_cmp *,
|
||||
struct pf_frent *, u_short *);
|
||||
static struct mbuf *pf_join_fragment(struct pf_fragment *);
|
||||
#ifdef INET
|
||||
static int pf_reassemble(struct mbuf **, int, u_short *);
|
||||
static int pf_reassemble(struct mbuf **, u_short *);
|
||||
#endif /* INET */
|
||||
#ifdef INET6
|
||||
static int pf_reassemble6(struct mbuf **,
|
||||
@@ -163,7 +163,7 @@ static int pf_reassemble6(struct mbuf **,
|
||||
|
||||
#ifdef INET
|
||||
static void
|
||||
pf_ip2key(struct ip *ip, int dir, struct pf_fragment_cmp *key)
|
||||
pf_ip2key(struct ip *ip, struct pf_fragment_cmp *key)
|
||||
{
|
||||
|
||||
key->frc_src.v4 = ip->ip_src;
|
||||
@@ -735,7 +735,7 @@ pf_join_fragment(struct pf_fragment *frag)
|
||||
|
||||
#ifdef INET
|
||||
static int
|
||||
pf_reassemble(struct mbuf **m0, int dir, u_short *reason)
|
||||
pf_reassemble(struct mbuf **m0, u_short *reason)
|
||||
{
|
||||
struct mbuf *m = *m0;
|
||||
struct ip *ip = mtod(m, struct ip *);
|
||||
@@ -759,7 +759,7 @@ pf_reassemble(struct mbuf **m0, int dir, u_short *reason)
|
||||
frent->fe_off = (ntohs(ip->ip_off) & IP_OFFMASK) << 3;
|
||||
frent->fe_mff = ntohs(ip->ip_off) & IP_MF;
|
||||
|
||||
pf_ip2key(ip, dir, &key);
|
||||
pf_ip2key(ip, &key);
|
||||
|
||||
if ((frag = pf_fillup_fragment(&key, frent, reason)) == NULL)
|
||||
return (PF_DROP);
|
||||
@@ -1200,7 +1200,7 @@ pf_normalize_ip(u_short *reason, struct pf_pdesc *pd)
|
||||
* Might return a completely reassembled mbuf, or NULL */
|
||||
PF_FRAG_LOCK();
|
||||
DPFPRINTF(("reass frag %d @ %d-%d\n", h->ip_id, fragoff, max));
|
||||
verdict = pf_reassemble(&pd->m, pd->dir, reason);
|
||||
verdict = pf_reassemble(&pd->m, reason);
|
||||
PF_FRAG_UNLOCK();
|
||||
|
||||
if (verdict != PF_PASS)
|
||||
|
||||
Reference in New Issue
Block a user