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-gsm_abis_om2000.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-gsm_abis_om2000.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_abis_om2000.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c index 3cb1fd03cd..10c3e62d72 100644 --- a/epan/dissectors/packet-gsm_abis_om2000.c +++ b/epan/dissectors/packet-gsm_abis_om2000.c @@ -970,8 +970,8 @@ dissect_om2k_mo(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree return 4; } -static void -dissect_abis_om2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_abis_om2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; proto_tree *om2k_tree; @@ -980,9 +980,6 @@ dissect_abis_om2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset; - if ((tree == NULL) && (pinfo->cinfo == NULL)) - return; /* no dissection required */ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OM2000"); /* Don't do col_clear() so this dissector can append to COL_INFO*/ @@ -1004,7 +1001,7 @@ dissect_abis_om2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "unknown 0x%04x")); if (tree == NULL) - return; /* No refs to COL_... beyond this point */ + return tvb_captured_length(tvb); /* No refs to COL_... beyond this point */ proto_item_append_text(ti, " %s ", val_to_str_ext(msg_code, &om2k_msgcode_vals_ext, @@ -1034,6 +1031,7 @@ dissect_abis_om2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } dissect_om2k_attrs(tvb, offset, om2k_tree); + return tvb_captured_length(tvb); } void @@ -1418,7 +1416,7 @@ proto_register_abis_om2000(void) proto_register_subtree_array(ett, array_length(ett)); - register_dissector("gsm_abis_om2000", dissect_abis_om2000, + new_register_dissector("gsm_abis_om2000", dissect_abis_om2000, proto_abis_om2000); } |