Remove no more used field 'tzoff' in some structures

As a follow-up to comit 5f2a5c03e0f91bc2dc2ae33838db273dd6c7d8d9.

diff --git a/pcap-int.h b/pcap-int.h
index 5888df7241b65bf933b045ceaba1926aa5680110..210368228beca4b56b1e39ec3b75f819bd59df46 100644 (file)
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -196,7 +196,6 @@ struct pcap {
        int snapshot;
        int linktype;           /* Network linktype */
        int linktype_ext;       /* Extended information stored in the linktype field of a file */
-       int tzoff;              /* timezone offset */
        int offset;             /* offset for proper alignment */
        int activated;          /* true if the capture is really started */
        int oldstyle;           /* if we're opening with pcap_open_live() */

diff --git a/pcap-rpcap.c b/pcap-rpcap.c
index e9d6245bf3992ede4d948bca90330a1de2d91b0f..d6dc5dee157b0109e62ca363ca7c7d7a0dc40ad1 100644 (file)
--- a/pcap-rpcap.c
+++ b/pcap-rpcap.c
@@ -2282,7 +2282,6 @@ pcap_t *pcap_open_rpcap(const char *source, int snaplen, int flags, int read_tim
 
        /* Set proper fields into the pcap_t struct */
        fp->linktype = ntohl(openreply.linktype);
-       fp->tzoff = ntohl(openreply.tzoff);
        pr->rmt_sockctrl = sockctrl;
        pr->protocol_version = protocol_version;
        pr->rmt_clientside = 1;

diff --git a/rpcap-protocol.h b/rpcap-protocol.h
index 83ebdc5b00638313d624470942c6aeb9768cae1a..8b12277203f61aa4a0511cacca767215a025cf54 100644 (file)
--- a/rpcap-protocol.h
+++ b/rpcap-protocol.h
@@ -299,7 +299,6 @@ struct rpcap_findalldevs_ifaddr
 struct rpcap_openreply
 {
        int32 linktype; /* Link type */
-       int32 tzoff;    /* Timezone offset */
 };
 
 /* Format of the message that starts a remote capture (startcap command) */

diff --git a/rpcapd/daemon.c b/rpcapd/daemon.c
index 4bf42fde849ecf2ece8a74882c82976ad919ef74..85aa0f983565bf3d6ede2683cb689e8ad96ab1e9 100644 (file)
--- a/rpcapd/daemon.c
+++ b/rpcapd/daemon.c
@@ -1507,7 +1507,6 @@ daemon_msg_open_req(struct daemon_slpars *pars, uint32 plen, char *source, size_
 
        memset(openreply, 0, sizeof(struct rpcap_openreply));
        openreply->linktype = htonl(pcap_datalink(fp));
-       openreply->tzoff = 0; /* This is always 0 for live captures */
 
        // We're done with the pcap_t.
        pcap_close(fp);

diff --git a/sf-pcap.c b/sf-pcap.c
index fd70a73ccad839f8b928f4d040fef901f4d6ae47..1e587cb1cefe8d999aa8c12cdd78aab77ec28e3a 100644 (file)
--- a/sf-pcap.c
+++ b/sf-pcap.c
@@ -231,7 +231,6 @@ pcap_check_header(bpf_u_int32 magic, FILE *fp, u_int precision, char *errbuf,
        p->swapped = swapped;
        p->version_major = hdr.version_major;
        p->version_minor = hdr.version_minor;
-       p->tzoff = hdr.thiszone;
        p->snapshot = hdr.snaplen;
        if (p->snapshot <= 0) {
                /*

diff --git a/sf-pcapng.c b/sf-pcapng.c
index 8c8e93eccde93554f3ca31a202200432ebb08a75..970c675c5c2f8e3541c33950cd280209edddbbc7 100644 (file)
--- a/sf-pcapng.c
+++ b/sf-pcapng.c
@@ -1009,7 +1009,6 @@ pcap_ng_check_header(bpf_u_int32 magic, FILE *fp, u_int precision, char *errbuf,
        }
 
 done:
-       p->tzoff = 0;   /* XXX - not used in pcap */
        p->snapshot = idbp->snaplen;
        if (p->snapshot <= 0) {
                /*