diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-05-20 19:29:39 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-05-20 19:29:39 +0000 |
| commit | f5e8e21ce2658c75f41818eb813ee4000b52ec9c (patch) | |
| tree | cf014ea9608d08848508d6b9bc54bda8f10cc80c /epan/packet_info.h | |
| parent | bd79d12416d02871675d12427a405b8cc791122a (diff) | |
From Owen Kirby via bug 3431:
The attached patch file adds dissectors for the ZigBee protocol stack,
which runs atop the IEEE 802.15.4 dissector. Also included is the
dissector for the ZigBee Encapsulation Protocol (packet-zep.c), used by
the Exegin Q51 protocol analyzer.
From me:
Fix a bunch of gcc (the compiler, not me) warnings.
svn path=/trunk/; revision=28429
Diffstat (limited to 'epan/packet_info.h')
| -rw-r--r-- | epan/packet_info.h | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/epan/packet_info.h b/epan/packet_info.h index b32b26c9c9..8873065427 100644 --- a/epan/packet_info.h +++ b/epan/packet_info.h @@ -86,12 +86,12 @@ typedef struct _packet_info { #define DESEGMENT_ONE_MORE_SEGMENT 0x0fffffff #define DESEGMENT_UNTIL_FIN 0x0ffffffe guint32 desegment_len; /* requested desegmentation additional length - or + or DESEGMENT_ONE_MORE_SEGMENT: - Desegment one more full segment + Desegment one more full segment (warning! only partially implemented) DESEGMENT_UNTIL_FIN: - Desgment all data for this tcp session + Desgment all data for this tcp session until the FIN segment. */ guint16 want_pdu_tracking; /* >0 if the subdissector has specified @@ -122,9 +122,9 @@ typedef struct _packet_info { int iplen; /* total length of IP packet */ int iphdrlen; /* length of IP header */ - int p2p_dir; /* Packet was captured as an - outbound (P2P_DIR_SENT) - inbound (P2P_DIR_RECV) + int p2p_dir; /* Packet was captured as an + outbound (P2P_DIR_SENT) + inbound (P2P_DIR_RECV) unknown (P2P_DIR_UNKNOWN) */ guint16 oxid; /* next 2 fields reqd to identify fibre */ guint16 rxid; /* channel conversations */ @@ -163,7 +163,7 @@ typedef struct _packet_info { tvbuff_t *gssapi_encrypted_tvb; tvbuff_t *gssapi_decrypted_tvb; gboolean gssapi_data_encrypted; - + guint32 ppid; /* SCTP PPI of current DATA chunk */ guint32 ppids[MAX_NUMBER_OF_PPIDS]; /* The first NUMBER_OF_PPIDS PPIDS which are present * in the SCTP packet @@ -182,12 +182,12 @@ typedef struct _packet_info { struct _sccp_msg_info_t* sccp_info; guint16 clnp_srcref; /* clnp/cotp source reference (can't use srcport, this would confuse tpkt) */ guint16 clnp_dstref; /* clnp/cotp destination reference (can't use dstport, this would confuse tpkt) */ - guint8 pw_atm_encap_type; /* FF: RFC 4717 is devilish, it describes many + guint8 pw_atm_encap_type; /* FF: RFC 4717 is devilish, it describes many * different types of ATM->PW encapsulation. * None of which can correctly be interpreted by * the packet-atm.c dissector. Thus I have to * pass some info from packet-pw-atm.c to packet- - * -atm.c, and augment/change packet-atm.c + * -atm.c, and augment/change packet-atm.c * dissector. * * 0: RFC4717::Sec. 9, ATM One-to-One Cell Mode @@ -204,6 +204,13 @@ typedef struct _packet_info { guint16 pw_atm_ncells; /* FF: number of cells fitted in a single * PW frame. */ + + guint16 zbee_cluster_id; /* ZigBee cluster ID, an application-specific message identifier that + * happens to be included in the transport (APS) layer header. + */ + guint8 zbee_stack_vers; /* ZigBee stack version number, present in the ZigBee network layer, but + * impacts the packet format at all layers of the ZigBee stack. + */ } packet_info; #endif /* __PACKET_INFO_H__ */ |