aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-10-28Use guint8 for 8-bit unsigned numeric values.Guy Harris2-3/+6
That slightly better expresses the intent. Also, fix the message printed for bad bytes in a field name to handle bytes that are bad because they don't correspond to printable ASCII characters. Change-Id: I01f232c35bbbe30286999b6c607bfcf3d491453d Reviewed-on: https://code.wireshark.org/review/4976 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-28Use g_ascii_isalnum() rather than isalnum().Guy Harris1-2/+1
Only *ASCII* alphanumerics are allowed in filterable field names, so use g_ascii_isalnum() to check for them. That avoids issues with characters with the 8th bit set and avoids locale-dependent behavior. Change-Id: I4e3c4eec907f5e576629229fcf154fcf728b7a2e Reviewed-on: https://code.wireshark.org/review/4973 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-28Add some new features to the list and regenerate NEWS.Jeff Morriss2-80/+87
Change-Id: I8d0897e63b44c8077b7488b8c8b7a3df0adf37a1 Reviewed-on: https://code.wireshark.org/review/4971 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28Add GPLv2+ license header to keep license-check happy.Jeff Morriss1-0/+20
This change must be reviewed/approved by the script's author (Gerald). Change-Id: Id89c1d05bf43cdd2d6823b5ef46162a9f11fb263 Reviewed-on: https://code.wireshark.org/review/4972 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28Pref: Remove unsued functionAlexis La Goutte1-0/+2
Fix also warning: no previous prototype for 'prefs_get_uint_preference' [-Wmissing-prototypes] Change-Id: I4626372a9c131584c515a43e73aa019e2f696d29 Reviewed-on: https://code.wireshark.org/review/4960 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28Patch for KNXnet/IP dissectoralage1-90/+176
-removed some proto_tree_add_bits_itemand used bitmaks instead -fixed KNX Groupaddress decoding -improved apci decoding -filternames changed Change-Id: I2593d54c5e94141445e9e8f32204848e9f48ff6a Reviewed-on: https://code.wireshark.org/review/4874 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28Add a comment showing mapping to radiotap.Guy Harris1-0/+55
Useful if we try to provide some "standard" 802.11 metadata header that can support both radiotap and Peek tagged (and perhaps others). Change-Id: Ibac9829e3411670a439db7cb77e1694a5641b0a5 Reviewed-on: https://code.wireshark.org/review/4970 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-28Refactor pinfo->circuit_id from H.223 dissector.Michael Mann7-57/+129
Change-Id: Id63e0088047c7948fd190ba4dd5fbcb536e0cc6b Reviewed-on: https://code.wireshark.org/review/4921 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28DNS NXT RR is parsed incorrectlyAlexis La Goutte1-1/+28
The queries RRs and answers RRs are parsed fine. However, only the first 2 authoritative RRs are parsed and none of the 3 additional RRs are parsed. The second authoritative RR is of type NXT, and even though it has data length of 9, Wireshark reads all the bytes until the end of the packet as if they are part of bitmap in this RR (it reads 317 bytes too many). This causes it to not parse the rest of the RRs correctly. Found by boaz Bug:10615 Change-Id: I22e5987c44a11399b07c3106fbb70c6e9e867afe Reviewed-on: https://code.wireshark.org/review/4940 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>
2014-10-28ISIS: Display code/type and length for unknown code/typeAlexis La Goutte1-9/+4
Change-Id: Idb70d571ae7d7f5fc87c08012ab380d35b2856a0 Reviewed-on: https://code.wireshark.org/review/4961 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28HPSW: Fix display of wrong lengthAlexis La Goutte1-1/+1
Change-Id: Iaa0cff55b4f8bbdd50eec665c134a2f21e21f9d4 Reviewed-on: https://code.wireshark.org/review/4951 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28Some additional information from bug 10637.Guy Harris1-9/+45
That bug includes a capture and a screendump of OmniPeek's dissection of the packet in that capture; this lets us identify some tags as the center frequency of the 802.11 channel and a set of extended flags used for 802.11n and 802.11ac. Show some flags from bug 9586, under the assumption that certain fields in the Peek tagged header correspond to certain fields in the remote Peek protocol. Change-Id: I0f3c2e6638d6cf5f6ec470d65bd574171a2d958d Reviewed-on: https://code.wireshark.org/review/4969 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-28Bug 9586 says bit 0x00000100 in the "802.11n flags" means "802.11ac".Guy Harris1-48/+54
Also, the 0x00000100 flag is "MCS index used", if a dissection of an 802.11n frame by OmniPeek is to be believed and if the "802.11n flags" have the same meaning in Peek tagged files and in the Peek remote protocol. Rename that field to "extended flags", as it's not just for 802.11n, add the "802.11ac" flag, and rename the "future use" flag. Change-Id: I605622801450d5d114c3c971c98960b198346bdd Reviewed-on: https://code.wireshark.org/review/4968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-28MAUSB: fix warning: no previous prototype for 'proto_register_wfa_oui' ↵Alexis La Goutte1-0/+1
[-Wmissing-prototypes] Change-Id: I86cc9f6f9cd50a6e081aabc10bce077281eb2d76 Reviewed-on: https://code.wireshark.org/review/4959 Reviewed-by: Sean Stalley <seanstalley@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28Try to fix dist.Gerald Combs1-9/+35
Change-Id: I1802fd4e53132e76534b6dadbaa9713249af42e5 Reviewed-on: https://code.wireshark.org/review/4966 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-28The "data rate" field in the 11n version of the header is an MCS index.Guy Harris1-6/+15
Change-Id: I5f23bec128444b6590b5fc938bbe0e8a679cd31b Reviewed-on: https://code.wireshark.org/review/4965 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-28HPSW: Fix soft-deprecated APIs warningAlexis La Goutte1-1/+1
Change-Id: I2f69781972fe2737e09d275dc842c4ea744e7fb1 Reviewed-on: https://code.wireshark.org/review/4952 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-28Knxnetip: fix warning: ISO C does not allow extra ';' outside of a functionAlexis La Goutte1-13/+13
Change-Id: I43da305fcf7b8a18699ab1c14ba2b7868aa8897b Reviewed-on: https://code.wireshark.org/review/4958 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-28Infiniband: fix warning: C++ style comments are not allowed in ISO C90Alexis La Goutte1-1/+1
Change-Id: I706d6b7cf4c8d0367f485b55fa11a905bff426d1 Reviewed-on: https://code.wireshark.org/review/4957 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-28Couchbase: fix no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+3
Change-Id: Ieaefb9d50bf0224f4e90585d138867d0b88d5814 Reviewed-on: https://code.wireshark.org/review/4956 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-28AllJoyn: fix warning: no previous prototype for 'add_padding_item' ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: Id18ac125390efa22638845083f7d0d5eaf71cb97 Reviewed-on: https://code.wireshark.org/review/4955 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-28TN5250: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: Ida9f7198d6e3ef7bab5d787883116600019180ec Reviewed-on: https://code.wireshark.org/review/4963 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-28ADB_cs: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I88e191c9eaf5f81b3d6d905ec9e7b7d27f0d21a3 Reviewed-on: https://code.wireshark.org/review/4962 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-28Qt: Add a set of 2x 24-pixel toolbar icons.Gerald Combs38-23/+714
Add a script to create each PNG from its source SVG using Inkscape (which can conveniently be run from the command line). Change-Id: Ief7410cf76fb1553ce56f1c6bc1ade03ab5db1d6 Reviewed-on: https://code.wireshark.org/review/4964 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-27Qt: Add bits display support to the byte view.Gerald Combs2-5/+52
Add todo items for showing and hiding the offset, hex/bits, and ASCII/EBCDIC sections and adding UTF-8 support. Change-Id: Ia40faf3f939ef1a8fca6fac827057bd89045482a Reviewed-on: https://code.wireshark.org/review/4949 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-27Add enumerated value 639 to vals_parm_PID.Michael Mann1-0/+1
Per http://www.nowsms.com/discus/messages/1/EMI_UCP_Specification_40-8156.pdf Bug: 10463 Change-Id: I55957f7b77b3dcf8c65c288791fed6428a1f4ba5 Reviewed-on: https://code.wireshark.org/review/4944 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-27Qt: ByteViewText hover information.Gerald Combs10-51/+131
When the user hovers over a byte view field, highlight it and show a description in the status bar. Add a "byte" status bar context and fix a label stack pop bug. Keep proto_find_field_from_offset from matching generated items. Otherwise hovering and selecting finds things like GeoIP entries and checksum validation information. This affects the GTK+ UI as well. Change-Id: Ic81c0d8159510a72d30c41f961807d8a48d05e16 Reviewed-on: https://code.wireshark.org/review/4943 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-26SSL 3.0 and TLS ciphersuite values are two bytes longMartin Kaiser1-1/+1
Change-Id: I3ea2846fd4273efe654358ad4a317cb9b3670181 Reviewed-on: https://code.wireshark.org/review/4942 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-26add TLS_FALLBACK_SCSVMartin Kaiser1-1/+2
Change-Id: I02ef08b6726f935d79cd3ca4f10ead5f1d18ee20 Reviewed-on: https://code.wireshark.org/review/4941 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-26[Automatic manuf, services and enterprise-numbers update for 2014-10-26]Gerald Combs3-4/+186
Change-Id: If2287edfd2a5b1ddcb6e365485020805aaf9cd88 Reviewed-on: https://code.wireshark.org/review/4937 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-26Various Mobile IPv6 bugfixesMichael Mann1-28/+42
Most of this was found by Boaz Brickner, but to prevent a few more bug reports, I tried to find any remaining MIPv6 options that used -1 to read until "end of packet" instead of "end of option" 1. Option-Code and Reserved fields should be 1 byte, not 2 in Local Mobility Anchor Address mobility option 2. IPv6 AUTH mobility option parses Mobility SPI 3. IPv6 MESG-ID (should just be a timestamp field) 4. IPv6 Redirect Mobility Option K and N bits are parsed incorrectly 5. The following options had a field that read until the end of the packet instead of the end of the option: DNS-UPDATE-TYPE AUTH Authentication Data Care Of Test Permanent Home Keygen Token CGA Parameters Signature Experimental Mobility Option Bug: 10630 Bug: 10629 Bug: 10626 Bug: 10625 Bug: 10624 Bug: 10622 Bug: 10619 Change-Id: I14c984a237efc1d1a09618d9a4a1caef1eaf8df0 Reviewed-on: https://code.wireshark.org/review/4932 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-10-26Use Wifi Alliance OUI for MA USB packets over SNAPSean O. Stalley2-7/+7
Change-Id: Icf4c995c8fbdb886e8b4e79a1fc7b62ac7137a07 Reviewed-on: https://code.wireshark.org/review/4667 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>
2014-10-26Use better theme-derived colors. Switch back to AlternateBase forGerald Combs3-12/+6
protocol-level highlighting. Change-Id: I3de3442885b93093c3a4f5341080713a2039cd4c Reviewed-on: https://code.wireshark.org/review/4933 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-26Added support for AllJoyn Reliable Datagram Protocol.Joseph Huffman1-40/+488
Change-Id: I3ec37d7aec0c51f9bd0791c8fa0c5ef3dabc9fbf Signed-off-by: Joseph Huffman <jhuffman@qce.qualcomm.com> Reviewed-on: https://code.wireshark.org/review/4414 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>
2014-10-25Expand comments.Guy Harris1-6/+52
Change-Id: I92348f98cd04ff0e7fc05e472075315ca0fd260e Reviewed-on: https://code.wireshark.org/review/4931 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-25Get rid of a trailing blank.Guy Harris1-1/+1
Change-Id: I7963f05a78ec764a21d388fcdba618ffbcf935e4 Reviewed-on: https://code.wireshark.org/review/4930 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-25Update a comment.Guy Harris1-7/+6
Change-Id: I55002477a416710592a482725af68cdf2511e063 Reviewed-on: https://code.wireshark.org/review/4929 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-25More offset color adjustments.Gerald Combs1-4/+5
Change-Id: I52cf406443988624fb0e4a9e180963c599c8b91d Reviewed-on: https://code.wireshark.org/review/4928 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-25Qt: ByteViewText fixups.Gerald Combs4-28/+70
Calculate our X coordinate using floating point arithmetic. This should hopefully fix the wierd subpixel text shifting for some font sizes. Add alpha blending convenience routines to ColorUtils. Use them to create the offset colors. The button color palette wasn't working very well under Ubuntu. Use QFontMetricsF::lineSpacing for our line height. Note that we don't support the BOLD gui.hex_dump_highlight_style preference. Leave a hint for anyone wishing to do so. Comment out related code for now. Change-Id: Ief77c9c8d00e05560cae6ecd781bd309027f6f5a Reviewed-on: https://code.wireshark.org/review/4927 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-25ncp2222: initialize buffer in build_expert_dataEvan Huus1-0/+1
We do a bunch of conditional logic to fill in the buffer, and then were checking strlen(buffer) to see if we'd actually filled it in or not, but if we hadn't then the buffer was garbage and strlen(buffer) was throwing valgrind warnings. Ensure this works as intended by setting the first byte of the buffer unconditionally at the beginning, so strlen(buffer) returns 0 as expected in that case. Bug: 10628 Change-Id: I6f6c29fbbcb601b6ebccb3a4b312f0fa72c169ae Reviewed-on: https://code.wireshark.org/review/4924 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-25Italian translation fixesDario Lombardo2-385/+648
Change-Id: I1dec07f6a3e721a4f35c8cde2da136e34d8e4cb2 Reviewed-on: https://code.wireshark.org/review/4915 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-24Qt: Refactor ByteViewText.Gerald Combs5-295/+331
Instead of subclassing QTextEdit and filling it with the entire contents of our tvbuff, subclass QAbstractScrollArea and draw text by hand only when needed. The new code should be *much* faster. Some code based on QHexView by Even Teran (https://code.google.com/p/qhexview/). To do: - Finish the bit view implementation. Change-Id: Ie44de6870d80711cd44324521a17ab76bcefe5e5 Reviewed-on: https://code.wireshark.org/review/4922 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-23ESP: honor enable_null_encryption_decode_heuristic preference when the ESP ↵Pascal Quantin1-594/+585
packet does not match any known SA Otherwise checking the enable_encryption_decode preference will completely ignore enable_null_encryption_decode_heuristic Change-Id: I34744ddb2080453dab7cd7d34f47b4984969993c Reviewed-on: https://code.wireshark.org/review/4897 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>
2014-10-23Add a "placeholder protocol" for H.223 to avoid confusion when using Decode As.Michael Mann1-1/+5
The Decode As dialog presents two H.223 options and only "trial and error" can determine if you want bitswapping or not. Change-Id: I9303c73375d130d3097d347bb374019dfc714068 Reviewed-on: https://code.wireshark.org/review/4909 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-23OS X: Integrate CMake and osx-app.shGerald Combs3-197/+259
Add a -cb/--create-bundle option to osx-app.sh which builds the application bundle. Use it in Autotools. (CMake does this by default.) Copy over linker flags from configure.ac to CMakeLists.txt to support rpathification and code signing. Add an osx-app custom target to CMake. Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803 Reviewed-on: https://code.wireshark.org/review/4918 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-23Don't free global_capture_opts.ifaces_err_info.Guy Harris1-1/+1
Leave it around in case InterfaceTree::display() gets invoked without an intervening call to scan_local_interfaces() (that would cause a double-free) or in case scan_local_interfaces() gets called afterwards (as it frees global_capture_opts.ifaces_err_info before setting it again, so there's no leak there, but there would be a double-free). This should prevent at least one crash I've seen. Change-Id: Iedd3959b420c09971557c473cc87aefd4454078c Reviewed-on: https://code.wireshark.org/review/4917 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-22Lua: Added support for FT_EUI64.Stig Bjørlykke1-1/+12
Bug: 10603 Change-Id: I21da496834b83466585f5b77f87970e3fab28b12 Reviewed-on: https://code.wireshark.org/review/4894 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-22Couchbase: fix some warnings found by the pre-commit hookPascal Quantin1-5/+1
Change-Id: I16c8f5690973465728071abdf85c0f275433951e Reviewed-on: https://code.wireshark.org/review/4913 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-22Qt: Show / hide main widgets.Gerald Combs4-75/+171
Remove existing code which uses the visibilityChanged signal. It exists in QToolbar but not QWidget. Use the actions to drive visibility instead. Update MainWindow::layoutPanes to respect "recent" settings. Move the show / hide actions to the top of the View menu to match GTK+. Change-Id: I670682e2a094945dbd36c80f43cd14515bbca5a6 Reviewed-on: https://code.wireshark.org/review/4911 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-22Couchbase: fix FSF address and reorder opcode_vals arrayPascal Quantin1-14/+14
Change-Id: I41448f9a111dde24c29984d8e4f053fc2a668c9e Reviewed-on: https://code.wireshark.org/review/4912 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>