summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-04-18MIME: Allow to dissect big filesMichal Labedzki1-3/+1
Increase file size limit for mime files that can be loaded by Wireshark to AddressSpace/2. On 32bit machines the limit can be 2 GiB. Change-Id: I5b38b3ebe401077f4e1e873cff4b37da560d592f Reviewed-on: https://code.wireshark.org/review/4907 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-18ZigBee: commissioning dissectionAlexis La Goutte1-11/+14
Miscellaneous corrections in ZigBee Green Power commissioning cluster dissection. Change-Id: I6aaf5f2c1ad5c70d1961709c0e94ab5c5af81ec7 Reviewed-on: https://code.wireshark.org/review/8094 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18GIOP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+0
Change-Id: I5cd8fe72e6288578d4fa316096dfa606bf3e7aea Reviewed-on: https://code.wireshark.org/review/8116 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18GIAS: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I430e044d838b0d81bda15d3f8012b81f7247080e Reviewed-on: https://code.wireshark.org/review/8115 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18Bluetooth: OBEX: Fix Dead Store (Dead assignement/Dead increment) warning ↵Alexis La Goutte1-6/+6
found by Clang Change-Id: I5c260b6af14786119a324c3fed98178ddad01c6d Reviewed-on: https://code.wireshark.org/review/8114 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18Bluetooth: HFP: Fix Dead Store (Dead assignement/Dead increment) warning ↵Alexis La Goutte1-1/+1
found by Clang Change-Id: I1509a9ee9b136c15b5da8ff88fa6eadab3dd7f99 Reviewed-on: https://code.wireshark.org/review/8113 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18802.11 fix unchecked return value (CID 1293628)Alexis La Goutte1-1/+3
following ge243b0041 check the last add_tagged_field for avoid a Coverity warning (Yes the code is already safe..) Ping-Bug: 11110 Change-Id: Iaceb8cf9c91de426bc5e5408b4271091cab57862 Reviewed-on: https://code.wireshark.org/review/8084 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: Anders Broman <a.broman58@gmail.com>
2015-04-18proto(.h): fix '@return' command used in a comment that is attached to a ↵Alexis La Goutte1-1/+1
function returning void [-Wdocumentation] Change-Id: Ice88ddf2d35293f23be2d5a61a6ae77ed540f886 Reviewed-on: https://code.wireshark.org/review/8107 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: Anders Broman <a.broman58@gmail.com>
2015-04-17Make androiddump loadable on OS X.Gerald Combs3-2/+15
Make sure the target location for extcap executables and extcap_dir match on OS X. Set the extcap directory to Contents/MacOS/extcap. The Mac Developer Library documentation doesn't explicitly define "Resources", but examples include data files and not executables. It does state that executables shouldn't go into PlugIns. Make sure we rpathify androiddump. Change-Id: If36c762e2a1991c26e5c01a870deaf191bcf9f94 Reviewed-on: https://code.wireshark.org/review/8093 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-17Consistently used (derived) type Enumerated (rather than Unsigned32 orJeff Morriss1-16/+16
Integer32) when the AVP is of type Enumerated. Just for correctness. Change-Id: Ia485d6e06ca16d6da82aa5d1b60025120e45242f Reviewed-on: https://code.wireshark.org/review/8109 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-17Fix up some indentation/white space issues.Jeff Morriss1-111/+110
Change-Id: I73a1a1dd567970f99df769d5976cc82a7e5b9a60 Reviewed-on: https://code.wireshark.org/review/8108 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-17Retire git_version.xml.Gerald Combs6-83/+1
Remove check_git_version.sh and its associated targets. We haven't used git_version.xml since the AsciiDoc conversion. Change-Id: I480f0094c4355d71201f2dd285198581bbbfc415 Reviewed-on: https://code.wireshark.org/review/8104 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-04-17Fix CMake warningsGraham Bloice15-44/+49
Newer versions of CMake generate warnings about the use of @variable@ references, replace @CPACK_PACKAGE_NAME@ with ${CPACK_PACKAGE_NAME} Set the policy for CMP0026 to be old to squelch warnings about the use of target LOCATION Change-Id: I424083260c51875dde80f98a23d6528c31ff0aec Reviewed-on: https://code.wireshark.org/review/7977 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-17androiddump: Fix build on onther than Win platformsMichal Labedzki1-1/+4
androiddump should be put in extcat directory. Change-Id: I360eef2d5a68178c73181949b0fe3346585f5190 Reviewed-on: https://code.wireshark.org/review/8083 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-17Add a few items to the Release Notes.Jeff Morriss1-0/+3
- GIAS dissector - Netscaler 3.5 support - GUI menu API for plugins Change-Id: I88f52a73e1149de6fe0588c1316b27fac9af59ce Reviewed-on: https://code.wireshark.org/review/8090 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-17CMake: Set WIN32 for GUI executables.Gerald Combs1-6/+12
Pass WIN32 to add_executable where needed. Require CMake 2.8.11 on Windows. Change-Id: I6a119bbb0f16f9e21f2e7378bae7ed52b8abb2dc Reviewed-on: https://code.wireshark.org/review/8091 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: Graham Bloice <graham.bloice@trihedral.com>
2015-04-17Do not package debug files when building PortableApps.com installer with ↵Pascal Quantin1-1/+1
(the soon to be dead) nmake Change-Id: Ifd6fc71cebe6db06923e2d764cb415bf5b2ed025 Reviewed-on: https://code.wireshark.org/review/8106 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-17Download the Qt dmg and just do a binary installation.Guy Harris1-42/+39
That's a *lot* faster than building from source. That means we should suggest adding the Qt pkg-config directory to PKG_CONFIG_PATH; do so. Change-Id: I9a70ea73fbace1f736cad8a4da11b62df8e5818e Reviewed-on: https://code.wireshark.org/review/8105 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-17Mount the CMake dmg we downloaded, don't download it again.Guy Harris1-1/+1
Amazingly, "hdiutil attach" can take a URL as an argument; it will attempt to download the file in question and mount it. We've already downloaded the file, so there's no point in downloading it again (especially not with a URL with "v2.8" coded in). Change-Id: I106fc0c32a378aeead66ed32bceb454d23efa297 Reviewed-on: https://code.wireshark.org/review/8103 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-16Fix spelling error.Guy Harris1-2/+2
Also clean up alignment. Change-Id: Ib1efb5f642489ea2ddfe2d129c083eda72551bad Reviewed-on: https://code.wireshark.org/review/8100 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-16ZigBee: dissection of commissioning frameAlexis La Goutte1-2/+2
Fix miscelleanous errors in ZigBee Green Power Change-Id: Ie5d379228a755ea09821148dc508108c6293da81 Reviewed-on: https://code.wireshark.org/review/8095 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-16giop: replace glib with wmemEvan Huus1-5/+5
One structure and one hash table with very simple uses. Fixes a memory leak. Change-Id: I727b7d5b0b17c2fcfaaad57797d11090e392253b Ping-Bug: 11123 Reviewed-on: https://code.wireshark.org/review/8088 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-16giop: fix uninitialized use of request idEvan Huus2-4/+3
Move the req_id field to the "message-dependent data" section of the header struct, since in the spec I found it is not specified in the common GIOP header (even though it appears to be present in all message types). Regardless, this better reflects the fact that it is not initialized by the primary tvb_memcpy, only the independent fields are. Initialize it and use it rather than creating a local for no reason; fixes the possibility of using it uninitialized. Bug: 11123 Change-Id: I3bae1df5123fbb1f2b86f7c42cee392b5b045c4f Reviewed-on: https://code.wireshark.org/review/8087 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-16Extcap: fix logically dead code (CID 1232344)Alexis La Goutte1-3/+0
Change-Id: Ia6c178a9a5ec413004107f63c8dcaa38c19690b9 Reviewed-on: https://code.wireshark.org/review/8096 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-16Minor Win32 console fix.Gerald Combs2-3/+3
Fix a no-op in set_has_console. Mark it and set_console_wait GTK+ only. Change-Id: Ifc6540b30edc0296c4a47c004a397cc309e71d2b Reviewed-on: https://code.wireshark.org/review/8099 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-16Fix copy-and-pasteo.Guy Harris1-1/+1
"Recursion(n). See "recursion"." Change-Id: Ic0acab13a6da8e0e00ead32653498d13edf212ac Reviewed-on: https://code.wireshark.org/review/8098 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-16Update README.cmake.Gerald Combs1-7/+1
Change-Id: I2aaae7936639dc2775a8f7fdb1d4276893c8a6dc Reviewed-on: https://code.wireshark.org/review/8097 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-16RADIUS: fix test suite by comment new rfc dictoAlexis La Goutte1-1/+1
tshark: radius: Vendor: 'integer', does not exist in /home/wireshark/builders/wireshark-master/ubuntu-14.04-x64/build/radius/dictionary.rfc7499:10 Vendor: 'integer', does not exist in /home/wireshark/builders/wireshark-master/ubuntu-14.04-x64/build/radius/dictionary.rfc7499:11 Change-Id: I2852658235b7025e429e891401088de91c542424 Reviewed-on: https://code.wireshark.org/review/8092 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-16Remove deprecated tvb_lengt APIsAndersBroman13-42/+42
Change-Id: Ic3c364384dcc1d87089d646665f5900081de13df Reviewed-on: https://code.wireshark.org/review/8089 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16RADIUS: Sync with FreeRADIUS MasterAlexis La Goutte6-0/+38
commit dec7ff66f34d773d25dee412fe218b4e108d7680 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Apr 1 13:49:22 2015 -0400 added VALUEs commit 634bdb7b29089ed9fd9548a4ed033bfca82832d2 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Apr 1 13:34:19 2015 -0400 Added from RFC which has numbers assigned commit 005437d9f260c233f165e5f1a8a0e00ab48d6456 Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org> Date: Thu Mar 26 09:09:13 2015 -0400 Hyphens commit 88332d8e5dc6bae25270500902cdcb511e0e08a6 Author: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> Date: Thu Mar 26 12:13:39 2015 +0200 Update dictionary.mikrotik Update dictionary.mikrotik to have new attributes and values mentioned in Mikrotik wiki: http://wiki.mikrotik.com/index.php?title=Manual:RADIUS_Client/vendor_dictionary commit 849336c73dda97ac2a1185f19e21fd2d4d086180 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Mar 25 15:40:02 2015 -0500 Motorola error message Change-Id: I03ab7666dd64cef75e8ebf088766b6b28497817c Reviewed-on: https://code.wireshark.org/review/7974 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16Replace deprecated tvb_length APIsAndersBroman16-68/+68
Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16Fix wireshark.pc when CMAKE_INSTALL_LIBDIR is absoluteBalint Reczey2-6/+7
Change-Id: I9667660329c0888f35e1ac332537eda995509a85 Reviewed-on: https://code.wireshark.org/review/8010 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-04-16Fix misspellings in German debconf translationArnd Hannemann1-2/+2
Change-Id: I6cd3ce90dd3ffe5ebdf5f39f14cb3dabb38c62e9 Reviewed-on: https://code.wireshark.org/review/8009 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-16androiddump: stop recompiling systematically androiddump.c with nmakePascal Quantin1-2/+7
Our default rules are confused because source file is in a subfolder of the nmake makefile Change-Id: If3dee4cd5b3be493abfe8c696383fb170952260b Reviewed-on: https://code.wireshark.org/review/8068 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> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-15CMake: Try not to clobber our gspawn exes.Gerald Combs1-3/+5
Try not to overwrite gspawn*.exe between signing them and packaging them. (Second try.) Change-Id: I717f5fca6dc6afbc146927d06e6f74ae6a0a87c8 Reviewed-on: https://code.wireshark.org/review/8082 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15Revert "CMake: Try not to clobber our gspawn exes."Gerald Combs2-16/+25
This accidentally reverted code from g40ce324. Will try again shortly. This reverts commit 8d9fdda9913a4773ebaf4fc34401ae8a24b729d7. Change-Id: I0bf7f351b926f1ce4b0c9e19fe0367add1dfee1e Reviewed-on: https://code.wireshark.org/review/8081 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15CMake: Try not to clobber our gspawn exes.Gerald Combs2-25/+16
Try not to overwrite gspawn*.exe between signing them and packaging them. Change-Id: I9f224b64537c3b0dd6f7f8b94a8837bd427ad2ca Reviewed-on: https://code.wireshark.org/review/8080 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15Fix gsmtap signal and snr.Anton Thomasson1-6/+6
-Correct parsrsing to get correct value (corect position in header). -Rename hf_gsmtap_noise_dbm to hf_gsmtap_snr_db to reflect use and name in struct. -Change order of decalaration/use of signal and snr to reflect position in struct. -Change registered types to signed to reflect possible values and definition in struct. Change-Id: I748bd19757c0dd87fe4ad0969dfcc8427b908aa2 Reviewed-on: https://code.wireshark.org/review/8077 Reviewed-by: Sylvain Munaut <246tnt@gmail.com> 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-04-15Androiddump: Fix Memory - corruptions (OVERRUN) (CID 1293632)Alexis La Goutte1-1/+1
Change-Id: Ifd0d5026d207f763e1726963049acfb5a77f4b39 Reviewed-on: https://code.wireshark.org/review/8075 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: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-15Set the extcap working directory on Windows.Gerald Combs7-38/+48
On Windows, prepend the main program directory to %Path% when spawning extcap processes. This lets us place androiddump in extcap while allowing it to locate its DLLs. Change-Id: I406c47ce71323266d5f14fb596931398464e452d Reviewed-on: https://code.wireshark.org/review/8057 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15Replcae deprecated API tvb_length with tvb_reported_length or tvb_capturedAndersBroman17-93/+93
length. Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51 Reviewed-on: https://code.wireshark.org/review/8076 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15Replcae deprecated API tvb_length with tvb_reported_length or tvb_capturedAndersBroman7-33/+33
length. Change-Id: Ia1235c49b28320b5651e284115639820f81cb747 Reviewed-on: https://code.wireshark.org/review/8074 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-15ZigBee: fix IS_ANALOG_SUBTYPE macroJulien STAUB1-1/+1
Modify IS_ANALOG_SUBTYPE macro according to 07-5123-04 zigbee cluster library specification. It wasn't filtering out the 8-bit enums ans 16 bit enum (digital types). Bug: 11120 Change-Id: I74f1c0e6671b33fa69e5045cfc283ada3a39d380 Reviewed-on: https://code.wireshark.org/review/8069 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-14CMake: Fix an NSIS dependency.Gerald Combs1-1/+1
Change-Id: I514243727da1fed52c78a4cbd8c82c68bf724c8a Reviewed-on: https://code.wireshark.org/review/8070 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14CMake: Initial PortableApps targets.Gerald Combs7-17/+169
Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14Start moving win-setup to PowerShell.Gerald Combs5-20/+323
Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14openSAFETY: Replace deprecated APIRoland Knall1-3/+3
Replace deprecated API functions tvb_length and tvb_length_remaining Change-Id: Ibf4c7b12a1a6ea3b1a750dce7faf2f4933b4c470 Reviewed-on: https://code.wireshark.org/review/8063 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-14Bluetooth: OBEX: Update to PBAP 1.2, GOEP 2.1, CTN 1.0 and GPP 1.0Michal Labedzki1-193/+1174
Add a lot of fields. Change-Id: If12a30b1840c0dbe934bc6af264a068935912832 Reviewed-on: https://code.wireshark.org/review/8043 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-14Oops, have to actually comment out the definition, not just the declaration.Guy Harris1-0/+2
Change-Id: Iea588a07f4c559f4455d85d6bf99f9a3b631caed Reviewed-on: https://code.wireshark.org/review/8066 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-14Cast away a (non-relevant) warning.Guy Harris1-1/+1
Change-Id: Iee5029dc685561491660a8f711e58a652893bc90 Reviewed-on: https://code.wireshark.org/review/8065 Reviewed-by: Guy Harris <guy@alum.mit.edu>