aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-02-07Qt: Add the Coloring Rules dialog.Gerald Combs19-151/+824
Merge in the old ColorDialog which was a placeholder for color_filter_add_cb. Change-Id: I48d188509f480b8514122b4011ac9d8790fcca10 Reviewed-on: https://code.wireshark.org/review/6996 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-06Qt: Fix preference change behavior.Gerald Combs5-41/+58
Main window: Keep track of our current layout and only change it if the preferences change. This keeps the panes from resizing. Re-select the current packet if the layout changes so that the proto tree and byte view aren't left in an invalid state. This fixes a crash similar to bug 10896. Search frame: Get rid of an invalid error message. Update coding style. I don't think any of these fix bug 10921 since Xiaochuan seems to get a crash immediately upon opening the dialog. Change-Id: I0e880a50d3c9ac1c6ae6a01034b05fd2249444f4 Reviewed-on: https://code.wireshark.org/review/6989 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-06qnet6: Fix a bug found by MSVC2013 Code Analysis.Bill Meier1-1/+3
wrongo: 2 * 2 + 4 * 5 + (khdr.msgtype & QNET_KIF_CRED) ? (4 * 4 + 4 * 7) : 0 Change-Id: I79117a34528642a81d0c80427a8e41d733bef10d Reviewed-on: https://code.wireshark.org/review/6995 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-06qnet6: CleanupBill Meier1-1977/+1797
- Remove some boilerplate comments; - Use a consistent indent style (gnu); - Use a consistent format for hf[] entries; - Whitespace; - Long lines; - Rename a generic macro; Change-Id: Ic2edcf8a8c0151d63a0d0ad901ddea9d7443ad19 Reviewed-on: https://code.wireshark.org/review/6994 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-06cfdp: Fix bug ("Labeled code is unreachable")Bill Meier1-1/+1
Found by MSVC2013 Code Analysis Change-Id: If8138ff3eab7daa1da728781314f8024e36545be Reviewed-on: https://code.wireshark.org/review/6992 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-06Further simplify the LSA-Update processing: the always-present forwarding blockJeff Morriss1-22/+12
can be considered TOS 0. Use similar logic in LSA-Summary processing. Ping-Bug: 6302 Change-Id: I0a74b95f6c4413ebce240e6e1b46c7e88311713a Reviewed-on: https://code.wireshark.org/review/6951 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-02-06Multicast Stream (GTK): fix crash when try to select a streamAlexis La Goutte1-1/+1
Change-Id: Iaaa9445ae99b37cfb1865251d50f38375f3eb272 Reviewed-on: https://code.wireshark.org/review/6985 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
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-06More emem removal.Jeff Morriss7-198/+0
Remove emem's 8-byte-memory-alignment configure check as well as references to all the environment variables emem used. Change-Id: I897aec9e9c68e064454561e7a9f066b18892ec66 Reviewed-on: https://code.wireshark.org/review/6950 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-06Remove gethostbyaddr and gethostbyaddr2.Gerald Combs10-44/+75
They've been deprecated for a very long time. Replace them with getaddrinfo. Note that we might not want to do synchronous name resolution at all. Add HAVE_GETADDRINFO to the KfW win-mac.h collision list. Change-Id: If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c Reviewed-on: https://code.wireshark.org/review/6958 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-06(Trivial) Reformat some.Jeff Morriss1-10/+30
Change-Id: I1bed28c33d1942b9d8ee8ef341d7017d2df21f37 Reviewed-on: https://code.wireshark.org/review/6977 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-06WSDG: Wrap a line.Gerald Combs1-1/+2
Change-Id: I21e573c3800a245cbdae4fcb4d4cfaf36f3a0abd Reviewed-on: https://code.wireshark.org/review/6976 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-05QNET6: do not use col_set_str with non constant stringsPascal Quantin1-1/+1
Change-Id: I63e965d819413299bf3e9a400b80ded23225598a Reviewed-on: https://code.wireshark.org/review/6975 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-05SEL Protocol Maintenance (2/2)cbontje1-363/+363
- Complete internal cleanup of 'fastser' -> 'fastmsg' syntax - Includes all variables, comments and filter values Change-Id: Ib58e470c9552387cb8c1d8c68fa1574cf7aa1691 Reviewed-on: https://code.wireshark.org/review/6974 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-05QNX6: avoid deferencing a null pointerPascal Quantin1-8/+9
Bug: 10920 Change-Id: Ibf3539c188431d2514c523c094d1e2d86b77f0b5 Reviewed-on: https://code.wireshark.org/review/6967 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-05The 'mbrtu' dissector should be registered with RTAC Serial, not the ↵cbontje1-1/+1
'modbus' one. (This error was missed by me when confirming recent changes to the RTAC serial dissector and fixes decoding of RTAC serial Modbus captures.) Change-Id: I2df609f88263e90ae4815722ff76b6a0b988a01e Reviewed-on: https://code.wireshark.org/review/6973 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-05Remove endif() left over from previous change.Guy Harris1-1/+0
Change-Id: Ia5781bcb55b2cf2e5ab2bc8c6587348ffe62a5c2 Reviewed-on: https://code.wireshark.org/review/6972 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-05Get rid of the temporary OS X-specific hack.Guy Harris1-8/+0
Hopefully Gerald's change will fix this annoyance once and for all. Change-Id: I547b221a670f1435fa86cb96b084cfa5b788c57f Reviewed-on: https://code.wireshark.org/review/6971 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-05WSDG: Fixup admonition block formatting.Gerald Combs1-15/+9
We tend to clobber the reader with admon blocks. Make the preceding and succeeding ones normal paragraphs. Change-Id: I0c70af93feb586d2e8f6120e2842fab52379b76f Reviewed-on: https://code.wireshark.org/review/6970 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-05CMake: Make copy_data_files depend on html_docs.Gerald Combs1-1/+2
Semi-blind attempt to fix what appears to be a race condition on the OS X x86 buildbot. Change-Id: I379c7dec26c2bca092d0c9a49465ee56a01d15ec Reviewed-on: https://code.wireshark.org/review/6969 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-05Update the Windows build documentation with some common traps that stop peopleRichard Sharpe1-2/+20
from building as well as a hint about downloading the vcredist_xYY.exe file. Change-Id: I6ae9a045939a77ba2c9584f05124fdc8f355f11c Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/6916 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-02-05CAPWAP: Fix a typo.AndersBroman1-1/+1
Change-Id: I19031eac4d26a5620dc05f2632c403d82d7a4ab2 Reviewed-on: https://code.wireshark.org/review/6966 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05MySQL: fix assert when the Connect Attrs capability is set, but no attributesAlexis La Goutte1-1/+1
From <http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse> (emphasis mine): Starting with MySQL 5.6.6 the client **may** send attributes if CLIENT_CONNECT_ATTRS is set: Does this mean that the capability *may* be set, but the list of attributes can be empty? Issue reported by Peter Wu Ping-Bug:10351 Change-Id: Ib83c27f4a15341f791c443471d7a3bdbd942aef4 Reviewed-on: https://code.wireshark.org/review/6965 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05ethercat: add default case in FoeFormatterEvan Huus1-0/+2
Should probably fix an unintialized memory access caught by valgrind, although I can't reproduce it because out-of-tree plugins are still broken. Bug: 10919 Change-Id: Ib8c46e13922f25260ca0e8886368f5ce24e3d0b0 Reviewed-on: https://code.wireshark.org/review/6962 Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05CAPWAP : fix warning about wrong type after ↵Alexis La Goutte1-3/+3
proto_tree_add_bitmask(_with_flags) change Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 1: proto.c:7802: field capwap.control.message_element.wtp_frame_tunnel_mode is not of an FT_{U}INTn type Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 2: proto.c:7802: field capwap.control.message_element.ac_descriptor.security is not of an FT_{U}INTn type ... Change-Id: I03f70ca664d99771ad27457052e6df11f9d5ad9e Reviewed-on: https://code.wireshark.org/review/6964 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05CAPWAP: Don't try to dissect fragment packet (Only display are "Data")Alexis La Goutte1-1/+2
Issue reported by Massimo Vellucci Bug:10918 Change-Id: I7f3b15536f66496d975696b3ff29fbc5b77ee5a8 Reviewed-on: https://code.wireshark.org/review/6963 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-05OK, try cmake -E copy.Guy Harris1-1/+1
It didn't fail with cp, so maybe that's just random luck, or maybe the built-in copy functions have an issue, or maybe just copy_if_different has an issue (64-bit inode number issues?). Try just copy, and see what happens. Change-Id: I84abf3846af9305c19ad4a78d5c9df31b1e1e61e Reviewed-on: https://code.wireshark.org/review/6961 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-04On OS X, temporarily use cp to install some files.Guy Harris1-0/+9
The 32-bit OS X build is failing rather often due to cmake -E copy_if_different failing to copy wireshark.html, and to call cmake's copy functions completely crappy at reporting errors is to insult software that's merely completely crappy at reporting errors. Try using cp in the hopes that it'll actually tell us *WHY* the copy is failing and see if we can fix it. Change-Id: I723150c52c2ec0fe704d54191ef27fb6caf47fba Reviewed-on: https://code.wireshark.org/review/6960 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-04LPP: upgrade dissector to v12.3.0Pascal Quantin6-544/+2741
Change-Id: Ibc2aa3127efcfbae33e6f3729d0e1e427db1c0fe Reviewed-on: https://code.wireshark.org/review/6959 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-04Don't clobber PROJECT_VERSION_EXTENSION.Gerald Combs1-1/+4
PROJECT_VERSION_EXTENSION was updated to match g528a857 config.nmake. Try to preserve it if it's set. Change-Id: I48edfcd149ef5adafff7ece68e0d43a9cdec0b59 Reviewed-on: https://code.wireshark.org/review/6957 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-041.99.2 → 1.99.3.Gerald Combs8-12/+12
Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638 Reviewed-on: https://code.wireshark.org/review/6956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04Build 1.99.2.Gerald Combs3-8089/+9655
Change-Id: If4a4fb9009da61bd67a8577f17c9e0dedcb6de6d Reviewed-on: https://code.wireshark.org/review/6955 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04Qt: Add "Copy As..." to the Protocol Hierarchy stats.Gerald Combs3-10/+144
This implementation is slightly different compared to other dialogs since we have nested items. Tweak the bar highlight color look better on Windows while we're here. Change-Id: If0607c4624f304042fe3d6c8a941756b342e703d Reviewed-on: https://code.wireshark.org/review/6953 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04Update the release notes.Gerald Combs1-0/+14
Change-Id: Id4fc195e54dba19f697d20d2085f2e1f922c8ced Reviewed-on: https://code.wireshark.org/review/6954 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-04Update README.wmem, release notes for emem removalEvan Huus2-25/+19
Change-Id: Iac5066ff97d26de1660c38b9cd3f17781a521823 Reviewed-on: https://code.wireshark.org/review/6949 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-02-04[INAP] Make INAP a new style dissector and add an OID dissector forAndersBroman2-8/+12
0.4.0.1.1.1.0.0 cs1-ssp-to-scp. Change-Id: Ib7261ef199d7a3aedaed14e7f869af8b64c21c92 Reviewed-on: https://code.wireshark.org/review/6948 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04[INAP] Add dissection of CauseAndersBroman3-7/+60
Ping-Bug:10910 Change-Id: I131d81b0d6332cc72e7b32dc81cb7fec4ca3d407 Reviewed-on: https://code.wireshark.org/review/6947 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04Support for P3 over RTSE.gal5-599/+675
Resolve mixed space/tab issue in the RTSE and BER dissectors and included modelines in both templates. Change-Id: I4b75bad94ed111d0faee205e026b2322b7dafbd1 Reviewed-on: https://code.wireshark.org/review/6932 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-04[CAMEL] Dissect additionalCallingPartyNumber.AndersBroman3-9/+65
Ping-Bug: 10914 Change-Id: I28eb9d7b5192a02f82fe604d20e57aedd706f528 Reviewed-on: https://code.wireshark.org/review/6946 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04[QNET6] Try to fix solaris buildboot.AndersBroman1-8/+2
/Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index' may be used uninitialized in this function /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index' was declared here /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index_off' may be used uninitialized in this function /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index_off' was declared here /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1500: warning: 'sstree' may be used uninitialized in this function /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1500: note: 'sstree' was declared here /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index_len' may be used uninitialized in this function /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index_len' was declared here Remove not needed includes. Change-Id: Iac91954b3d6c8f9799c6fe816af93376419d1b21 Reviewed-on: https://code.wireshark.org/review/6945 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04Use QNX_PC_ for QNX's pathconf parameter values.Guy Harris1-50/+50
The numerical values are platform-specific, so call them QNX_PC_; that also avoids collision with the values on the platform on which we're building Wireshark (such a collision broke the Solaris build). Change-Id: I04291eccb818a290eb44eadb17a56ed684285a70 Reviewed-on: https://code.wireshark.org/review/6944 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-04Add QNX' QNET protocolAlexis La Goutte3-0/+6196
no ethertype 0x8203-0x8205 support in trunk. 0x8204 is QNX OS VER 6's qnet ethernet protocol number. Bug:3934 Change-Id: I52555b568c3a304f1512fe25f949330b46f49a93 Reviewed-on: https://code.wireshark.org/review/6363 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-04HTTP2: Add tap for HTTP2 dissectorAlexis La Goutte6-0/+65
Change-Id: Ib13d9391b64dad19321a4399c95b95d7fb791284 Reviewed-on: https://code.wireshark.org/review/6421 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-02-04TOS-specific forwarding blocks aren't actually required: don't warn when theyJeff Morriss1-26/+23
aren't present. Only warn if no forwarding blocks are present. Simplify the code a bit while also removing a proto_tree_add_text(). (There are a number of similar proto_tree_add_texts()s here.) Hang the "no forwarding blocks" expert info off the LSA item rather than off the Metric. The warning is about how much data is in the LSA--it has nothing to do with the Metric. Ping-Bug: 6302 Change-Id: I1903ba5ad78101ec4fa2602a1f21e8192f1d8d53 Reviewed-on: https://code.wireshark.org/review/6943 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04RADIUS: Sync with FreeRADIUS MasterAlexis La Goutte5-0/+604
commit 852f15c72d41c637865776d5b80097e8ffbbb444 Author: Alan T. DeKok <aland@freeradius.org> Date: Mon Jan 26 13:08:21 2015 -0500 As found on the net commit 53bf263d6ca9010acdc004bada894b1bfe0ed676 Author: Tobias Hachmer <tobias@hachmer.de> Date: Mon Jan 26 13:45:04 2015 +0100 add perle dictionary Change-Id: I15dd8705277f3a0cedd2ea12a7cac9974dadf3c0 Reviewed-on: https://code.wireshark.org/review/6835 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04CAPWAP: Use proto_tree_add_bitmask(_with_flags)Alexis La Goutte1-88/+108
Change-Id: I39ff2e15b91981111f8de091e6e5dfb7586b4599 Reviewed-on: https://code.wireshark.org/review/6937 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04emem is dead! Long live wmem!Michael Mann12-1053/+1
Change-Id: Iddd1200e62bf3200cb1a68408378dd9d47120b77 Reviewed-on: https://code.wireshark.org/review/6939 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04Convert val_to_str -> val_to_str_wmem.Michael Mann27-162/+331
This is mostly for GUI usage, but a few dissectors needed some "non-packet scope" conversions. val_to_str officially now uses wmem_packet_scope() Change-Id: Ic9413eeb3406d7a7683222b86709f3675d628d81 Reviewed-on: https://code.wireshark.org/review/6933 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04MySQL: Add Server ext caps and Auth Plugin Length to Server GreetingAlexis La Goutte1-3/+23
Ping-Bug: 10346 Change-Id: I1b2bd3e9b1dc01118c48c6e159c9a06d4daa061b Reviewed-on: https://code.wireshark.org/review/6936 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 12:12:07 +0000