diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-09-14 09:59:19 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-09-14 09:59:19 +0000 |
| commit | c202b790e3528e6cedd9cecd8a8207f304553a88 (patch) | |
| tree | 085e512c5f2822a08f0ad43a6fe2319fa82868a1 /epan | |
| parent | 5ceeb628c02d88dca776c74b8072f6cd9105ae0c (diff) | |
Small cleanup
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22872 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-isakmp.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index db9953aabd..42b6b33915 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -1796,7 +1796,6 @@ dissect_cisco_fragmentation(tvbuff_t *tvb, int offset, int length, proto_tree *t guint8 seq; /* Packet sequence number, starting from 1 */ guint8 last; - tvbuff_t *defrag_isakmp_tvb; if (length < 4) return; @@ -1814,7 +1813,7 @@ dissect_cisco_fragmentation(tvbuff_t *tvb, int offset, int length, proto_tree *t /* Start Reassembly stuff for Cisco IKE fragmentation */ { gboolean save_fragmented; - tvbuff_t* new_tvb = NULL; + tvbuff_t *defrag_isakmp_tvb = NULL; fragment_data *frag_msg = NULL; save_fragmented = pinfo->fragmented; @@ -1826,26 +1825,18 @@ dissect_cisco_fragmentation(tvbuff_t *tvb, int offset, int length, proto_tree *t seq-1, /* fragment sequence number, starting from 0 */ tvb_length_remaining(tvb, offset), /* fragment length - to the end */ last); /* More fragments? */ - new_tvb = process_reassembled_data(tvb, offset, pinfo, + defrag_isakmp_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled Message", frag_msg, &isakmp_frag_items, NULL, tree); - if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, - " (Message Reassembled)"); - } else { /* Not last packet of reassembled Short Message */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, - " (Message fragment %u%s)", seq, (last ? " - last" : "")); - } - - if (new_tvb) { /* take it all */ - defrag_isakmp_tvb = new_tvb; + if (defrag_isakmp_tvb) { /* take it all */ dissect_isakmp(defrag_isakmp_tvb, pinfo, tree); - } else { /* make a new subset */ - defrag_isakmp_tvb = tvb_new_subset(tvb, offset, -1, -1); } + if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, + " (%sMessage fragment %u%s)", + (frag_msg ? "Reassembled + " : ""), + seq, (last ? " - last" : "")); pinfo->fragmented = save_fragmented; } /* End Reassembly stuff for Cisco IKE fragmentation */ |