From owner-svn-src-all@FreeBSD.ORG Fri Aug 20 18:19:38 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 E6B1C1065670; Fri, 20 Aug 2010 18:19:38 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id 708608FC1E; Fri, 20 Aug 2010 18:19:38 +0000 (UTC) Received: by qyk4 with SMTP id 4so3818034qyk.13 for ; Fri, 20 Aug 2010 11:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=vL6Bl9fW2Wi5hNaBdWMC3yOGNdTZrBV6pyVCg4x+sS0=; b=gwqdb+czUw0Lx3BgYZrYKR5XjaauWwxK6RbnhLH1f6lmPrennDkGv4oWr/9LTtP2G3 p5CmyjJTeIOSW3HMDVDGmQdY3PKJrF1SrQpKRXgxl4aSdxWkxZ9j5VYgnTXDRYrivz2j SixUOztQZFnoGFCYJMKr9UaiCZxwvq1ACaMpI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=gRSZ4DfPxpa4PLEXjxu87df/JHwRCjvxfgTBEGIRCAeSB3od3xmdH6g+5tXkVJbwra FiiyrgxuYE0W4Sq2tMdtTDGy3x0F0tpUC6nH/5A6iGlJ6NWq4vCl0U+tJe+OntArki6D VvNyg5othoEhqe3qvvlGOXAIvmG/EuL3B1wh4= MIME-Version: 1.0 Received: by 10.229.249.200 with SMTP id ml8mr1381593qcb.115.1282328377402; Fri, 20 Aug 2010 11:19:37 -0700 (PDT) Received: by 10.229.26.81 with HTTP; Fri, 20 Aug 2010 11:19:37 -0700 (PDT) In-Reply-To: <201008201752.o7KHqnu1044143@svn.freebsd.org> References: <201008201752.o7KHqnu1044143@svn.freebsd.org> Date: Fri, 20 Aug 2010 22:19:37 +0400 Message-ID: From: pluknet To: Hajimu UMEMOTO Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r211530 - head/sys/netinet6 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: Fri, 20 Aug 2010 18:19:39 -0000 On 20 August 2010 21:52, Hajimu UMEMOTO wrote: > Author: ume > Date: Fri Aug 20 17:52:49 2010 > New Revision: 211530 > URL: http://svn.freebsd.org/changeset/base/211530 > > Log: > =A0optp may be NULL. > > Modified: > =A0head/sys/netinet6/raw_ip6.c > > Modified: head/sys/netinet6/raw_ip6.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet6/raw_ip6.c Fri Aug 20 17:20:05 2010 =A0 =A0 =A0 =A0(= r211529) > +++ head/sys/netinet6/raw_ip6.c Fri Aug 20 17:52:49 2010 =A0 =A0 =A0 =A0(= r211530) > @@ -434,7 +434,8 @@ rip6_output(m, va_alist) > =A0 =A0 =A0 =A0 * XXX: we may still need to determine the zone later. > =A0 =A0 =A0 =A0 */ > =A0 =A0 =A0 =A0if (!(so->so_state & SS_ISCONNECTED)) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!optp->ip6po_pktinfo || !optp->ip6po_pk= tinfo->ipi6_ifindex) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!optp || !optp->ip6po_pktinfo || > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 !optp->ip6po_pktinfo->ipi6_ifindex) Hi. I think it still continues to test the remain condition regardless of test result of the first part (!optp). That should work: - if (!optp->ip6po_pktinfo || !optp->ip6po_pktinfo->ipi6_ifi= ndex) + if (optp !=3D NULL && (!optp->ip6po_pktinfo || + !optp->ip6po_pktinfo->ipi6_ifindex)) --=20 wbr, pluknet