diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-10-31 07:12:42 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-10-31 07:12:42 +0000 |
| commit | f6dd69a024735819009d1847f3ac010ff5c025c5 (patch) | |
| tree | 7e11961398633886725fb3b33b3a254666a04af2 /packet-frame.c | |
| parent | 009338e1b0e87f5b800e3e2b5ac8f504c39924ab (diff) | |
Discard the WTAP_ENCAP_LAPD encapsulation type in favor of a
WTAP_ENCAP_ISDN encapsulation type, which includes a pseudo-header
giving the direction (user-to-network or network-to-user) and the
channel number.
Add a new circuit type, using the ISDN channel number as the circuit ID.
Add an ISDN dissector to put the direction and channel number into the
protocol tree and to call the appropriate dissector for the payload
based on the channel (LAPD for the D channel; V.120, PPP, or data for B
channels, based on some heuristics).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6521 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-frame.c')
| -rw-r--r-- | packet-frame.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packet-frame.c b/packet-frame.c index 805d6ba529..28f6158fa3 100644 --- a/packet-frame.c +++ b/packet-frame.c @@ -2,7 +2,7 @@ * * Top-most dissector. Decides dissector based on Wiretap Encapsulation Type. * - * $Id: packet-frame.c,v 1.31 2002/09/04 09:40:24 sahlberg Exp $ + * $Id: packet-frame.c,v 1.32 2002/10/31 07:12:23 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -82,7 +82,6 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (pinfo->pseudo_header != NULL) { switch (pinfo->fd->lnk_t) { - case WTAP_ENCAP_LAPD: case WTAP_ENCAP_CHDLC: case WTAP_ENCAP_PPP_WITH_PHDR: pinfo->p2p_dir = pinfo->pseudo_header->p2p.sent ? @@ -95,6 +94,11 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (pinfo->pseudo_header->x25.flags & FROM_DCE) ? P2P_DIR_RECV : P2P_DIR_SENT; break; + + case WTAP_ENCAP_ISDN: + pinfo->p2p_dir = pinfo->pseudo_header->isdn.uton ? + P2P_DIR_SENT : P2P_DIR_RECV; + break; } } |