aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormcr <mcr>2004-03-30 14:42:50 +0000
committermcr <mcr>2004-03-30 14:42:50 +0000
commiteb9ec105d1847f8d0e8eaf88e88876973716736f (patch)
tree7a5753f02575340bb1abcd9d7cd5c1d1d37a9fa9
parent0a56a3721af9ee3dff58131716ca9c7d93bd4a15 (diff)
update changes file
-rw-r--r--CHANGES8
-rw-r--r--VERSION2
-rw-r--r--pcap1.h9
3 files changed, 16 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index b0e7726..b3a18f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
-@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.58 2004-03-29 17:40:11 mcr Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59 2004-03-30 14:42:50 mcr Exp $ (LBL)
+Tue. March 30, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.3 release
+
+ Fixed minor problem in gencode.c that would appear on 64-bit
+ platforms.
+ Version number is now sane.
+
Mon. March 29, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.2 release
updates for autoconf 2.5
diff --git a/VERSION b/VERSION
index aec258d..eb38714 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8
+1.0-PRE-CVS
diff --git a/pcap1.h b/pcap1.h
index 7fa1a49..708344f 100644
--- a/pcap1.h
+++ b/pcap1.h
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#) $Header: /tcpdump/master/libpcap/pcap1.h,v 1.1 2004-03-24 19:51:11 mcr Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap1.h,v 1.2 2004-03-30 14:42:50 mcr Exp $ (LBL)
*/
#ifndef lib_pcap_h
@@ -114,6 +114,7 @@ enum pcap1_info_types {
PCAP_WALLTIME,
PCAP_TIMESKEW,
PCAP_PROBEPLACE, /* aka direction */
+ PCAP_COMMENT, /* comment */
};
struct pcap1_info_container {
@@ -150,6 +151,12 @@ enum pcap1_probe {
struct pcap1_info_probe {
struct pcap1_info_container pic;
bpf_u_int32 probeloc; /* enum pcap1_probe */
+ unsigned char probe_desc[0];
+};
+
+struct pcap1_info_comment {
+ struct pcap1_info_container pic;
+ unsigned char comment[0];
};
struct pcap1_packet_header {