From: VANHULLEBUS Y. <va...@fr...> - 2011-10-12 14:56:51
|
Hi. On Wed, Oct 12, 2011 at 04:20:19PM +0200, Mats Andersson wrote: > How about this adaption? I have used similiar ideas > to cover for compatibility mode in other situations. We have some -fno-strict-aliasing issues in the code, and it would be great if we can fix them. However, I'd like to avoid #if code as most as possible, and for that kind of code, I'm not sure it will be interesting to keep the cast when alignment is good. Just replacing the code like done in the previous patch won't change so much performances, I guess, and code will be easier to maintain. Yvan. > Best regards, > Mats Andersson, on behalf of Debian > > > Index: src/racoon/isakmp_cfg.c > =================================================================== > RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c,v > retrieving revision 1.24 > diff -u -r1.24 isakmp_cfg.c > --- src/racoon/isakmp_cfg.c 21 Sep 2010 13:14:17 -0000 1.24 > +++ src/racoon/isakmp_cfg.c 12 Oct 2011 14:15:21 -0000 > @@ -1671,7 +1671,17 @@ > } > > memset(&ut, 0, sizeof ut); > +#if ! (__WORDSIZE == 64 && defined __WORDSIZE_COMPAT32) > gettimeofday((struct timeval *)&ut.ut_tv, NULL); > +#else > + /* Time structures differ in length, > + * but compatibility mode is asked for. */ > + struct timeval now; > + > + gettimeofday(&now, NULL); > + ut.ut_tv.tv_sec = now.tv_sec & 0xffffffff; > + ut.ut_tv.tv_usec = now.tv_usec & 0xffffffff; > +#endif > snprintf(ut.ut_id, sizeof ut.ut_id, TERMSPEC, port); > > switch (inout) { > > ------------------------------------------------------------------------------ > All the data continuously generated in your IT infrastructure contains a > definitive record of customers, application performance, security > threats, fraudulent activity and more. Splunk takes this data and makes > sense of it. Business sense. IT sense. Common sense. > http://p.sf.net/sfu/splunk-d2d-oct > _______________________________________________ > Ipsec-tools-devel mailing list > Ips...@li... > https://lists.sourceforge.net/lists/listinfo/ipsec-tools-devel |