aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-amqp.c
AgeCommit message (Collapse)AuthorFilesLines
2016-06-27tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_stringMichael Mann1-125/+121
Also some other tricks to remove unnecessary tvb_get_string_enc calls. Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914 Reviewed-on: https://code.wireshark.org/review/16158 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-05AMQP: Fix false positiveAlexis La Goutte1-1/+1
ERROR: NO ARRAY: epan/dissectors/packet-amqp.c, ei_amqp_amqp_1_0_frame_length_exceeds_65K Missing a space after { (need fix check ?) Change-Id: Idce3b270c53feb7fc12e8c82fb87932faa1e468d Reviewed-on: https://code.wireshark.org/review/15728 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-05Fix expert_info errors found by new and improved checkhfs.pl.Michael Mann1-1/+3
Change-Id: I30f1b92ee438361c3bd58743f7d1ae8d5ffc96f0 Reviewed-on: https://code.wireshark.org/review/15718 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-28Fix some warnings/errors of typeJoerg Mayer1-6/+6
git/epan/dissectors/packet-a21.c:478:25: error: 'item' was marked unused but was used [-Werror,-Wused-but-marked-unused] proto_item_append_text(item, "%s", val_to_str_const(event_id, a21_event_vals, "Unknown")); ^ Added manual change id because file-jpeg.c forced the use of commit -n Change-Id: Iffff53d6253758c8454d9583f0a11f317c8390cb Fix warnings/errors of type: git/epan/dissectors/packet-ax25-kiss.c:205:52: error: 'pseudo_header' was marked unused but was used [-Werror,-Wused-but-marked-unused] return capture_ax25( pd, l_offset, len, cpinfo, pseudo_header ); Fix checkhf warnings: Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_address_netswitch Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_address_subswitch Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_poll_reply_trailer Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_rdm_universe Unused entry: epan/dissectors/packet-artnet.c, hf_artnet_tod_data_universe Change-Id: Id1fa12afb97a8e9cd4ed0ea25351c3b2639c930e Reviewed-on: https://code.wireshark.org/review/14667 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-02-28packet-amqp.c: Fix multiple fields with incompatible typesMichael Mann1-15/+15
Change-Id: I68b7fa0b5d7fae86289807d7ef01a2141dcb8ff6 Reviewed-on: https://code.wireshark.org/review/14059 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-25Move the proto data stuff out of frame_data.[ch].Guy Harris1-0/+1
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Add the packet number to the packet_info structure, and use it.Guy Harris1-2/+2
That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-08Fix a lot of typos and misspellingsmoshekaplan1-3/+3
Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3 Reviewed-on: https://code.wireshark.org/review/13069 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-31Don't cast away constness.Guy Harris1-3/+3
Change-Id: I8ca89bea19d7d014b81713455c85d2253f906058 Reviewed-on: https://code.wireshark.org/review/12971 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31Use wmem_strdup_printf().Guy Harris1-2/+1
Change-Id: Ifb9dd16ab4435c23ea2914e16a65a17f9c61c0cb Reviewed-on: https://code.wireshark.org/review/12970 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-09new_register_dissector -> register_dissector for dissector directory.Michael Mann1-1/+1
Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c Reviewed-on: https://code.wireshark.org/review/12485 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-07Create real dissector tables for SSL and DTLS to use.Michael Mann1-2/+2
Since ssl_dissector_[add|delete] only take TCP dissectors, remove the parameter and just use it within the "internal" ssl_association_add call. Change-Id: I0fdf941389934c20cbacf910250e17520614e706 Reviewed-on: https://code.wireshark.org/review/11591 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-07AMQP: Fix usage of p_(add|get)_proto_data.Petr Gotthard1-38/+29
The p_(add|get)_proto_data() functions are used to store data related to an AMQP frame. The stored information gets overwritten if there are multiple small AMQP frames in one TCP/IP packet. As suggested by Pascal and https://code.wireshark.org/review/#/c/10579/, we should use tvb_raw_offset as key for p_(add|get)_proto_data(). Change-Id: I860df8af51a6fbbef495985747313ae96402cc5c Reviewed-on: https://code.wireshark.org/review/10836 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-05AMQP: Fix warnings and the OSX 10.5 x86 buildPetr Gotthard1-3/+3
The AMQP channel number is 16-bit only. packet-amqp.c: In function 'dissect_amqp_0_9_method_channel_close': packet-amqp.c:8481: warning: cast to pointer from integer of different size packet-amqp.c: In function 'get_conversation_channel': packet-amqp.c:10512: warning: cast to pointer from integer of different size packet-amqp.c:10518: warning: cast to pointer from integer of different size Change-Id: I398ecfb19ecb7e741c2ed0675c1c625bf6a894f9 Reviewed-on: https://code.wireshark.org/review/10793 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-05AMQP: Navigation between publish/delivery and related ack/nackPetr Gotthard1-63/+339
This patch adds cross-references between publish/delivery and ack/nack frames. This improves user comfort when inspecting the traffic. Change-Id: I819b19474a3f0351eb769eadf3d32042cb5f5256 Reviewed-on: https://code.wireshark.org/review/10745 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-19AMQP 0-9-1: More expert informationPetr Gotthard1-6/+24
A little usability improvement: Warn user on connection and channel errors and when a message is undeliverable. Change-Id: I6106a63472b1fb5cbbabcf82a90af0f489030458 Reviewed-on: https://code.wireshark.org/review/10573 Reviewed-by: Michael Mann <mmann78@netscape.net> 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>
2015-08-16Fix the conversion of milliseconds to seconds and nanoseconds.Guy Harris1-1/+1
1 millisecond = 1000000 nanoseconds, not 1000 nanoseconds, and nstime->nsecs is nanoseconds, not microseconds. Change-Id: I6925ff80f6443015f83ca00bad2a347d10eadd7c Reviewed-on: https://code.wireshark.org/review/10060 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-16AMQP 1.0: Fix OSX build errorsPetr Gotthard1-2/+2
packet-amqp.c:10660: warning: implicit conversion shortens 64-bit value into a 32-bit value packet-amqp.c:10661: warning: implicit conversion shortens 64-bit value into a 32-bit value Change-Id: Ic1c19edf10432dccb5fc4f3ea07defd45b9eef17 Reviewed-on: https://code.wireshark.org/review/10054 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-16AMQP 1.0: Refactor to fix parsing of timestampsPetr Gotthard1-830/+497
Timestamps are currently dissected as integer numbers; two aspects need to be recatored to correctly dissect timestamps: - the add_1_0_proto_item() function - protocol fields (hf_xxx) and the get_amqp_1_0_value_formatter() (1) The AMQP 1.0 dissector rely on the proto_tree_add_item. There is only one invocation common for all datatypes (in add_1_0_proto_item), which cannot pass any type-specific ENC_xxx specifiers and it cannot handle custom datatypes like AMQP timestamp. I propose to replace the add_1_0_proto_item() by type-specific dissectors that will correctly set the ENC_xxx specifiers and handle exceptional cases like the AMQP timestamp or the zero-length true/false datatypes. (2) The get_amqp_1_0_value_formatter implements a table-driven magic to select alternate hf_xxx field based on the actual datatype. This however - defines alternate fields where the standard permits only one datatype - does not support fields that can contain any datatype ("*") - does not support FT_TIMESTAMP I propose to make this mechanism less table-driven (more explicit and more flexible) and allow all alternates permitted by the standard. Change-Id: Ib2cbda632d4c81ec3e6b81f539fe77bb913afc1c Reviewed-on: https://code.wireshark.org/review/9528 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-12AMQP 1.0: Fix dissection of UUID datatypesPetr Gotthard1-2/+3
Set a correct data length: 16-bytes, not 1-byte. And use the standard function to print the uuid. Change-Id: Ic4cc8d8de3f469e43664fbd7f6eb89083dc83be6 Reviewed-on: https://code.wireshark.org/review/8905 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-12AMQP 1.0: Don't treat decimal[32|64|128] as packet errorsPetr Gotthard1-1/+19
Packets with a decimal datatype should be correctly dissected. Yet, we still cannot display the decimal floating-point numbers as there is no support in printf and glib. Change-Id: I48a6dafd1e12ab55f660fad37a759dd16a9cf4b1 Reviewed-on: https://code.wireshark.org/review/8902 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-11AMQP 1.0: float/double should be in network byte orderPetr Gotthard1-2/+2
The standard says that (unless otherwise specified) AMQP uses network byte order for all numeric values. Change-Id: I3ca154a6fb882d9194a9af891f92f760aae776eb Reviewed-on: https://code.wireshark.org/review/8889 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-11AMQP 1.0: 'char' should be 4-bytes UTF32Petr Gotthard1-2/+3
Change-Id: I219b65fd989e1811eda9e2b7197148e6b22ef97a Reviewed-on: https://code.wireshark.org/review/8887 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-08AMQP: fix The 'format_name' variable is assigned to itself found by PVS ↵Alexis La Goutte1-1/+1
Studio (V570) Change-Id: I97cdfc20cc635bccea5c96db33f46cdd970e933a Reviewed-on: https://code.wireshark.org/review/8785 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Petr Gotthard <petr.gotthard@centrum.cz> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-03AMQP: Introduce support for AMQP over TLS/SSL (AMQPS).Petr Gotthard1-32/+44
Modified dissect_amqp to the new-style dissector. Added amqp.ssl.port to protocol preferences. Registered the AMQP dissector with SSL. Fixed an error in dissect_amqp that appeared when the first segment was smaller than the minimum header size required to determine the protocol version (8b). ...plus enhanced the AMQP 0-9-1 to display also the protocol id, so the packets list shows "0-9-1" instead "9-1". Change-Id: Ia44e0791b6ee78ad594de342c4f2401bad9beb4e Reviewed-on: https://code.wireshark.org/review/7044 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Petr Gotthard <petr.gotthard@centrum.cz> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-02-06AMQP: Fix one warning from Clang Code AnalysisPetr Gotthard1-1/+1
Since 'values' is always 'length/4', we can have it as 'gint' and avoid the Clang warning concerning the while cycle. >> cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations] Change-Id: I4342f9e3fcd5df7779f41414ab6f789fe402e3af Reviewed-on: https://code.wireshark.org/review/6979 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-06AMQP: Add more COL_INFO description for some packets/frames.Petr Gotthard1-61/+103
Change-Id: If70dc3972d99d34d8e37dd26045076e515fd4d2c Reviewed-on: https://code.wireshark.org/review/6968 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-03AMQP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-18/+0
Change-Id: Ie55dd06b6c4d6f77012e8e13079279ded2997907 Reviewed-on: https://code.wireshark.org/review/6920 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-02AMQP: fix declaration of 'index' shadows a global declarationAlexis La Goutte1-4/+4
St*** Mac OS X buildbot... Part 2 (Oups...) Change-Id: I082d73d4581365d7152aca764e4dfe599ce12c64 Reviewed-on: https://code.wireshark.org/review/6923 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-02AMQP: fix declaration of 'index' shadows a global declarationAlexis La Goutte1-1/+1
St*** Mac OS X buildbot... Change-Id: I5efff34ce818f52fb6414191c58b5cabb388ba26 Reviewed-on: https://code.wireshark.org/review/6922 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-02AMQP 0-9-1: Fix dissection of field types.Petr Gotthard1-210/+295
This patch resolves review comments I received from the AMQP 0-9-1 community. Some field types were not implemented, other field types (introduced by my earlier patch) were incorrectly parsed. https://groups.google.com/forum/#!topic/rabbitmq-users/PR7P1bgonwo I had to split the dissect_amqp_0_9_field_table() function into two parts and put the field value dissectors in a separate function: dissect_amqp_0_9_field_value(). Change-Id: I9aa7d73e426a790830ad260ca6892a7650791e6c Reviewed-on: https://code.wireshark.org/review/6882 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-01AMQP 0-9-1: Add missing methods connection.block and connection.unblock.Petr Gotthard1-0/+48
Change-Id: I11b32b876ec0f43b1faa2ab40ab66e7f18d981c2 Reviewed-on: https://code.wireshark.org/review/6857 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-28"%l[doux]" doesn't mean "64-bit integer".Guy Harris1-2/+2
Use G_GINT64_MODIFIER as the format modifier to indicate that the value being printed is 64-bit; there is no guarantee that long is 64-bit (it's not 64-bit on ILP32 platforms such as 32-bit Windows and 32-bit UN*X, or even on LLP64 platforms such as 64-bit Windows). Change-Id: I0444f7f396969824f1040c06a67753718c32881b Reviewed-on: https://code.wireshark.org/review/6838 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28Extended AMQP 0-9 dissector to support AMQP 0-9-1 methods and datatypes. ↵Petr Gotthard1-21/+335
Backward compatibility to AMQP 0-9 is maintained. Change-Id: Ie39cb40dca3d9f778ef2c04cbef24c968a91ec6c Reviewed-on: https://code.wireshark.org/review/6791 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-27Lua: Expose tcp_dissect_pdus() to LuaHadriel Kaplan1-7/+10
Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus() to make TCP-based dissection easier. Bug: 9851 Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3 Reviewed-on: https://code.wireshark.org/review/6778 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-23Correctly dissect the AMQP 0-9 heartbeat frames. The heartbeat frames werePetr Gotthard1-0/+5
incorrectly highlighted as erroneous. Change-Id: I94f8ef73e2432543ae3965da3789f27e872951ea Reviewed-on: https://code.wireshark.org/review/6685 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07tvb_bytes_to_ep_str -> tvb_bytes_to_strMichael Mann1-3/+3
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4 Reviewed-on: https://code.wireshark.org/review/6371 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-2/+0
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-10amqp: Misc changes;Bill Meier1-11/+22
- amqp_1_0_dissectiom: Use MIN(32-bit-length, 0xFFFF) as the length to dissect; The original code just used the low-order 16 bits of the 32-bit length field as the length to dissect. Add an expert warning if the actual PDU length is > 65K. - tvb_length() --> tvb_reported_length() Change-Id: I3230600f460a8bd495eeec17fa6e704bf24de1a2 Reviewed-on: https://code.wireshark.org/review/5225 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-07Don't forward-declare amqp_0_10_get_size_field(), as it no longer exists.Guy Harris1-3/+0
Change-Id: I796826bafd0768b610c9afbde8407fd9d3cc775e Reviewed-on: https://code.wireshark.org/review/5180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-07amqp: handle potential overflows when dissecting amqp_0_10 PDUs;Bill Meier1-160/+75
Bug: 10582 Change-Id: I2fbb16b9d641dfe872aed468f8b944f7ef274261 Reviewed-on: https://code.wireshark.org/review/5176 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-04amqp: Fix a number of bugs in dissect_amqp_0_10_map().Bill Meier1-25/+35
(Among other things: "2 ^ xxx" is *not* 2 to the xxx'th power). Change-Id: I893b72e853ecbb5d7e6259e950fb347e89eed6c2 Reviewed-on: https://code.wireshark.org/review/5109 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-19packet-amqp.c: Temporary/preliminary fix for Bug #10582 (crash)Bill Meier1-0/+10
This is a temporary/preliminary fix to prevent the buildbot fuzz-test failures seen when testing the capture file attached to Bug #10582. As noted in the bug, a complete fix will require some reworking of the amqp dissector. Change-Id: I2571f1eeb46a7eede04b8d809e87b95f1ff529df Reviewed-on: https://code.wireshark.org/review/4835 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-29Add editor modelines; fix indentation as needed.Bill Meier1-0/+13
Change-Id: I1ad94654343e5a018a0b3159481d45ffb3a91263 Reviewed-on: https://code.wireshark.org/review/4363 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-03Eliminate proto_tree_add_text from some dissectors.Michael Mann1-8/+22
Change-Id: Ib6024307e85d6c23decf40e9759f549c19ffe136 Reviewed-on: https://code.wireshark.org/review/3318 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22convert to proto_tree_add_subtree[_format]Michael Mann1-6/+1
Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df Reviewed-on: https://code.wireshark.org/review/2560 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Cleanup filter fields that checkdisplayfilter.pl was complaining about.Michael Mann1-141/+141
Cleaned up filter names that were shared, but had different types (which can cause problems in a display filter compare) Also cleaned up many [FIELDDESCR] that effectively mimicked the field name. Even more could probably be done (and/or rename field name to be more descriptive), but I was being conservative. Change-Id: I2e072b4f411c390b9430a0a0d903133d6decae5e Reviewed-on: https://code.wireshark.org/review/2448 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-3/+3
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-3/+3
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-30Add AMQP listening port option to preferencesPavel Moravec1-3/+28
Change-Id: Ief46b7b53ddecd649e54d3c23a3504c4165c812f Reviewed-on: https://code.wireshark.org/review/1855 Reviewed-by: Michael Mann <mmann78@netscape.net>