diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-10-20 18:14:49 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-10-20 18:14:49 +0000 |
| commit | 06325a1bd6771b58202780292292e391d870b9df (patch) | |
| tree | dceffbd33ea2a8832ceef5b38b4684740fb39493 /epan/dissectors/packet-aruba-papi.c | |
| parent | d14bdd492e52d1a24786b8e46ed1fa43a3ffbb7f (diff) | |
(Minor): pretfs callback not req'd;
Move call to data dissector undet 'if(tree)' so same value of
offset used whether or not 'tree == NULL'.
svn path=/trunk/; revision=34591
Diffstat (limited to 'epan/dissectors/packet-aruba-papi.c')
| -rw-r--r-- | epan/dissectors/packet-aruba-papi.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c index 86fe81f4fe..653d9e9a17 100644 --- a/epan/dissectors/packet-aruba-papi.c +++ b/epan/dissectors/packet-aruba-papi.c @@ -44,8 +44,6 @@ #define UDP_PORT_PAPI 8211 -void proto_reg_handoff_papi(void); - /* Initialize the protocol and registered fields */ static int proto_papi = -1; static int hf_papi_hdr_id = -1; @@ -205,10 +203,10 @@ dissect_papi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset = dissect_papi_debug(tvb, offset, papi_tree); } - } - next_tvb = tvb_new_subset(tvb, offset, -1, -1); - call_dissector(data_handle,next_tvb, pinfo, tree); + next_tvb = tvb_new_subset(tvb, offset, -1, -1); + call_dissector(data_handle,next_tvb, pinfo, tree); + } return(TRUE); } @@ -332,8 +330,7 @@ proto_register_papi(void) proto_register_field_array(proto_papi, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - papi_module = prefs_register_protocol(proto_papi, - proto_reg_handoff_papi); + papi_module = prefs_register_protocol(proto_papi, NULL); prefs_register_bool_preference(papi_module, "experimental_decode", "Do experimental decode", |