From owner-svn-src-all@FreeBSD.ORG Tue Oct 26 19:12:37 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A435106566B; Tue, 26 Oct 2010 19:12:37 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4E48F8FC16; Tue, 26 Oct 2010 19:12:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9QJCbbJ063725; Tue, 26 Oct 2010 19:12:37 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9QJCbdq063723; Tue, 26 Oct 2010 19:12:37 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <201010261912.o9QJCbdq063723@svn.freebsd.org> From: Randall Stewart Date: Tue, 26 Oct 2010 19:12:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214397 - stable/8/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Oct 2010 19:12:37 -0000 Author: rrs Date: Tue Oct 26 19:12:37 2010 New Revision: 214397 URL: http://svn.freebsd.org/changeset/base/214397 Log: MFC:210600 Fix the comment block that has the nice table to really have the nice table :-) Modified: stable/8/sys/netinet/sctp_output.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/netinet/sctp_output.c ============================================================================== --- stable/8/sys/netinet/sctp_output.c Tue Oct 26 19:11:09 2010 (r214396) +++ stable/8/sys/netinet/sctp_output.c Tue Oct 26 19:12:37 2010 (r214397) @@ -2186,21 +2186,31 @@ sctp_is_ifa_addr_preferred(struct sctp_i /* dest_is_priv is true if destination is a private address */ /* dest_is_loop is true if destination is a loopback addresses */ - /* + /** * Here we determine if its a preferred address. A preferred address * means it is the same scope or higher scope then the destination. * L = loopback, P = private, G = global - * ----------------------------------------- src | dest | result - * ---------------------------------------- L | L | yes - * ----------------------------------------- P | L | - * yes-v4 no-v6 ----------------------------------------- G | - * L | yes-v4 no-v6 ----------------------------------------- L - * | P | no ----------------------------------------- P | - * P | yes ----------------------------------------- G | - * P | no ----------------------------------------- L | G - * | no ----------------------------------------- P | G | - * no ----------------------------------------- G | G | - * yes ----------------------------------------- + * ----------------------------------------- + * src | dest | result + * ---------------------------------------- + * L | L | yes + * ----------------------------------------- + * P | L | yes-v4 no-v6 + * ----------------------------------------- + * G | L | yes-v4 no-v6 + * ----------------------------------------- + * L | P | no + * ----------------------------------------- + * P | P | yes + * ----------------------------------------- + * G | P | no + * ----------------------------------------- + * L | G | no + * ----------------------------------------- + * P | G | no + * ----------------------------------------- + * G | G | yes + * ----------------------------------------- */ if (ifa->address.sa.sa_family != fam) {