Date: Wed, 29 Oct 2008 06:38:09 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r184433 - user/kmacy/HEAD_fast_xmit/sys/net Message-ID: <200810290638.m9T6c9YQ015046@svn.freebsd.org>
index | next in thread | raw e-mail
Author: kmacy Date: Wed Oct 29 06:38:09 2008 New Revision: 184433 URL: http://svn.freebsd.org/changeset/base/184433 Log: fix sockaddr copy check in route_to_rtentry_info Modified: user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c Modified: user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c ============================================================================== --- user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c Wed Oct 29 05:51:03 2008 (r184432) +++ user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c Wed Oct 29 06:38:09 2008 (r184433) @@ -531,10 +531,10 @@ route_to_rtentry_info(struct route *ro, ri->ri_flags = rt->rt_flags; ri->ri_mtu = rt->rt_rmx.rmx_mtu; - if (rt->rt_flags & RTF_GATEWAY && !IN_MULTICAST(sin->sin_addr.s_addr)) - memcpy(&ri->ri_dst, sin, sizeof(struct sockaddr)); - else + if ((rt->rt_flags & RTF_GATEWAY) && !IN_MULTICAST(sin->sin_addr.s_addr)) memcpy(&ri->ri_dst, rt->rt_gateway, sizeof(struct sockaddr)); + else + memcpy(&ri->ri_dst, sin, sizeof(struct sockaddr)); ((struct sockaddr *)&ri->ri_dst)->sa_family = AF_INET;help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810290638.m9T6c9YQ015046>