diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-05-10 07:03:25 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-05-10 07:03:25 +0000 |
| commit | 66f0e7fdd82b2bb93dde84070c3e0fbd82ad61da (patch) | |
| tree | 241ecf5cc653f5b584318854d50ac7efdc025391 /epan/dissectors/packet-tzsp.c | |
| parent | ac654293c396fa09d2e02e776a4fd6f36d7b12ac (diff) | |
Use #defines for protocol types, and make the description of type 0
match the TZSP spec.
svn path=/trunk/; revision=49226
Diffstat (limited to 'epan/dissectors/packet-tzsp.c')
| -rw-r--r-- | epan/dissectors/packet-tzsp.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index 3f9ac73c22..359cb30bcb 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -47,14 +47,22 @@ static int hf_tzsp_version = -1; static int hf_tzsp_type = -1; static int hf_tzsp_encap = -1; +/* + * Packet types. + */ +#define TZSP_RX_PACKET 0 /* Packet received from the sensor */ +#define TZSP_TX_PACKET 1 /* Packet for the sensor to transmit */ +#define TZSP_CONFIG 3 /* Configuration information for the sensor */ +#define TZSP_NULL 4 /* Null frame, used as a keepalive */ +#define TZSP_PORT 5 /* Port opener - opens a NAT tunnel */ + static const value_string tzsp_type[] = { - {0, "Received tag list"}, - {1, "Packet for transmit"}, - {2, "Reserved"}, - {3, "Configuration"}, - {4, "Keepalive"}, - {5, "Port opener"}, - {0, NULL} + {TZSP_RX_PACKET, "Received packet"}, + {TZSP_TX_PACKET, "Packet for transmit"}, + {TZSP_CONFIG, "Configuration"}, + {TZSP_NULL, "Keepalive"}, + {TZSP_PORT, "Port opener"}, + {0, NULL} }; static gint ett_tzsp = -1; @@ -88,6 +96,11 @@ static int hf_sensormac = -1; /* ************************************************************************* */ #define TZSP_ENCAP_ETHERNET 1 +#define TZSP_ENCAP_TOKEN_RING 2 +#define TZSP_ENCAP_SLIP 3 +#define TZSP_ENCAP_PPP 4 +#define TZSP_ENCAP_FDDI 5 +#define TZSP_ENCAP_RAW 7 /* "Raw UO", presumably meaning "Raw IP" */ #define TZSP_ENCAP_IEEE_802_11 18 #define TZSP_ENCAP_IEEE_802_11_PRISM 119 #define TZSP_ENCAP_IEEE_802_11_AVS 127 @@ -332,7 +345,7 @@ dissect_tzsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) encap_name, encapsulation); } - if (type != 4 && type != 5) { + if (type != TZSP_NULL && type != TZSP_PORT) { pos = add_option_info(tvb, 4, tzsp_tree, ti); if (tree) |