diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-13 20:18:34 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-14 18:00:00 +0000 |
| commit | 8faf5c80b3302247c32e1f5c492cb31a082ee0ad (patch) | |
| tree | e9bac5673fc9a480fe1fa06fcc6d5d7d45b37389 /epan/dissectors/packet-noe.c | |
| parent | 76dec3ba681da2c315efba4433d3b1f995defd91 (diff) | |
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I25fe6a0aac93980333217d007702799d16946563
Reviewed-on: https://code.wireshark.org/review/11816
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-noe.c')
| -rw-r--r-- | epan/dissectors/packet-noe.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c index 353db005ef..7c8a913cc8 100644 --- a/epan/dissectors/packet-noe.c +++ b/epan/dissectors/packet-noe.c @@ -1249,9 +1249,9 @@ static void decode_mtd(proto_tree *tree, /*----------------------------------------------------------------------------- NOE DISSECTOR ---------------------------------------------------------------------------*/ -static void dissect_noe(tvbuff_t *tvb, +static int dissect_noe(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_item *noe_item; proto_tree *noe_tree; @@ -1308,7 +1308,7 @@ static void dissect_noe(tvbuff_t *tvb, method); if (method >= METHOD_INVALID) - return; + return offset; /* add text to the frame "INFO" column */ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", @@ -1337,6 +1337,7 @@ static void dissect_noe(tvbuff_t *tvb, length -= 1; decode_mtd(noe_tree, tvb, pinfo, method, offset, length); } + return tvb_captured_length(tvb); } @@ -1651,7 +1652,7 @@ void proto_register_noe(void) proto_register_field_array(proto_noe, hf_noe, array_length(hf_noe)); - register_dissector("noe", dissect_noe, proto_noe); + new_register_dissector("noe", dissect_noe, proto_noe); /* Common subtree array registration */ proto_register_subtree_array(ett, array_length(ett)); |