diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2009-02-25 23:19:56 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2009-02-25 23:19:56 +0000 |
| commit | b47e7619e63cf96cf8537f292cdae68161c461c6 (patch) | |
| tree | 4c9496743597ab6031b56172c3e6a35fa7cb1625 /epan/dissectors/packet-nettl.c | |
| parent | 88b8066be3e331f703937ec86008ba5dcffbd529 (diff) | |
From Mark C. Brown:
Added support for HPVM (Integrity Virtual Machines) guest AVIO (Accelerated Virtual IO) driver IGSSN.
Cleaned up the trace record checks.
Made the default ethernet if the nettl subsystem is not recognized.
svn path=/trunk/; revision=27549
Diffstat (limited to 'epan/dissectors/packet-nettl.c')
| -rw-r--r-- | epan/dissectors/packet-nettl.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c index 4f7f54fe88..c44e02903f 100644 --- a/epan/dissectors/packet-nettl.c +++ b/epan/dissectors/packet-nettl.c @@ -183,6 +183,7 @@ static const value_string subsystem[] = { { 269, "HSSN" }, { 270, "IGSSN" }, { 271, "ICXGBE" }, + { 275, "IEXGBE" }, { 513, "KL_VM" }, { 514, "KL_PKM" }, { 515, "KL_DLKM" }, @@ -255,12 +256,8 @@ dissect_nettl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, tvb, pinfo, tree); break; case WTAP_ENCAP_NETTL_RAW_IP: - if ( ( (pinfo->pseudo_header->nettl.kind - & ~NETTL_HDR_SUBSYSTEM_BITS_MASK) - & (NETTL_HDR_PROCEDURE_TRACE | - NETTL_HDR_STATE_TRACE | - NETTL_HDR_ERROR_TRACE) ) != 0) - /* not really a data packet */ + if ( (pinfo->pseudo_header->nettl.kind & NETTL_HDR_PDU_MASK) == 0 ) + /* not actually a data packet (PDU) trace record */ call_dissector(data_handle, tvb, pinfo, tree); else if (pinfo->pseudo_header->nettl.subsys == NETTL_SUBSYS_NS_LS_SCTP ) call_dissector(sctp_handle, tvb, pinfo, tree); |