Overhaul WSP dissector.

1. Remove proto_tree_add_text (the reason I started the update)
2. Add expert info (mostly related to proto_tree_add_text, but since I was in the neighborhood...)
3. Replace "big functions macros" with "small macro" + real function (for big .o size savings)
4. Remove DebugLog macro (intent seems to duplicate basic functionality of a step-through debugger)
5. Replace HF_EMPTY (and comparible macros) with -1
6. Move header handler array to remove need for many forward declarations.

Change-Id: Ic5467289aae7d54e78c1fd65f93358387d6139aa
Reviewed-on: https://code.wireshark.org/review/7799
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Michael Mann 2015-03-23 10:31:21 -04:00 committed by Anders Broman
parent a6fc6aa0b4
commit ae20651d9a
3 changed files with 1852 additions and 1950 deletions

View File

@ -1291,7 +1291,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut,
DebugLog(("Content-Type: [from WSP dissector]\n"));
DebugLog(("Calling add_content_type() in WSP dissector\n"));
offset = add_content_type(mmse_tree, tvb, offset, &type, &type_str);
offset = add_content_type(mmse_tree, pinfo, tvb, offset, &type, &type_str);
DebugLog(("Generating new TVB subset (offset = %u)\n", offset));
tmp_tvb = tvb_new_subset_remaining(tvb, offset);
DebugLog(("Add POST data\n"));

File diff suppressed because it is too large Load Diff

View File

@ -47,7 +47,7 @@ WS_DLL_PUBLIC value_string_ext wsp_vals_status_ext;
*/
void add_post_data (proto_tree *, tvbuff_t *, guint, const char *,
packet_info *);
guint32 add_content_type (proto_tree *tree, tvbuff_t *tvb,
guint32 add_content_type (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
guint32 val_start,
guint32 *well_known_content, const char **textual_content);