diff options
| -rw-r--r-- | packet-atm.c | 4 | ||||
| -rw-r--r-- | wiretap/iptrace.c | 20 |
2 files changed, 18 insertions, 6 deletions
diff --git a/packet-atm.c b/packet-atm.c index 80061f5805..baab8bec08 100644 --- a/packet-atm.c +++ b/packet-atm.c @@ -1,7 +1,7 @@ /* packet-atm.c * Routines for ATM packet disassembly * - * $Id: packet-atm.c,v 1.5 1999/11/18 08:50:18 gram Exp $ + * $Id: packet-atm.c,v 1.6 1999/11/18 09:38:50 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -424,7 +424,7 @@ dissect_atm(const u_char *pd, frame_data *fd, proto_tree *tree) guint hl_type; aal_type = fd->pseudo_header.ngsniffer_atm.AppTrafType & ATT_AALTYPE; - hl_type = fd->pseudo_header.ngsniffer_atm.AppHLType & ATT_HLTYPE; + hl_type = fd->pseudo_header.ngsniffer_atm.AppTrafType & ATT_HLTYPE; if (check_col(fd, COL_PROTOCOL)) col_add_str(fd, COL_PROTOCOL, "ATM"); diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index 90fa479b03..cf8bc3d631 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -1,6 +1,6 @@ /* iptrace.c * - * $Id: iptrace.c,v 1.17 1999/11/18 08:50:34 gram Exp $ + * $Id: iptrace.c,v 1.18 1999/11/18 09:39:12 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -210,13 +210,25 @@ atm_guess_content(wtap *wth, guint8 *header, guint8 *pd) wth->phdr.pseudo_header.ngsniffer_atm.aal5t_chksum = 0; if (pd[0] == 0xaa && pd[1] == 0xaa && pd[2] == 0x03) { - wth->phdr.pseudo_header.ngsniffer_atm.AppHLType = ATT_HL_LLCMX; + wth->phdr.pseudo_header.ngsniffer_atm.AppTrafType |= ATT_HL_LLCMX; } else if ( Vpi == 0 && Vci == 16 ) { - wth->phdr.pseudo_header.ngsniffer_atm.AppHLType = ATT_HL_ILMI; + wth->phdr.pseudo_header.ngsniffer_atm.AppTrafType |= ATT_HL_ILMI; + } + else if ( Vpi == 0 && Vci == 5 ) { + /* Signalling AAL */ + wth->phdr.pseudo_header.ngsniffer_atm.AppTrafType = ATT_AAL_SIGNALLING; } else { - wth->phdr.pseudo_header.ngsniffer_atm.AppHLType = ATT_HL_LANE; + wth->phdr.pseudo_header.ngsniffer_atm.AppTrafType |= ATT_HL_LANE; + if (pd[0] == 0xff && pd[1] == 0x00) + wth->phdr.pseudo_header.ngsniffer_atm.AppHLType = AHLT_LANE_LE_CTRL; + else { + /* + * XXX - Ethernet, or Token Ring? + */ + wth->phdr.pseudo_header.ngsniffer_atm.AppHLType = AHLT_LANE_802_3; + } } } |