src/sys/netinet/ip_input.c - diff

Return to ip_input.c CVS log

Up to [cvs.NetBSD.org] / src / sys / netinet

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/netinet/ip_input.c between version 1.232 and 1.233

version 1.232, 2006/09/19 21:42:30

version 1.233, 2006/10/05 17:35:19

Line 488 ip_input(struct mbuf *m)

int downmatch;

int checkif;

int srcrt = 0;

int s;

u_int hash;

#ifdef FAST_IPSEC

struct m_tag *mtag;

struct tdb_ident *tdbi;

struct secpolicy *sp;

int s, error;

int error;

#endif /* FAST_IPSEC */

MCLAIM(m, &ip_rx_mowner);

Line 942 found:

Line 943 found:

if (mff || ip->ip_off != htons(0)) {

ipstat.ips_fragments++;

s = splvm();

ipqe = pool_get(&ipqent_pool, PR_NOWAIT);

splx(s);

if (ipqe == NULL) {

ipstat.ips_rcvmemdrop++;

IPQ_UNLOCK();

Line 1055 ip_reass(struct ipqent *ipqe, struct ipq

Line 1058 ip_reass(struct ipqent *ipqe, struct ipq

struct ip *ip;

struct mbuf *t;

int hlen = ipqe->ipqe_ip->ip_hl << 2;

int i, next;

int i, next, s;

IPQ_LOCK_CHECK();

Line 1160 ip_reass(struct ipqent *ipqe, struct ipq

Line 1163 ip_reass(struct ipqent *ipqe, struct ipq

nq = TAILQ_NEXT(q, ipqe_q);

m_freem(q->ipqe_m);

TAILQ_REMOVE(&fp->ipq_fragq, q, ipqe_q);

s = splvm();

pool_put(&ipqent_pool, q);

splx(s);

fp->ipq_nfrags--;

ip_nfrags--;

}

Line 1201 insert:

Line 1206 insert:

m->m_next = 0;

m_cat(m, t);

nq = TAILQ_NEXT(q, ipqe_q);

s = splvm();

pool_put(&ipqent_pool, q);

splx(s);

for (q = nq; q != NULL; q = nq) {

t = q->ipqe_m;

nq = TAILQ_NEXT(q, ipqe_q);

s = splvm();

pool_put(&ipqent_pool, q);

splx(s);

m_cat(m, t);

}

ip_nfrags -= fp->ipq_nfrags;

Line 1240 dropfrag:

Line 1249 dropfrag:

ip_nfrags--;

ipstat.ips_fragdropped++;

m_freem(m);

s = splvm();

pool_put(&ipqent_pool, ipqe);

splx(s);

return (0);

}

Line 1253 ip_freef(struct ipq *fp)

Line 1264 ip_freef(struct ipq *fp)

{

struct ipqent *q, *p;

u_int nfrags = 0;

int s;

IPQ_LOCK_CHECK();

Line 1261 ip_freef(struct ipq *fp)

Line 1273 ip_freef(struct ipq *fp)

m_freem(q->ipqe_m);

nfrags++;

TAILQ_REMOVE(&fp->ipq_fragq, q, ipqe_q);

s = splvm();

pool_put(&ipqent_pool, q);

splx(s);

}

if (nfrags != fp->ipq_nfrags)

CVSweb <webmaster@jp.NetBSD.org>