Date: Thu, 5 Aug 2010 16:52:13 +0000 (UTC) From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r210866 - head/sys/netinet Message-ID: <201008051652.o75GqDvJ047866@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tuexen Date: Thu Aug 5 16:52:13 2010 New Revision: 210866 URL: http://svn.freebsd.org/changeset/base/210866 Log: Fix a bug where endpoints bound to wildcard addresses where using addresses not announced to the peer due to address scoping. MFC after: 3 weeks Modified: head/sys/netinet/sctp_output.c Modified: head/sys/netinet/sctp_output.c ============================================================================== --- head/sys/netinet/sctp_output.c Thu Aug 5 16:28:17 2010 (r210865) +++ head/sys/netinet/sctp_output.c Thu Aug 5 16:52:13 2010 (r210866) @@ -2740,6 +2740,15 @@ sctp_select_nth_preferred_addr_from_ifn_ } } if (stcb) { + if (sctp_is_address_in_scope(ifa, + stcb->asoc.ipv4_addr_legal, + stcb->asoc.ipv6_addr_legal, + stcb->asoc.loopback_scope, + stcb->asoc.ipv4_local_scope, + stcb->asoc.local_scope, + stcb->asoc.site_scope, 0) == 0) { + continue; + } if (((non_asoc_addr_ok == 0) && (sctp_is_addr_restricted(stcb, sifa))) || (non_asoc_addr_ok && @@ -2783,6 +2792,15 @@ sctp_count_num_preferred_boundall(struct continue; } if (stcb) { + if (sctp_is_address_in_scope(ifa, + stcb->asoc.ipv4_addr_legal, + stcb->asoc.ipv6_addr_legal, + stcb->asoc.loopback_scope, + stcb->asoc.ipv4_local_scope, + stcb->asoc.local_scope, + stcb->asoc.site_scope, 0) == 0) { + continue; + } if (((non_asoc_addr_ok == 0) && (sctp_is_addr_restricted(stcb, sifa))) || (non_asoc_addr_ok && @@ -2963,6 +2981,15 @@ bound_all_plan_b: if (sifa == NULL) continue; if (stcb) { + if (sctp_is_address_in_scope(sifa, + stcb->asoc.ipv4_addr_legal, + stcb->asoc.ipv6_addr_legal, + stcb->asoc.loopback_scope, + stcb->asoc.ipv4_local_scope, + stcb->asoc.local_scope, + stcb->asoc.site_scope, 0) == 0) { + continue; + } if (((non_asoc_addr_ok == 0) && (sctp_is_addr_restricted(stcb, sifa))) || (non_asoc_addr_ok && @@ -3005,6 +3032,15 @@ plan_d: if (sifa == NULL) continue; if (stcb) { + if (sctp_is_address_in_scope(sifa, + stcb->asoc.ipv4_addr_legal, + stcb->asoc.ipv6_addr_legal, + stcb->asoc.loopback_scope, + stcb->asoc.ipv4_local_scope, + stcb->asoc.local_scope, + stcb->asoc.site_scope, 0) == 0) { + continue; + } if (((non_asoc_addr_ok == 0) && (sctp_is_addr_restricted(stcb, sifa))) || (non_asoc_addr_ok &&
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008051652.o75GqDvJ047866>