Date: Tue, 20 Sep 2011 00:29:17 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r225682 - head/sys/netinet6 Message-ID: <201109200029.p8K0THgP002723@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Tue Sep 20 00:29:17 2011 New Revision: 225682 URL: http://svn.freebsd.org/changeset/base/225682 Log: Copy ip6po_minmtu and ip6po_prefer_tempaddr in ip6_copypktopts(). This fixes inconsistency when options are specified by both setsockopt() and ancillary data types. PR: kern/158307 Approved by: re (bz) Modified: head/sys/netinet6/ip6_output.c Modified: head/sys/netinet6/ip6_output.c ============================================================================== --- head/sys/netinet6/ip6_output.c Tue Sep 20 00:23:59 2011 (r225681) +++ head/sys/netinet6/ip6_output.c Tue Sep 20 00:29:17 2011 (r225682) @@ -2367,6 +2367,8 @@ copypktopts(struct ip6_pktopts *dst, str dst->ip6po_hlim = src->ip6po_hlim; dst->ip6po_tclass = src->ip6po_tclass; dst->ip6po_flags = src->ip6po_flags; + dst->ip6po_minmtu = src->ip6po_minmtu; + dst->ip6po_prefer_tempaddr = src->ip6po_prefer_tempaddr; if (src->ip6po_pktinfo) { dst->ip6po_pktinfo = malloc(sizeof(*dst->ip6po_pktinfo), M_IP6OPT, canwait);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109200029.p8K0THgP002723>