diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-05-15 23:44:23 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-05-15 23:44:23 +0000 |
| commit | bf0f73f6bee2a7801833c71af9d1011e7e276207 (patch) | |
| tree | 1d1a9e232a00f028b5745f94bba34d6a50144621 /epan | |
| parent | 6f2b6538ebe708d47924f5e5c65d94e93af3b8a7 (diff) | |
Call dissect_osinlcp_opt_type_len() to dissect the OSINLCP option type and length, unintentionally omitted. I guess this is what happens without enough packet captures to test against and a compiler that doesn't warn enough about unused functions. Anyone know how to get MSVC compilers to complain about such things like the other compilers do?
svn path=/trunk/; revision=42644
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ppp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 4572887915..98136ca899 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3097,7 +3097,6 @@ dissect_ipcp_sec_nbns_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, } -#if 0 static void dissect_osinlcp_opt_type_len(tvbuff_t *tvb, int offset, proto_tree *tree, const char *name) @@ -3109,11 +3108,11 @@ dissect_osinlcp_opt_type_len(tvbuff_t *tvb, int offset, proto_tree *tree, type, "%s (%u)", name, type); proto_tree_add_item(tree, hf_osinlcp_opt_length, tvb, offset + 1, 1, ENC_NA); } -#endif + static void -dissect_osinlcp_align_npdu_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, - guint length, packet_info *pinfo _U_, - proto_tree *tree) +dissect_osinlcp_align_npdu_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, + int offset, guint length, + packet_info *pinfo _U_, proto_tree *tree) { proto_item *tf; proto_tree *field_tree; @@ -3121,6 +3120,7 @@ dissect_osinlcp_align_npdu_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset tf = proto_tree_add_text(tree, tvb, offset, length, "%s: Alignment: %u", optp->name, tvb_get_guint8(tvb, offset + 2)); field_tree = proto_item_add_subtree(tf, *optp->subtree_index); + dissect_osinlcp_opt_type_len(tvb, offset, field_tree, optp->name); proto_tree_add_item(field_tree, hf_osinlcp_opt_alignment, tvb, offset + 2, 1, ENC_NA); } |