aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-01-07S5066DTS: Nesting level does not match indendation (CID 1159211 & 1159212)Alexis La Goutte1-2/+4
Change-Id: I8145696de995e821793e7bc1576d5a5673c7b503 Reviewed-on: https://code.wireshark.org/review/6377 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07BTLE: Nesting level does not match indendation (CID 1261651)Alexis La Goutte1-2/+2
Change-Id: I11e436ca91c766edc8e85fd2402e61a17465bee2 Reviewed-on: https://code.wireshark.org/review/6373 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07tvb_bytes_to_ep_str -> tvb_bytes_to_strMichael Mann64-128/+107
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>
2015-01-07Replace bytes_to_ep_str_punct with wmem equivalent.Michael Mann7-80/+63
Change-Id: I8aa7d7374db94685fd875cbf358c3bfbc83f3255 Reviewed-on: https://code.wireshark.org/review/6370 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punctMichael Mann15-42/+48
Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size) Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e Reviewed-on: https://code.wireshark.org/review/6369 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07Remove bytestring_to_ep_strMichael Mann5-42/+8
Use wmem equivalent bytestring_to_str Change-Id: I1ec7509e3adb36ab0f65317459653cb3b4b11af8 Reviewed-on: https://code.wireshark.org/review/6368 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07Updates in it translation.Dario Lombardo2-1181/+1813
Change-Id: I3a7b71daa6e4e69ef9cc6dcb777851a8643d6684 Reviewed-on: https://code.wireshark.org/review/6367 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07[MIP6] Update to handling ofAndersBroman1-17/+3
Mobility Header Link-Layer Address (MH-LLA) Option to RFC 5268 e.g no special handling of length. Bug:10043 Change-Id: Id32789fa5e34766c5734b0be13af015473ac257c Reviewed-on: https://code.wireshark.org/review/6372 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07simplify tvb_address_to_strEvan Huus1-17/+11
deduplicate most of the tvb_get_ptr calls Change-Id: Ic95b1d545bfebf58fc64a81f816c47d63e5ddcd0 Reviewed-on: https://code.wireshark.org/review/6366 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-07MSVC: Fix opting out of librariesOrgad Shaneh2-16/+3
When *_DIR variables are defined (even if empty), nmake tries to build them and fails. Don't set them at all if not configured to. Change-Id: I3825c16f26e45a1a3fc489633084a074838f8c34 Reviewed-on: https://code.wireshark.org/review/6365 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-07Use tvb_address_to_str as an optimizationMichael Mann2-16/+4
Change-Id: Ic79d8bdc58b84087531b298b3b27273c1afccd4f Reviewed-on: https://code.wireshark.org/review/6357 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-01-07SET_ADDRESS -> TVB_SET_ADDRESS to "hide" some of the tvb_get_ptr use.Michael Mann17-397/+267
Not all changes were able to remove their corresponding tvb_get_ptr, because there are other API dependent on the (tvb_get)pointer, but future iterations optimizing those other APIs will then be able to remove it. Change-Id: Id7cefd440b81834de1d1aace7cd0789b1c871a22 Reviewed-on: https://code.wireshark.org/review/6358 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-01-07DJIUAV: small cleanupsPascal Quantin1-8/+12
- fix some typos - remove a useless include - change an obsolete API - comment unused hf entries for now Change-Id: I5939bc2fe9ddc6c422f35423aa22e884f20f088d Reviewed-on: https://code.wireshark.org/review/6349 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: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-07Don't run checkapi on .rc files.Guy Harris1-0/+3
Change-Id: I75879bfcd0d9706523447146b16c319d3eb56d23 Reviewed-on: https://code.wireshark.org/review/6361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07SMB: the "encryption key" in the negotiate response is not really a keyMartin Kaiser1-27/+27
but the data for the Challenge/Response authentication (at least, that's my understanding of http://msdn.microsoft.com/en-us/library/ee441946.aspx) rename the items and filter strings accordingly Bug: 10777 Change-Id: I38378f0b31252d7bc8ec5e8ad7cee81a1a48cb4d Reviewed-on: https://code.wireshark.org/review/6137 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07Cast away an insignificant warning.Guy Harris1-1/+1
Change-Id: Ifd74719ced4d1ff99a2a913ad6a6797d3e80b311 Reviewed-on: https://code.wireshark.org/review/6359 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07Fix compiler error because I didn't completely amend last patch.Michael Mann1-12/+1
Change-Id: I7b8ffc4a63e69b5f50666dc1cf3482ae20124c0f Reviewed-on: https://code.wireshark.org/review/6356 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07Add tvb_address_to_str.Michael Mann7-92/+139
This is intended to handle ALL address types retrieved from a tvbuff. One of the (good) side effects of this function is that it can replace a lot of the "hidden" ep_alloc calls used to allocate memory for the address string. A few existing "popular" helper tvb_ functions were turned into pure macros calling tvb_address_to_str. Some of the "less used" helper tvb_ functions were just directly replaced with tvb_address_to_str. Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43 Reviewed-on: https://code.wireshark.org/review/6333 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07Improved handling of ARDP fragmented packets.Joseph Huffman1-19/+66
With the AllJoyn Reliable Datagram Protocol large packets are fragmented in a way that Wireshark doesn't desegment. The AllJoyn dissector now detects this situation and reports things to the user in a manner which indicates things are behaving normally rather than an error condition. Change-Id: I1f2aa722b6e0d1ed3572ff332b4dd8c0e5c5a765 Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org> Reviewed-on: https://code.wireshark.org/review/6344 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-01-06Fix GCC pragma.Gerald Combs1-6/+2
Fix "error: #pragma GCC diagnostic not allowed inside functions". Change-Id: Iaa7e39ac46975f00bc337b97875ba8b77295064a Reviewed-on: https://code.wireshark.org/review/6355 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06checkAPIs: C++ comments are allowed in Windows resource files.Gerald Combs1-1/+7
Change-Id: I3885278bf293b1fd7db812ce265734bcdc904c6f Reviewed-on: https://code.wireshark.org/review/6354 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06Try to suppress clang warnings in exntest.Gerald Combs1-1/+8
Nested TRYs result in: warning: declaration shadows a local variable Change-Id: Ifaa7baebde0ea4c18be5a53ab7e7964e84716496 Reviewed-on: https://code.wireshark.org/review/6347 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-01-06MBIM: call dissector_(add|delete)_uint only when necessaryPascal Quantin1-6/+9
Change-Id: I12bbe9e1d81560f1874d4e575b19db1842fa0c72 Reviewed-on: https://code.wireshark.org/review/6352 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-06NSIS: Quote all paths in config.nsh.Gerald Combs3-19/+21
Fix the MAKEDIR substitution. Add config.nsh to .gitignore. Change-Id: I9c5f6469569e826e4a8036b9b1b483c16558f788 Reviewed-on: https://code.wireshark.org/review/6351 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06NetFlow: Add Ixia 'IxFlow' fields and make some general usability improvementsMartin Mathieson2-36/+532
- Sequence number analysis using flow sequence within an observation domain. - Link back from data set to template frame, if have seen - Show more information (observation domain ID, set ID, etc) in Info column and protocol roots - Look up protocol field from ip_proto Change-Id: I3147387a3cd0d1fc33b879b3ba226753ed2cd8dd Reviewed-on: https://code.wireshark.org/review/6331 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06$(MSVCR_DLL) might contain spaces, so we need to quote that sed expression.Guy Harris1-1/+1
Change-Id: Ia3aca07a5aa8adcc99d17fa559662d79659f46ca Reviewed-on: https://code.wireshark.org/review/6348 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-06NSIS: Move definitions to their own file.Gerald Combs4-90/+195
Convert the pile-o-makensis-flags to a pile-o-sed-commands which creates a "config.nsh" file. This should hopefully make it easier to port the "packaging" target to CMake. Change-Id: I439fea5721c5b209a753044a8e9e8ac6fc5291c3 Reviewed-on: https://code.wireshark.org/review/6345 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06CMake: Add an ENABLE_CODE_ANALYSIS option.Gerald Combs2-0/+6
Currently Visual Studio-only. Enabling it adds /analyze:WX- to LOCAL_CFLAGS, similar to config.nmake. Change-Id: Ida68831e85f5f04b9f84faa95a39fed24e5f490d Reviewed-on: https://code.wireshark.org/review/6346 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06DJI UAV: Add dissector to autotools and add modelines infoAlexis La Goutte2-0/+14
Change-Id: I2a312af906ddf01ff05083a657f474a921ab95a3 Reviewed-on: https://code.wireshark.org/review/6337 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-01-06Revert e65f581ffa86f6bfd566a9b66ca2c882f465727f, whichJoerg Mayer2-0/+6
reverts commit 89291ad4f3293893387b385a0800cad42215ddd4 Protect the new macro with "m4_ifdef" instead. Add comments to keep the old and the new flags in sync. Change-Id: I37dea1a5c8d743f5dcf4a4d9ff38ff92200271d0 Reviewed-on: https://code.wireshark.org/review/6343 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-06DNS: fix no previous prototype for 'qname_labels_count' [-Wmissing-prototypes]Alexis La Goutte1-1/+1
Change-Id: I2c5b662f6b46d60a97a491ca8ec01b3f0e41fa56 Reviewed-on: https://code.wireshark.org/review/6338 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-06Qt: Add a context menu to the packet list header.Gerald Combs21-37/+667
Don't carry over the sort items from the GTK+ UI (for now, at least). Update some names. Add a column editor frame similar to the "Go to Packet" and "Search" frames. Change-Id: I1bd3834a26994de96894d2b7512bce2c19915c77 Reviewed-on: https://code.wireshark.org/review/6277 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06p_mul: Indicate if fletcher algorithm is used.Stig Bjørlykke1-2/+9
The first version of ACP 142 uses the fletcher algorithm for checksum. Indicate if this (now old variant) checksum is used. Change-Id: Id6f3e7ecfcde022b339bdb956cd6f642a917076a Reviewed-on: https://code.wireshark.org/review/6342 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06s5066ses: Fixed some missing sapid mappings.Stig Bjørlykke1-2/+2
The previous s5066ses commit added sapid value strings but missed updating PDU type 21 and 25. Change-Id: I5cd4dba14eacdf2f590490a95b0cc62b04193b9e Reviewed-on: https://code.wireshark.org/review/6341 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06s5066sis: Consume transport layer data in S5066sisRicardo Cristian Ramirez5-459/+634
S5066 spec describes a transport layer for some clients like Acp 142 and DMP but not for all of them. Since RCOP/UDOP header definition are given in S'5066 specification, consuming these header bytes in S'5066 SIS dissector may be appropriate Bug: 10827 Change-Id: Iffdf5d567e1a417ccbafdac919f5a5200159d31b Reviewed-on: https://code.wireshark.org/review/6292 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-01-06Replace ep_address_to_str with address_to_str.Michael Mann39-165/+287
Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b Reviewed-on: https://code.wireshark.org/review/6323 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-01-06[PROFINET] v2: Fix swapped MaintenanceRequired & MaintenanceDemanded bitsAnish Bhatt1-2/+5
Fix the correct code path this time. Bug: 10753 Change-Id: I7bc2e74c91868986303e8b41b25e43a665be1860 Reviewed-on: https://code.wireshark.org/review/6335 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06Revert "[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits"Anish Bhatt1-8/+8
This reverts commit 0452f763fb0dd2cf7e38f0a127c306199a814c3e. Changes should have been made in ChannelProperties instead of Submodule state. Current implementation merely *appears* to be correct as we are reading it as a two bit value but instead should be addressing it as individual bits, little endian Bug: 10753 Change-Id: Ia3bd088aeb376b8511d64352f62c4304e4129ba6 Reviewed-on: https://code.wireshark.org/review/6334 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-05Minor CMake updates to better group build artefactsGraham Bloice6-8/+14
Move capchild, caputils, codecs and wsutil into a Libs group Move gtkui into UI group Move update-sminmpec into tools group Change-Id: Iaf2bfe4697265af2c3ed9c9d7de2d5d1ef3cafee Reviewed-on: https://code.wireshark.org/review/6332 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-05Squelch harmless compiler warnings.Guy Harris1-3/+3
(Yes, we know, we're casting 16-bit integers to pointers. That's because various generic maps need to be able to take arbitrary values as keys, and sometimes the arbitrary values aren't structures to which we point, but just integral values, and that's why GUINT_TO_POINTER() exists, but it doesn't do enough casting to suppress harmless warnings.) Change-Id: I1a9c68b4b1007f0a38017ba3570b94efb0b6845a Reviewed-on: https://code.wireshark.org/review/6329 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05Beginnings of dissection of the dji drones control protocol.Joerg Mayer2-0/+390
Change-Id: Ifda0b97df7e25b535a5010f25c8e8e1af83cb532 Reviewed-on: https://code.wireshark.org/review/6328 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-05Override optimization and other flags for make based generators.Joerg Mayer1-0/+7
Before this patch it was not possible to override e.g. the optimization or debug flags in case the build type was set. Change-Id: I53bfddd27f87ad5482227f786af8c4728c5774fc Reviewed-on: https://code.wireshark.org/review/6327 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-01-05Attempt to fix "make distcheck" on Ubuntu buildbotStephen Fisher1-2/+2
Change-Id: I6e7ea1e2aaf839fdb3af8a3a5a47aabbb12056ef Reviewed-on: https://code.wireshark.org/review/6326 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-05Get rid of some GNU make extensions so users can build withStephen Fisher2-2/+2
the make that comes with *BSD and other systems now. Change-Id: Ib2eee8d37e7029202675bac35839b1c0d5fc5131 Reviewed-on: https://code.wireshark.org/review/6320 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-05Replace ep_display_to_address with wmem equivalent display_to_address.Michael Mann30-171/+273
Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI. Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9 Reviewed-on: https://code.wireshark.org/review/6318 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-05Wimax: fix no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte3-1/+3
Change-Id: I1dac7d362bab680c313766de19d51132d1ce6dfa Reviewed-on: https://code.wireshark.org/review/6298 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-01-05OSITP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-4/+0
Change-Id: Ied8e931541e8e570ef32376eec61779a32bbd493 Reviewed-on: https://code.wireshark.org/review/6322 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05SMTP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+0
Change-Id: I234b9dad79e3327637f8cdcd406a49f9e7435f33 Reviewed-on: https://code.wireshark.org/review/6321 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05Update to QCustomPlot 1.3.0Alexis La Goutte2-932/+3258
Reapply remove trailing whitespace and some spelling fixes Fix also a not ASCII caracter in qcustomplot.h Change-Id: Ibd5433015dd117f4d028c842a4add53041adbd11 Reviewed-on: https://code.wireshark.org/review/6275 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-05Added DNS statistics supportDario Lombardo8-17/+214
This affects both the dissector (that has been added with a tap interface and a stats generator) and the UI (to recall the stats menu). Change-Id: I90658f7aa6707aa39bdd787a51b20fed4dbddc53 Reviewed-on: https://code.wireshark.org/review/6236 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>