summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorVincent Gross <vgross@cvs.openbsd.org>2015-12-18 22:25:17 +0000
committerVincent Gross <vgross@cvs.openbsd.org>2015-12-18 22:25:17 +0000
commit6a0e51734f1eadd6bfb9db4ee0fa1c177605e33e (patch)
tree7ed290ca1171bb9867f06d2ce282458c3a834319 /sys/netinet
parent4e5be6a20d0fbe4294efbcbbe9b61ba5b16ba141 (diff)
Fix SO_REUSE* flags effects when binding multicast addresses. No
regression observed on avahi. ok benno@
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/in_pcb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 4600fe12302..e51e8dcf8fc 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_pcb.c,v 1.194 2015/12/03 21:57:59 mpi Exp $ */
+/* $OpenBSD: in_pcb.c,v 1.195 2015/12/18 22:25:16 vgross Exp $ */
/* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */
/*
@@ -318,7 +318,7 @@ in_pcbbind(struct inpcb *inp, struct mbuf *nam, struct proc *p)
* and a multicast address is bound on both
* new and duplicated sockets.
*/
- if (so->so_options & SO_REUSEADDR)
+ if (so->so_options & (SO_REUSEADDR|SO_REUSEPORT))
reuseport = SO_REUSEADDR|SO_REUSEPORT;
} else if (sin->sin_addr.s_addr != INADDR_ANY) {
sin->sin_port = 0; /* yech... */