diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-03-13 12:52:41 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-03-13 21:45:03 +0000 |
| commit | e204e9aefb8ec36638d55efee93f73eec8a3e7d8 (patch) | |
| tree | f2a528b471649d1400182ae0458060bb3f28e538 /epan/dissectors/packet-zbee-zdp.c | |
| parent | ba32257cb6226d15d310080071c698f2d6903c88 (diff) | |
Enhance ZigBee Routing Table
Make field filterable and use value_string for status
Based from capture available in bug 9855
Need to continue... lot of enhance is possible in ZigBee dissector...
Change-Id: I0ac84e05a7b8b54e9879abbb7495034318188394
Reviewed-on: https://code.wireshark.org/review/631
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zdp.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index a94d1550b8..e3d64cfb03 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -160,6 +160,13 @@ static int hf_zbee_zdp_complex = -1; int hf_zbee_zdp_tx_fail = -1; int hf_zbee_zdp_channel_count = -1; +/* Routing Table */ + int hf_zbee_zdp_rtg = -1; + int hf_zbee_zdp_rtg_entry = -1; + int hf_zbee_zdp_rtg_destination = -1; + int hf_zbee_zdp_rtg_next_hop = -1; + int hf_zbee_zdp_rtg_status = -1; + /* Subtree indicies. */ static gint ett_zbee_zdp = -1; gint ett_zbee_zdp_endpoint = -1; @@ -303,6 +310,14 @@ static const value_string zbee_zdp_status_names[] = { { 0, NULL } }; +const value_string zbee_zdp_rtg_status_vals[] = { + { 0x00, "Active" }, + { 0x01, "Discovery Underway" }, + { 0x02, "Discovery Failed" }, + { 0x03, "Inactive" }, + { 0, NULL } +}; + /*FUNCTION:------------------------------------------------------ * NAME * zdp_status_name @@ -1657,7 +1672,24 @@ void proto_register_zbee_zdp(void) { &hf_zbee_zdp_channel_count, { "Channel List Count", "zbee_zdp.channel_count", FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL }}, + + { &hf_zbee_zdp_rtg, + { "Routing Table", "zbee_zdp.routing", FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, + { &hf_zbee_zdp_rtg_entry, + { "Routing Table Entry", "zbee_zdp.routing.entry", FT_NONE, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, + { &hf_zbee_zdp_rtg_destination, + { "Destination", "zbee_zdp.routing.destination", FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL }}, + { &hf_zbee_zdp_rtg_status, + { "Status", "zbee_zdp.routing.status", FT_UINT8, BASE_DEC, VALS(zbee_zdp_rtg_status_vals), 0x0, + NULL, HFILL }}, + { &hf_zbee_zdp_rtg_next_hop, + { "Next Hop", "zbee_zdp.routing.next_hop", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }} + }; /* APS subtrees */ |