From c312f69abcbd44c8ca982f16d086c5bef05783f7 Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Thu, 21 Sep 2000 04:41:37 +0000 Subject: Make sure to pass the sent/received direction from pppdump.c in pseudo_header. Use generic "p2p_phdr" instead of "lapd_phdr". Modify toshiba.c and packet-lapd.c to take that into account. Add frame.p2p_dir, a filterable field, 0=sent, 1=recvd Make p2p_dir available in packe_info, as I think it will be needed in VJ COMP and UNCOMP dissection. Rename WTAP_ENCAP_TR to WTAP_ENCAP_TOKEN_RING. Mention pppd-log support in man page. Mention atmsnoop in README. svn path=/trunk/; revision=2455 --- wiretap/wtap.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'wiretap/wtap.h') diff --git a/wiretap/wtap.h b/wiretap/wtap.h index c3ccdc4ed5..43426a1993 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.80 2000/09/19 17:22:11 gram Exp $ + * $Id: wtap.h,v 1.81 2000/09/21 04:41:37 gram Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez @@ -78,7 +78,7 @@ #define WTAP_ENCAP_PER_PACKET -1 #define WTAP_ENCAP_UNKNOWN 0 #define WTAP_ENCAP_ETHERNET 1 -#define WTAP_ENCAP_TR 2 +#define WTAP_ENCAP_TOKEN_RING 2 #define WTAP_ENCAP_SLIP 3 #define WTAP_ENCAP_PPP 4 #define WTAP_ENCAP_FDDI 5 @@ -93,9 +93,10 @@ #define WTAP_ENCAP_ASCEND 14 #define WTAP_ENCAP_LAPD 15 #define WTAP_ENCAP_V120 16 +#define WTAP_ENCAP_PPP_WITH_PHDR 17 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 17 +#define WTAP_NUM_ENCAP_TYPES 18 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we @@ -185,11 +186,12 @@ struct ascend_phdr { guint32 task; /* Task number */ }; -/* Packet "pseudo-header" information for LAPD capture files. */ -struct lapd_phdr { - gboolean from_network_to_user; + +struct p2p_phdr { + gboolean sent; /* TRUE=sent, FALSE=received */ }; + /* * Bits in AppTrafType. * @@ -246,7 +248,7 @@ union wtap_pseudo_header { struct x25_phdr x25; struct ngsniffer_atm_phdr ngsniffer_atm; struct ascend_phdr ascend; - struct lapd_phdr lapd; + struct p2p_phdr p2p; }; struct wtap_pkthdr { -- cgit v1.2.3