diff options
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/in_pcb.c | 16 | ||||
| -rw-r--r-- | sys/netinet/raw_ip.c | 6 | ||||
| -rw-r--r-- | sys/netinet/udp_usrreq.c | 6 |
3 files changed, 12 insertions, 16 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index add245ba2a4..525172c5b34 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.c,v 1.71 2003/12/10 07:22:43 itojun Exp $ */ +/* $OpenBSD: in_pcb.c,v 1.72 2003/12/21 14:57:19 markus Exp $ */ /* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */ /* @@ -591,11 +591,11 @@ in_pcbnotify(table, dst, fport_arg, laddr, lport_arg, errno, notify) if (faddr.s_addr == INADDR_ANY) return; - for (inp = table->inpt_queue.cqh_first; - inp != (struct inpcb *)&table->inpt_queue;) { + for (inp = CIRCLEQ_FIRST(&table->inpt_queue); + inp != CIRCLEQ_END(&table->inpt_queue);) { #ifdef INET6 if (inp->inp_flags & INP_IPV6) { - inp = inp->inp_queue.cqe_next; + inp = CIRCLEQ_NEXT(inp, inp_queue); continue; } #endif @@ -604,11 +604,11 @@ in_pcbnotify(table, dst, fport_arg, laddr, lport_arg, errno, notify) inp->inp_fport != fport || inp->inp_lport != lport || inp->inp_laddr.s_addr != laddr.s_addr) { - inp = inp->inp_queue.cqe_next; + inp = CIRCLEQ_NEXT(inp, inp_queue); continue; } oinp = inp; - inp = inp->inp_queue.cqe_next; + inp = CIRCLEQ_NEXT(inp, inp_queue); if (notify) (*notify)(oinp, errno); } @@ -642,13 +642,13 @@ in_pcbnotifyall(table, dst, errno, notify) inp != (struct inpcb *)&table->inpt_queue;) { #ifdef INET6 if (inp->inp_flags & INP_IPV6) { - inp = inp->inp_queue.cqe_next; + inp = CIRCLEQ_NEXT(inp, inp_queue); continue; } #endif if (inp->inp_faddr.s_addr != faddr.s_addr || inp->inp_socket == 0) { - inp = inp->inp_queue.cqe_next; + inp = CIRCLEQ_NEXT(inp, inp_queue); continue; } oinp = inp; diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 9b9dba7f606..df0cc77c67d 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip.c,v 1.31 2003/12/10 07:22:43 itojun Exp $ */ +/* $OpenBSD: raw_ip.c,v 1.32 2003/12/21 14:57:19 markus Exp $ */ /* $NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $ */ /* @@ -124,9 +124,7 @@ rip_input(struct mbuf *m, ...) struct socket *last = 0; ripsrc.sin_addr = ip->ip_src; - for (inp = rawcbtable.inpt_queue.cqh_first; - inp != (struct inpcb *)&rawcbtable.inpt_queue; - inp = inp->inp_queue.cqe_next) { + CIRCLEQ_FOREACH(inp, &rawcbtable.inpt_queue, inp_queue) { #ifdef INET6 if (inp->inp_flags & INP_IPV6) continue; diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index a338bc6cc30..1658f4ebe2d 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.95 2003/12/10 07:22:43 itojun Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.96 2003/12/21 14:57:19 markus Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -410,9 +410,7 @@ udp_input(struct mbuf *m, ...) * (Algorithm copied from raw_intr().) */ last = NULL; - for (inp = udbtable.inpt_queue.cqh_first; - inp != (struct inpcb *)&udbtable.inpt_queue; - inp = inp->inp_queue.cqe_next) { + CIRCLEQ_FOREACH(inp, &udbtable.inpt_queue, inp_queue) { #ifdef INET6 /* don't accept it if AF does not match */ if (ip6 && !(inp->inp_flags & INP_IPV6)) |