svn commit: r253427 - head/sbin/route

[Scott Long]

On Jul 17, 2013, at 7:00 PM, Glen Barber <gjb at freebsd.org> wrote:

> On Wed, Jul 17, 2013 at 02:05:20PM +0000, Hiroki Sato wrote:
>> Author: hrs
>> Date: Wed Jul 17 14:05:20 2013
>> New Revision: 253427
>> URL: http://svnweb.freebsd.org/changeset/base/253427
>> 
>> Log:
>>  - Add support of MK_INET_SUPPORT=no.
>>  - Fix a bug in sodump() which prevented struct sockaddr_in6 from displaying.
>>  - Fix a bug in in fiboptlist_csv() which could cause free() of uninitialized
>>    pointer.
>>  - Style cleanups:
>>   . Add missing "static" keywords.
>>   . Use an array of struct sockaddr_storage instead of sockunion for rtmsg.
>>   . Use err() and errx() instead of pair of fprintf(stderr, "...") + exit(1).
>>   . Use nitems() macro.
>>   . Various style(9) fixes.
>> 
>> Modified:
>>  head/sbin/route/Makefile
>>  head/sbin/route/route.c
>> 
> 
> [...]
> 
>> Modified: head/sbin/route/route.c
>> ==============================================================================
>> --- head/sbin/route/route.c	Wed Jul 17 14:04:18 2013	(r253426)
>> +++ head/sbin/route/route.c	Wed Jul 17 14:05:20 2013	(r253427)
> [...]
>> @@ -1470,14 +1498,12 @@ rtmsg(int cmd, int flags, int fib)
>> 	rtm.rtm_rmx = rt_metrics;
>> 	rtm.rtm_inits = rtm_inits;
>> 
>> -	if (rtm_addrs & RTA_NETMASK)
>> -		mask_addr();
>> -	NEXTADDR(RTA_DST, so_dst);
>> -	NEXTADDR(RTA_GATEWAY, so_gate);
>> -	NEXTADDR(RTA_NETMASK, so_mask);
>> -	NEXTADDR(RTA_GENMASK, so_genmask);
>> -	NEXTADDR(RTA_IFP, so_ifp);
>> -	NEXTADDR(RTA_IFA, so_ifa);
>> +	NEXTADDR(RTA_DST, so[RTAX_DST]);
>> +	NEXTADDR(RTA_GATEWAY, so[RTAX_GATEWAY]);
>> +	NEXTADDR(RTA_NETMASK, so[RTAX_NETMASK]);
>> +	NEXTADDR(RTA_GENMASK, so[RTAX_GENMASK]);
>> +	NEXTADDR(RTA_IFP, so[RTAX_IFP]);
>> +	NEXTADDR(RTA_IFA, so[RTAX_IFA]);
>> 	rtm.rtm_msglen = l = cp - (char *)&m_rtmsg;
>> 	if (verbose)
>> 		print_rtmsg(&rtm, l);
> 
> I think this breaks head/, at least for ia64.
> 

Yes, as well as for amd64.  This breakage occurred at the exact moment that we tried to cut over to HEAD at Netflix.  It's indeed a Brave New World.  Should we back it out?

Scott