diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-31 23:41:20 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-31 23:41:20 +0000 |
| commit | 5d91b21281d84d89034f3bea079c54cb21dbdc1f (patch) | |
| tree | 8dc3d7eb227a29c8983f5fe50e4a91cc556b8e3c /epan/dissectors/packet-capwap.c | |
| parent | 4505b0d56384c981fe73bcf1da6cbe583641f87b (diff) | |
Restore saved 'pinfo->fragmented' as appropriate;
Fixes gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38297 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-capwap.c')
| -rw-r--r-- | epan/dissectors/packet-capwap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index e0889f4235..11d8ab1da2 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -46,7 +46,6 @@ static gboolean global_capwap_swap_frame_control = TRUE; static GHashTable *capwap_fragment_table = NULL; static GHashTable *capwap_reassembled_table = NULL; -static gboolean save_fragmented; /* TODO LIST ! * add decryption of DLTS Message @@ -1349,6 +1348,7 @@ dissect_capwap_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 fragment_id; guint32 fragment_offset; fragment_data *frag_msg = NULL; + gboolean save_fragmented; /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "CAPWAP"); @@ -1411,6 +1411,7 @@ dissect_capwap_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* CAPWAP Message Element */ offset += dissect_capwap_message_element(tvb, capwap_control_tree, offset); } + pinfo->fragmented = save_fragmented; } /* Code to actually dissect the packets */ @@ -1430,6 +1431,7 @@ dissect_capwap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 fragment_id; guint32 fragment_offset; fragment_data *frag_msg = NULL; + gboolean save_fragmented; /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "CAPWAP"); @@ -1505,6 +1507,7 @@ dissect_capwap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } } + pinfo->fragmented = save_fragmented; } |