Squelch some more narrowing warnings.

And drop in another Y2.038K note.

diff --git a/rpcap-protocol.h b/rpcap-protocol.h
index 8b12277203f61aa4a0511cacca767215a025cf54..7598a0aea8c2cb2c2eaeb36a72006cdc2a6ec45e 100644 (file)
--- a/rpcap-protocol.h
+++ b/rpcap-protocol.h
@@ -326,6 +326,10 @@ struct rpcap_startcapreply
  */
 struct rpcap_pkthdr
 {
+       /*
+        * This protocol needs to be updated with a new version before
+        * 2038-01-19 03:14:07 UTC.
+        */
        uint32 timestamp_sec;   /* 'struct timeval' compatible, it represents the 'tv_sec' field */
        uint32 timestamp_usec;  /* 'struct timeval' compatible, it represents the 'tv_usec' field */
        uint32 caplen;          /* Length of portion present in the capture */

diff --git a/rpcapd/daemon.c b/rpcapd/daemon.c
index 27662fd5cd156af1563a3b2931587e73ac95e03d..4502e084a921ca8082728d5504ea6068fe42280f 100644 (file)
--- a/rpcapd/daemon.c
+++ b/rpcapd/daemon.c
@@ -2355,8 +2355,12 @@ daemon_thrdatamain(void *ptr)
                net_pkt_header->caplen = htonl(pkt_header->caplen);
                net_pkt_header->len = htonl(pkt_header->len);
                net_pkt_header->npkt = htonl(++(session->TotCapt));
-               net_pkt_header->timestamp_sec = htonl(pkt_header->ts.tv_sec);
-               net_pkt_header->timestamp_usec = htonl(pkt_header->ts.tv_usec);
+               //
+               // This protocol needs to be updated with a new version
+               // before 2038-01-19 03:14:07 UTC.
+               //
+               net_pkt_header->timestamp_sec = (uint32)htonl(pkt_header->ts.tv_sec);
+               net_pkt_header->timestamp_usec = (uint32)htonl(pkt_header->ts.tv_usec);
 
                // Bufferize the pkt data
                if (sock_bufferize((char *) pkt_data, pkt_header->caplen,