From owner-svn-src-user@FreeBSD.ORG Wed Oct 16 13:33:48 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CDA4F6C0; Wed, 16 Oct 2013 13:33:48 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BBF132E4E; Wed, 16 Oct 2013 13:33:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GDXmSm037558; Wed, 16 Oct 2013 13:33:48 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GDXmol037557; Wed, 16 Oct 2013 13:33:48 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201310161333.r9GDXmol037557@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 16 Oct 2013 13:33:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256627 - user/ae/inet6/sys/netinet6 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 13:33:48 -0000 Author: ae Date: Wed Oct 16 13:33:48 2013 New Revision: 256627 URL: http://svnweb.freebsd.org/changeset/base/256627 Log: RTFREE() sets ro_rt to NULL, no need to do it again. Also properly initialize ro_dst for IPV6_NEXTHOP socket option. Modified: user/ae/inet6/sys/netinet6/ip6_output.c Modified: user/ae/inet6/sys/netinet6/ip6_output.c ============================================================================== --- user/ae/inet6/sys/netinet6/ip6_output.c Wed Oct 16 13:23:47 2013 (r256626) +++ user/ae/inet6/sys/netinet6/ip6_output.c Wed Oct 16 13:33:48 2013 (r256627) @@ -2434,13 +2434,11 @@ ip6_clearpktopts(struct ip6_pktopts *pkt if (optname == -1 || optname == IPV6_TCLASS) pktopt->ip6po_tclass = -1; if (optname == -1 || optname == IPV6_NEXTHOP) { - if (pktopt->ip6po_nextroute.ro_rt) { + if (pktopt->ip6po_nextroute.ro_rt) RTFREE(pktopt->ip6po_nextroute.ro_rt); - pktopt->ip6po_nextroute.ro_rt = NULL; - } if (pktopt->ip6po_nexthop) free(pktopt->ip6po_nexthop, M_IP6OPT); - pktopt->ip6po_nexthop = NULL; + bzero(&pktopt->ip6po_nhinfo, sizeof(pktopt->ip6po_nhinfo)); } if (optname == -1 || optname == IPV6_HOPOPTS) { if (pktopt->ip6po_hbh) @@ -2456,10 +2454,8 @@ ip6_clearpktopts(struct ip6_pktopts *pkt if (pktopt->ip6po_rhinfo.ip6po_rhi_rthdr) free(pktopt->ip6po_rhinfo.ip6po_rhi_rthdr, M_IP6OPT); pktopt->ip6po_rhinfo.ip6po_rhi_rthdr = NULL; - if (pktopt->ip6po_route.ro_rt) { + if (pktopt->ip6po_route.ro_rt) RTFREE(pktopt->ip6po_route.ro_rt); - pktopt->ip6po_route.ro_rt = NULL; - } } if (optname == -1 || optname == IPV6_DSTOPTS) { if (pktopt->ip6po_dest2) @@ -2822,6 +2818,7 @@ ip6_setpktopt(int optname, u_char *buf, if (opt->ip6po_nexthop == NULL) return (ENOBUFS); bcopy(buf, opt->ip6po_nexthop, *buf); + bcopy(buf, &opt->ip6po_nextroute.ro_dst, *buf); break; case IPV6_2292HOPOPTS: