From: guy <guy>
Date: Tue, 5 Feb 2008 19:46:58 +0000 (+0000)
Subject: "struct timeval" isn't guaranteed to be two 32-bit values (consider a
X-Git-Tag: tcpdump-4.0.0~32
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/cf6e9c00e5c7916fbcd2298088edcddc7153ea62

"struct timeval" isn't guaranteed to be two 32-bit values (consider a
64-bit time_t); create a structure that is guaranteed to be two 32-bit
values.
---

diff --git a/timed.h b/timed.h
index 713f353a..15135e73 100644
--- a/timed.h
+++ b/timed.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/timed.h,v 1.5 2002-12-11 07:14:12 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/timed.h,v 1.5.6.1 2008-02-05 19:46:58 guy Exp $ (LBL) */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -44,12 +44,17 @@
 #define	TSPVERSION	1
 #define ANYADDR 	NULL
 
+struct tsp_timeval {
+	u_int32_t	tv_sec;
+	u_int32_t	tv_usec;
+};
+
 struct tsp {
 	u_int8_t	tsp_type;
 	u_int8_t	tsp_vers;
 	u_int16_t	tsp_seq;
 	union {
-		struct timeval tspu_time;
+		struct tsp_timeval tspu_time;
 		int8_t tspu_hopcnt;
 	} tsp_u;
 	int8_t tsp_name[256];