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.
LC_ALL=C awk '!/^#|^$/ { printf "#define\tK_%s\t%d\n\t{\"%s\", K_%s},\n",
toupper($1), ++L, $1, toupper($1); }' <
/src/sbin/route/keywords > keywords.h || (rm -f keywords.h; false) rm -f .depend
CC='cc ' mkdep -f .depend -a -DNS -DINET -DINET6 -I. -DRESCUE -std=gnu99
/src/sbin/route/route.c
echo route: /obj/ia64.ia64/src/tmp/usr/lib/libc.a >> .depend
cc -O2 -pipe -DNS -DINET -DINET6 -I. -DRESCUE -std=gnu99 -Wsystem-headers
-Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter
-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-uninitialized
-Wno-pointer-sign -c /src/sbin/route/route.c
cc1: warnings being treated as errors
/src/sbin/route/route.c: In function 'rtmsg':
/src/sbin/route/route.c:1491: warning: the address of 'so' will always
evaluate as 'true'
*** Error code 1
Stop.
make: stopped in /src/sbin/route
*** Error code 1
Stop.
make: stopped in /obj/ia64.ia64/src/rescue/rescue
*** Error code 1
Stop.
make: stopped in /src/rescue/rescue
*** Error code 1
Stop.
make: stopped in /src/rescue
*** Error code 1
Stop.
make: stopped in /src
*** Error code 1
Stop.
make: stopped in /src
*** Error code 1
Stop in /src.
TB --- 2013-07-18 00:50:37 - WARNING: /usr/bin/make returned exit code
1
TB --- 2013-07-18 00:50:37 - ERROR: failed to build world
TB --- 2013-07-18 00:50:37 - 3190.01 user 612.41 system 4046.74 real
http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-ia64-ia64.full
Glen
pgp5ba7poKFep.pgp
Description: PGP signature
