diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-10-14 02:55:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-10-14 02:55:07 +0000 |
| commit | 8232afda30ef5d991ecf15ff269833a069ac79c6 (patch) | |
| tree | 5daca4ad619d588a1ad28c36fee67bed0a978853 | |
| parent | bdf4fbcc179ef885f50d5158db7fe7f004e43c6b (diff) | |
| download | wireshark-8232afda30ef5d991ecf15ff269833a069ac79c6.tar.gz | |
Copy over r45529 from trunk:
------------------------------------------------------------------------
r45529 | guy | 2012-10-13 19:54:25 -0700 (Sat, 13 Oct 2012) | 10 lines
Some of the changes claimed to be in the previous checkin weren't there.
Label the data sources for reassembled fragments as "Reassembled
6LoWPAN".
Fix the capitalization of "6LoWPAN".
Also, label the data sources for decompressed fragments as "Decompressed
6LoWPAN xxx".
svn path=/trunk-1.8/; revision=45530
| -rw-r--r-- | epan/dissectors/packet-6lowpan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index b4e1cfe6a0..f4b7e843c9 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -1148,7 +1148,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg ipv6_tvb = lowpan_reassemble_ipv6(tvb, &ipv6, nhdr_list); /* Add a new data source for it. */ - add_new_data_source(pinfo, ipv6_tvb, "6LoWPAN HC1"); + add_new_data_source(pinfo, ipv6_tvb, "Decompressed 6LoWPAN HC1"); return ipv6_tvb; } /* dissect_6lowpan_hc1 */ @@ -1529,7 +1529,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d ipv6_tvb = lowpan_reassemble_ipv6(tvb, &ipv6, nhdr_list); /* Add a new data source for it. */ - add_new_data_source(pinfo, ipv6_tvb, "6LoWPAN IPHC"); + add_new_data_source(pinfo, ipv6_tvb, "Decompressed 6LoWPAN IPHC"); return ipv6_tvb; } /* dissect_6lowpan_iphc */ @@ -2124,7 +2124,7 @@ dissect_6lowpan_frag_first(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Attempt reassembly. */ new_tvb = process_reassembled_data(frag_tvb, 0, pinfo, - "6LowPAN", frag_data, &lowpan_frag_items, + "Reassembled 6LoWPAN", frag_data, &lowpan_frag_items, NULL, tree); pinfo->fragmented = save_fragmented; @@ -2216,7 +2216,7 @@ dissect_6lowpan_frag_middle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Attempt reassembly. */ new_tvb = process_reassembled_data(tvb, offset, pinfo, - "6LowPAN", frag_data, &lowpan_frag_items, + "Reassembled 6LoWPAN", frag_data, &lowpan_frag_items, NULL, tree); pinfo->fragmented = save_fragmented; @@ -2491,7 +2491,7 @@ proto_register_6lowpan(void) { "Reassembled in", "6lowpan.reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL }}, { &hf_6lowpan_reassembled_length, - { "Reassembled 6LowPAN length", "6lowpan.reassembled.length", + { "Reassembled 6LoWPAN length", "6lowpan.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }} }; |