diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-09 21:21:32 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-10 01:51:21 +0000 |
| commit | e6c87fe6b13f43d0c74ea8516d83a38ea4317688 (patch) | |
| tree | 27eb9cf5e28b7fdb4fd99477b64e1062b7102cf6 /plugins/docsis/packet-docsis.c | |
| parent | 9b182b7097e339501977f595903c2e837055fb1d (diff) | |
convert to proto_tree_add_subtree[_format] for plugin dissectors
Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97
Reviewed-on: https://code.wireshark.org/review/2974
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/docsis/packet-docsis.c')
| -rw-r--r-- | plugins/docsis/packet-docsis.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index 4002571920..1d2cb23f15 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -188,7 +188,7 @@ static void dissect_ehdr (tvbuff_t * tvb, proto_tree * tree, gboolean isfrag) { proto_tree *ehdr_tree; - proto_item *it, *item; + proto_item *item; gint ehdrlen; int pos; guint8 type; @@ -200,8 +200,7 @@ dissect_ehdr (tvbuff_t * tvb, proto_tree * tree, gboolean isfrag) ehdrlen = tvb_get_guint8 (tvb, 1); pos = 4; - it = proto_tree_add_text (tree, tvb, pos, ehdrlen, "Extended Header"); - ehdr_tree = proto_item_add_subtree (it, ett_ehdr); + ehdr_tree = proto_tree_add_subtree(tree, tvb, pos, ehdrlen, ett_ehdr, NULL, "Extended Header"); while (pos < ehdrlen + 4) { type = (tvb_get_guint8 (tvb, pos) & 0xF0); @@ -313,18 +312,18 @@ dissect_ehdr (tvbuff_t * tvb, proto_tree * tree, gboolean isfrag) ENC_BIG_ENDIAN); break; case EH_DS_SERVICE: - proto_tree_add_item(ehdr_tree, hf_docsis_ehdr_ds_traffic_pri, tvb, pos+1, 1, FALSE); + proto_tree_add_item(ehdr_tree, hf_docsis_ehdr_ds_traffic_pri, tvb, pos+1, 1, ENC_BIG_ENDIAN); if (len == 3) { - proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_ds_dsid, tvb, pos+1, 3, FALSE); + proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_ds_dsid, tvb, pos+1, 3, ENC_BIG_ENDIAN); } if (len == 5) { - proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_ds_seq_chg_cnt, tvb, pos+1, 1, FALSE); - proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_ds_dsid, tvb, pos+1, 3, FALSE); - proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_ds_pkt_seq_num, tvb, pos+4, 2, FALSE); + proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_ds_seq_chg_cnt, tvb, pos+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_ds_dsid, tvb, pos+1, 3, ENC_BIG_ENDIAN); + proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_ds_pkt_seq_num, tvb, pos+4, 2, ENC_BIG_ENDIAN); } break; |