Date: Sat, 22 Oct 2005 04:04:22 +0200 From: Max Laier <max@love2party.net> To: SUZUKI Shinsuke <suz@freebsd.org> Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/netinet icmp6.h src/sys/netinet6 icmp6.c in6.c in6.h in6_ifattach.c in6_ifattach.h in6_var.h ip6_output.c mld6.c mld6_var.h nd6.c nd6.h nd6_nbr.c nd6_rtr.c src/share/doc/IPv6 IMPLEMENTATION Message-ID: <200510220404.39977.max@love2party.net> In-Reply-To: <200510211623.j9LGN1A7011884@repoman.freebsd.org> References: <200510211623.j9LGN1A7011884@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart2040384.QgqllQq2HO Content-Type: multipart/mixed; boundary="Boundary-01=_z4ZWDZLFD8bN0EN" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_z4ZWDZLFD8bN0EN Content-Type: text/plain; charset="iso-8859-6" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Friday 21 October 2005 18:23, you wrote: > suz 2005-10-21 16:23:01 UTC > > FreeBSD src repository > > Modified files: > sys/netinet icmp6.h > sys/netinet6 icmp6.c in6.c in6.h in6_ifattach.c > in6_ifattach.h in6_var.h ip6_output.c > mld6.c mld6_var.h nd6.c nd6.h nd6_nbr.c > nd6_rtr.c > share/doc/IPv6 IMPLEMENTATION > Log: > sync with KAME regarding NDP > > - introduced fine-grain-timer to manage ND-caches and IPv6 > Multicast-Listeners - supports Router-Preference > <draft-ietf-ipv6-router-selection-07.txt> - better prefix lifetime > management > - more spec-comformant DAD advertisement > - updated RFC/internet-draft revisions > > Obtained from: KAME > Reviewed by: ume, gnn > MFC after: 2 month This fixes build on AMD64 (and maybe others) and should (from my poor=20 understanding of C) do the right thing for anything with a signed time_t -= =20 nontheless this should be fixed better. I assume you want to loop it back = to=20 KAME, still. > Revision Changes Path > 1.9 +157 -83 src/share/doc/IPv6/IMPLEMENTATION > 1.20 +5 -1 src/sys/netinet/icmp6.h > 1.69 +2 -2 src/sys/netinet6/icmp6.c > 1.57 +322 -80 src/sys/netinet6/in6.c > 1.42 +6 -4 src/sys/netinet6/in6.h > 1.31 +7 -21 src/sys/netinet6/in6_ifattach.c > 1.7 +1 -1 src/sys/netinet6/in6_ifattach.h > 1.27 +15 -4 src/sys/netinet6/in6_var.h > 1.100 +14 -13 src/sys/netinet6/ip6_output.c > 1.24 +116 -46 src/sys/netinet6/mld6.c > 1.7 +1 -0 src/sys/netinet6/mld6_var.h > 1.61 +337 -209 src/sys/netinet6/nd6.c > 1.21 +32 -21 src/sys/netinet6/nd6.h > 1.39 +37 -30 src/sys/netinet6/nd6_nbr.c > 1.31 +479 -282 src/sys/netinet6/nd6_rtr.c =2D-=20 /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News --Boundary-01=_z4ZWDZLFD8bN0EN Content-Type: text/x-diff; charset="iso-8859-6"; name="fix_dirty_shift.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="fix_dirty_shift.diff" Index: in6.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/store/mlaier/fcvs/src/sys/netinet6/in6.c,v retrieving revision 1.57 diff -u -r1.57 in6.c =2D-- in6.c 21 Oct 2005 16:23:00 -0000 1.57 +++ in6.c 22 Oct 2005 01:55:04 -0000 @@ -586,7 +586,7 @@ * signed. */ maxexpire =3D (-1) & =2D ~(1 << ((sizeof(maxexpire) * 8) - 1)); + ~((time_t)1 << ((sizeof(maxexpire) * 8) - 1)); if (ia->ia6_lifetime.ia6t_vltime < maxexpire - ia->ia6_updatetime) { retlt->ia6t_expire =3D ia->ia6_updatetime + @@ -604,7 +604,7 @@ * signed. */ maxexpire =3D (-1) & =2D ~(1 << ((sizeof(maxexpire) * 8) - 1)); + ~((time_t)1 << ((sizeof(maxexpire) * 8) - 1)); if (ia->ia6_lifetime.ia6t_pltime < maxexpire - ia->ia6_updatetime) { retlt->ia6t_preferred =3D ia->ia6_updatetime + Index: nd6.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /usr/store/mlaier/fcvs/src/sys/netinet6/nd6.c,v retrieving revision 1.61 diff -u -r1.61 nd6.c =2D-- nd6.c 21 Oct 2005 16:23:00 -0000 1.61 +++ nd6.c 22 Oct 2005 01:59:05 -0000 @@ -1481,7 +1481,8 @@ =20 /* XXX: we assume time_t is signed. */ maxexpire =3D (-1) & =2D ~(1 << ((sizeof(maxexpire) * 8) - 1)); + ~((time_t)1 << + ((sizeof(maxexpire) * 8) - 1)); if (pr->ndpr_vltime < maxexpire - pr->ndpr_lastupdate) { oprl->prefix[i].expire =3D @@ -2330,7 +2331,8 @@ =20 /* XXX: we assume time_t is signed. */ maxexpire =3D (-1) & =2D ~(1 << ((sizeof(maxexpire) * 8) - 1)); + ~((time_t)1 << + ((sizeof(maxexpire) * 8) - 1)); if (pr->ndpr_vltime < maxexpire - pr->ndpr_lastupdate) { p->expire =3D pr->ndpr_lastupdate + --Boundary-01=_z4ZWDZLFD8bN0EN-- --nextPart2040384.QgqllQq2HO Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQBDWZ43XyyEoT62BG0RAqvwAJ9kWzuVDrPQ2647M8V+SLgWY3PpMACePm/t LCYifskxUpwF+dohZxVOee0= =fQyv -----END PGP SIGNATURE----- --nextPart2040384.QgqllQq2HO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510220404.39977.max>