aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-04-11Squelch 64-bit-to-32-bit shortening errors.Guy Harris1-7/+7
Cast some sizeofs, make a variable size_t. Change-Id: I439a9f2a584535597e6ac92ccdf243ae07e870b3 Reviewed-on: https://code.wireshark.org/review/8018 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11It's not "Windows vs. (Linux or OS X or Cygwin)", it's "Windows vs. UN*X".Guy Harris1-3/+5
Either it's Windows and not Cygwin (__WIN32 suffices for both 32-bit and 64-bit Windows, and this code is unlikely to work on 16-bit Windows, not that much of anybody cares about it any more), or it's UN*X or Windows- pretending-to-be-UN*X-with-Cygwin. That way we don't have to pile on new defined(XXX)'s for every UN*X out there. Change-Id: Ia1df3378a88f2cf8bd1cc8f1a74b51adfe668370 Reviewed-on: https://code.wireshark.org/review/8016 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11A temporary variable squelches some warnings.Guy Harris1-1/+4
GINT32_FROM_BE() and GINT32_TO_BE() both declare local variables, and they collide, so warnings are issued if you use them both in the same statement. Change-Id: I87df6cf7f180316692ab5164e25263ff28d5d760 Reviewed-on: https://code.wireshark.org/review/8015 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-10Retire ws-manifest.pl.Gerald Combs4-125/+2
We haven't used it in a while and we won't use in the CMake environment. Change-Id: Iecfb8c418bddf1ed1fcd38b189babf082101662e Reviewed-on: https://code.wireshark.org/review/8014 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-10Move the PortabaleApps packaging up one level.Gerald Combs10-32/+33
Update the PA section of the Developer's Guide. Change-Id: I383d2a2405e742eb353390f5a43fd6d6d32cb25b Reviewed-on: https://code.wireshark.org/review/8012 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-10Remove depricated API tvb_length -> tvb_reported_lengthAndersBroman32-66/+66
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a Reviewed-on: https://code.wireshark.org/review/8011 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-10CMake: Add a build environment == generator check.Gerald Combs1-2/+16
If we're building on Windows and %Platform% is "x64" or undefined, check it against our generator's target platform. Update the "${CMAKE_GENERATOR} MATCHES" regexes to match what CMake uses internally. Change-Id: I33996344978855cbdf7c1ee9e55b7340efea5b5c Reviewed-on: https://code.wireshark.org/review/7994 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-10MIP6: Remove proto_tree_add_textAlexis La Goutte1-5/+14
Based on packet-ip.c Change-Id: Ibc561b58d5f4b3e3469e1c578e83b3abe3c206f8 Reviewed-on: https://code.wireshark.org/review/8008 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-04-09Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameterAlexis La Goutte1-13/+0
By remove duplicate code... Change-Id: I247c64864c112b08e912d4738478a22e65470eb4 Reviewed-on: https://code.wireshark.org/review/7988 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-09Androiddump: fix Potential leak of memory pointed to by 'serial_number'Alexis La Goutte1-3/+6
Change-Id: Ib244ec9a94d99a3589d411a4e3bcb1b03212b82e Reviewed-on: https://code.wireshark.org/review/7987 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-09Androiddump: Fix Result of 'malloc' is converted to a pointer of type ↵Alexis La Goutte1-3/+6
'unsigned short', which is incompatible with sizeof operand type 'unsigned short *' Remove malloc Change-Id: I12a7f76026336853a50bc5277404c44aa715b8d2 Reviewed-on: https://code.wireshark.org/review/7986 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-09OCFS2: fix some GCC / Clang warningsAlexis La Goutte1-3/+5
packet-ocfs2.c:249: comma at end of enumerator list [-Wpedantic] packet-ocfs2.c:1171: no previous prototype for 'proto_register_ocfs2' [-Wmissing-prototypes] packet-ocfs2.c:1651: no previous prototype for 'proto_reg_handoff_ocfs2' [-Wmissing-prototypes] packet-ocfs2.c:1678:4: no newline at end of file [-Wnewline-eof] Remove also unneed glib.h include Change-Id: I47a03dbc9f175a0e2453dd90a733144ac9f95fc4 Reviewed-on: https://code.wireshark.org/review/8007 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09Pass HTTP URLs to wget.Gerald Combs1-4/+4
Not all wgets are equal. Revert part of 7787c1b so that wget fetches over HTTP instead of HTTPS. Change-Id: Iced263380429795975cf239cba7dac54bd729d38 Reviewed-on: https://code.wireshark.org/review/8005 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-09Replace PROTO_TREE_ADD_XXX_ITEM macro use with real code.Michael Mann1-40/+63
PROTO_TREE_ADD_XXX_ITEM had a bug in it for int values. This was fixed by adding proto_tree_set_ ## ctype ## to the macro, but not all compilers support macros at the end of a function, so just remove the macro entirely and just have the duplicate code. Change-Id: Icf92a6786daa0e84305ba174ce155833f90b6463 Reviewed-on: https://code.wireshark.org/review/8006 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-09Correct macro expansion in PROTO_TREE_ADD_XXX_ITEM for integer fields.Michael Mann1-1/+1
Change-Id: I57e5dcfabc1c1b4c024b9e1cbfd8b9a34c79c330 Reviewed-on: https://code.wireshark.org/review/8003 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09Replace deprecated API tvb_length -> tvb_reported_lengthAndersBroman17-80/+89
Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09REplace deprecated API tvb_length -> tvb_reported_lengthAndersBroman12-29/+29
Change-Id: I6090055a9c31f6787626b810de655d1cc71b99de Reviewed-on: https://code.wireshark.org/review/8002 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09802.11: use switch for Aruba typeAlexis La Goutte1-9/+7
Change-Id: I7f0f10ca695fedab613156811fac60e5fa015bee Reviewed-on: https://code.wireshark.org/review/8000 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09802.11: don't return when Wrong Tag LengthAlexis La Goutte1-9/+9
Change-Id: I8de390e273e06620a8cdf62acae076ed6dd10a54 Reviewed-on: https://code.wireshark.org/review/7999 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09Replace deprecated API tvb_length... with tvb_reported_length...AndersBroman7-38/+38
Change-Id: I44732d2743ba461d1791bb3795b0aef5a314bc1f Reviewed-on: https://code.wireshark.org/review/8001 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09Cleanup CMake VS solutionGraham Bloice1-0/+5
Move the zlib artefacts into Libs\zlib "folder" Change-Id: Iddf0121fad3885553d908a51e9e07a7f676403fe Reviewed-on: https://code.wireshark.org/review/7993 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> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-09TRILL: Fix incorrect header lengthMarian Ďurkovič1-1/+2
Change-Id: I508ee3d4143235157f223e5b9cd16d70cdf1fa72 Reviewed-on: https://code.wireshark.org/review/7997 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-09Androiddump: Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-8/+6
by Clang Change-Id: I245ebb47dfc3d202cba5f63c33fca9c0e30da0ad Reviewed-on: https://code.wireshark.org/review/7984 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-09Improve ATH dissector.Michael Mann1-1/+11
Address comments made after initial dissector was submitted. Change-Id: Ic42431d8af1d281dbe6f67a8f3f4d5e0aeea4156 Reviewed-on: https://code.wireshark.org/review/7995 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-04-09zigbee: correct zcl meas sensingJulien STAUB1-7/+7
corrected the relative humidity measurement 0.00 to 100.00 values. Previous version had bug for example 0.01% -> display 0.1% Change-Id: I3955d36d1f2a1334ef7baab4fd854f13950d1951 Reviewed-on: https://code.wireshark.org/review/7983 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-04-08[IEEE 802.11] fix two potential endless loopsMartin Kaiser1-0/+4
add_tagged_field() may return 0 if the tag length is not what is expected for this particular tag Bug: 11110 Change-Id: Ia2fd6635613fb6d8e1264147d2ddd44162484887 Reviewed-on: https://code.wireshark.org/review/7989 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-04-08ATH dissectorEugene Adell4-0/+455
Change-Id: Idb51bb15e0e0764bd686cb4e822c313779245a4f Reviewed-on: https://code.wireshark.org/review/7807 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-08Fix CMake build for WindowsGraham Bloice1-0/+1
The change to zlib 1.28 requires the variable BUILD_SHARED_LIBS to be set and true to build the correct zlib dll on Windows. Change-Id: I0f46b832726834a4e99d7d7d0637112da9c0c531 Reviewed-on: https://code.wireshark.org/review/7982 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-04-08androiddump: Fix missing headers for Mac OSXRoland Knall1-1/+5
Add sys/socket.h as well as arpa/inet.h and the definition of closesocket. Change-Id: I3986a1cd019c40e7c27cecb3752fd8b7374de6da Reviewed-on: https://code.wireshark.org/review/7980 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-08extcap: Add support for Android - androiddumpMichal Labedzki8-2/+2227
androiddump is extcap program that can be used with Android devices (need Android SDK in system PATH). Supported is Logcat/Logger logs and Bluetooth interfaces for all Android to this day (Lollipop). Please note that it will work also for FirefoxOS. Interfaces: 1. Logcat Main (binary or text) 2. Logcat System (binary or text) 3. Logcat Events (binary or text) 4. Logcat Radio (binary or text) 5. Logcat Crash (text; Lollipop) 6. Bluetooth Hcidump (<Kitkat) 7. Bluetooth Bluedroid External Parser (Kitkat) 8. Bluetooth BtsnoopNet (Lollipop) Change-Id: I26e4cd1a37a6af805f8b932399b4aa44ee7b5a80 Reviewed-on: https://code.wireshark.org/review/7475 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-08802.11: Not showing all 11k subelement fieldsAlexis La Goutte1-1/+55
Add support of Reported Frame Body (subelement of Beacon Report) Bug:11101 Change-Id: I44f313ef081fcba7aaf6208baed81a46152fddb6 Reviewed-on: https://code.wireshark.org/review/7970 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-08WiFi P2P: Update to Peer-to-Peer (P2P) Technical Specification Version 1.5Alexis La Goutte1-4/+284
Add new IE 19 Out-of-Band Group Owner Negotiation Channel 21 Service Hash 22 Session Information Data Info 23 Connection Capability Info 24 Advertisement_ID Info 25 Advertised Service Info 26 Session ID Info 27 Feature Capability 28 Persistent Group Info Bug:11074 Change-Id: I627ca5906c1e3235aa7d4abb4ebfa757825b7fbf Reviewed-on: https://code.wireshark.org/review/7914 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-08Replace deprecated tvb_length with tvb_reported_length.AndersBroman16-56/+56
Change-Id: I45d2ae41da823c50ba383a8e2aaec570ee3ad842 Reviewed-on: https://code.wireshark.org/review/7979 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-08Add section to README.dissector about dissector tablesMichael Mann1-0/+47
Bug: 8985 Change-Id: I9245fb556a55da681fe53dd5c12bb549c83c89c6 Reviewed-on: https://code.wireshark.org/review/7926 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-08Remove RTAC Serial preference that doubled for Decode As.Michael Mann9-90/+12
Just use Decode As directly. Change-Id: Iab03a6ff8a70c3c6b0406f426e622eb52bb34ba7 Reviewed-on: https://code.wireshark.org/review/7902 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-04-08Remove MPLS preference that doubled for Decode As.Michael Mann8-219/+34
Just use Decode As directly. Also replace "registered" dissectors which just the creation of a handle since the dissectors really don't need to be "found" outside of themselves. Change-Id: I1e0c3ae784b71c0145b1f1730a97feae8e9f488f Reviewed-on: https://code.wireshark.org/review/7899 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-08Add proper "Decode As" mechanism for FLIP payload instead of (many) preferences.Michael Mann3-360/+76
Other cleanup with FLIP dissector while in the neighborhood. Change-Id: I0ecdea447979b0ba508a8bb84bd67e4eb4b32a70 Reviewed-on: https://code.wireshark.org/review/7896 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-07Win32: Restore the versioned plugin installation path.Gerald Combs2-4/+27
Revert parts of g2ef72cb and g7710da4 so that the NSIS installer once again places plugins in $INSTDIR\plugins\$VERSION. This matches the behavior of Autotools and previous Windows installers, and reduces the chances of a version mismatch if the user happens to install a custom plugin. Leave the development plugin path unversioned. Leave the extcap path unversioned for now. Change-Id: I861d4ee12975fba4b642e391871c5e852d92a2fe Reviewed-on: https://code.wireshark.org/review/7976 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07Qt: fix maximized state applyPascal Quantin1-1/+1
Preferences are not loaded yet when we call MainWindow::loadWindowGeometry() Anyway, prefs.gui_geometry_save_maximized should only be checked when saving preferences (MainWindow::saveWindowGeometry() method) like what we do in GTK UI Change-Id: I8eb01a5f4f7672fbf5846bc576584e28f72d5e31 Reviewed-on: https://code.wireshark.org/review/7978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07Add zlib compilation to CMake on WindowsGraham Bloice1-7/+14
Modify CMake to compile zlib, removing need for an nmake compilation of zlib before running CMake. Change-Id: I63cead55b14d6a2e22b1b6a8536eaf9260e21231 Reviewed-on: https://code.wireshark.org/review/7864 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> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-07Byte view tab (Qt): Fix Dead Store (Dead assignement/Dead increment) warning ↵Alexis La Goutte1-22/+0
found by Clang Remove unused bmask variable Change-Id: I44613f1d949dbaf8e559b3bfb2196609d821c4f3 Reviewed-on: https://code.wireshark.org/review/7496 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07ATM: add a cast to pacify the OSX 10.5 x86 buildbotPascal Quantin1-1/+1
Change-Id: I2bff621b46b4811cf60ebaff8fca7429bed3a91e Reviewed-on: https://code.wireshark.org/review/7973 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-07Typo fix in manpage of editcapHerwin Weststrate1-1/+1
Positve => Positive Change-Id: I09190b44783d8b7f4e8e90208d8a82d192a6a189 Reviewed-on: https://code.wireshark.org/review/7971 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07ieee80211.c: "IEEE 802.11 plus Network Monitor radio header" encap: Fix ↵Bill Meier2-6/+12
dissection Specifically: Management/Control frames saved by Microsoft Netmon (3.4?) with "IEEE 802.11 plus Network Monitor radio header" encapsulation may or may not be saved with an FCS. See Bug 11105. Fix: Use "check fcs" preference to specify whether Management & Control frames have an fcs for this encapsulation. Change-Id: Ibd0be7b4765c2df2b959cb2234aeed027266246b Reviewed-on: https://code.wireshark.org/review/7939 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07802.11: don't not showing all 11k subelement fieldsAlexis La Goutte1-0/+1
Missing break for Measurement Report tag Ping-Bug:11101 Change-Id: I570088f1eed756d541be74539774295eb67c2d47 Reviewed-on: https://code.wireshark.org/review/7969 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07SGSAP: fix indent (use 4 spaces)Alexis La Goutte1-1/+1
Change-Id: I0c649d0a799817dea66ad297d47f9f22fdaa32c9 Reviewed-on: https://code.wireshark.org/review/7968 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07[SGSAP] Use the subtree for MCC MNC.AndersBroman1-1/+1
Change-Id: I9913fb0d92193723e8e83a58e0d76782b3d20204 Reviewed-on: https://code.wireshark.org/review/7967 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-07[SGSAP] Add dissection of TMSI based NRI container andAndersBroman2-5/+60
Selected CS domain operator. Change-Id: I7c9c089588848a44e1454803b767ac79c07d197f Reviewed-on: https://code.wireshark.org/review/7964 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-07Add OCFS2 dissector.Sunil Mushran4-0/+1678
Bug: 5553 Change-Id: If297036b6d7a7afe163d97b05bc4a319d6cf2e97 Reviewed-on: https://code.wireshark.org/review/7949 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-07DMP: Handle encoded 7bit string as binary.Stig Bjørlykke1-1/+1
This bug was introduced when rewriting tvb_get_string() to handle encoding (and thus handling ASCII string different). Change-Id: Ia37a9d075fb58c8d6c26af811e96f7ca1e82af3d Reviewed-on: https://code.wireshark.org/review/7962 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 09:46:02 +0000