aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
AgeCommit message (Collapse)AuthorFilesLines
2015-11-03Remaining ADDRESS macro to address function conversionsJoão Valverde1-2/+2
Change-Id: I8bc9af431e70243b05f4f0ce8c2b8ee451383788 Reviewed-on: https://code.wireshark.org/review/11463 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-10-29EtherCAT: wrong display nameAlexis La Goutte1-1/+1
Wireshark is showing 2 consecutive bytes named "SubIdx" in a SDO info request (OpCode = 0x5) and response (OpCode = 0x6). But the second byte should be the "ValueInfo" instead in both request and response. Issue reported by ThoKu Bug:11652 Change-Id: I7f6395208d38e714071de5dbb40e3ddb9829f210 Reviewed-on: https://code.wireshark.org/review/11397 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-10-29"Color dissector filters" are just filters.Guy Harris2-7/+7
Rename the color_dissector_filters.[ch] files to just dissector_filters.[ch], and rename the routines not to include the string "color_", as those filters can be used as color filters *or* display filters. Remove "color_" from other places where we're not doing colorization. In the GTK+ code, combine the two loops that add menu items for filters in the dissector-provided filters list into one. Change-Id: I08ecccc6b1b1be675e4129a0589f36c9f240407c Reviewed-on: https://code.wireshark.org/review/11379 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-27opcua: display string representation of AttributeId and DeadbandTypeHannes Mezger5-9/+43
Change-Id: I41f100ddab544054f8fab89f3f5da61866db7a2d Reviewed-on: https://code.wireshark.org/review/11309 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-10-27Replace all "dissector filter" registrations with "dissector color filter" ↵Michael Mann1-5/+5
registration. In the GTK, there was "colorize" (via context menu using color_dissector_filter.{c,h}) or "not colorize" (via main menu using dissector_filters.{c,h}). In Qt, you have the option to colorize (via context menu using color_dissector_filter.{c,h}) or not colorize (via main menu using color_dissector_filter.{c,h}). Combine all into "colorize" and convert GTK to use color_dissector_filter.{c,h} in the "not colorize" main menu like Qt. Change-Id: Ib3ca1c822f5f66ab5b812632d808f7905b328483 Reviewed-on: https://code.wireshark.org/review/11263 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-10-24More ADDRESS macro to address function conversions.Gerald Combs7-22/+22
Replace remaining calls to SET_ADDRESS, CMP_ADDRESS, ADDRESSES_EQUAL, COPY_ADDRESS, and COPY_ADDRESS_SHALLOW with their lower-case equivalents. Replace all ADD_ADDRESS_TO_HASH calls with add_address_to_hash. Change-Id: I4cff857d7a84085abe0bccd52d2605d2a468bf6f Reviewed-on: https://code.wireshark.org/review/11229 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: Michael Mann <mmann78@netscape.net>
2015-10-20Profinet: Add Watchdog Factor data field in IOCRBlockReq.Thomas Wiens1-1/+7
The Watchdog Factor was displayed as Data Hold Factor, which was wrong. Attribute type of the Watchdog Factor is also Unsigned16. Change-Id: Ic5f32b9b322c225361be50b1f4a3180638a0c88b Reviewed-on: https://code.wireshark.org/review/11161 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-16CMake: Add /WXGerald Combs14-28/+28
Add "/WX" to the Visual C++ compiler flags if DISABLE_WERROR is off, similar to config.nmake. We haven't compiled C++ code with -Wshorten-64-to-32 for quite some time so there's no need to add -Wno-shorten-64-to-32 in ui/qt/CMakeLists.txt. Additionally, squelch ---- C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3050) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3065) : see reference to function template instantiation 'void std::_Median<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3127) : see reference to function template instantiation 'std::pair<_RanIt,_RanIt> std::_Unguarded_partition<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3157) : see reference to function template instantiation 'void std::_Sort<_Iter,int,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Diff,_Pr)' being compiled with [ _Iter=QList<QString>::iterator , _RanIt=QList<QString>::iterator , _Diff=int , _Pr=bool (__cdecl *)(const QString &,const QString &) ] .\rpc_service_response_time_dialog.cpp(130) : see reference to function template instantiation 'void std::sort<QList<QString>::iterator,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3051) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3052) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3053) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) ---- in both rpc_service_response_time_dialog.cpp and wireshark_application.cpp so that we'll compile successfully. Change-Id: I457bcede99dcb1f3c1001f1f559c4901bb000357 Reviewed-on: https://code.wireshark.org/review/10533 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-10-14Change proto_tree_add_ipv6() to take a struct e_in6_addr pointerJoão Valverde1-1/+1
tvb_get_ipv6() takes a struct e_in6_addr *, use that here too. Change-Id: Id8b368daa05c151a61d4bc01dc88c00da13e9c88 Reviewed-on: https://code.wireshark.org/review/10953 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: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-14regenerate files adding new UA Specification 1.03 services and typesHannes Mezger12-24/+310
Change-Id: Ib39c33c6f90566f2807fa7bf9c7f1521a8f5cc35 Reviewed-on: https://code.wireshark.org/review/10979 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-10-14add new UA Specification 1.03 StatusCodesHannes Mezger1-1/+8
Change-Id: If4df7d74920d3216d609894b8281408c1374e60f Reviewed-on: https://code.wireshark.org/review/10978 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-05Fix capitalization in MATE's "you need to restart to reconfigure" message.Jeff Morriss1-22/+37
Fix up some formatting and white space while we're there. Change-Id: I869659d6fb1f8b4946f6e13a928ecd53dbabf1a4 Reviewed-on: https://code.wireshark.org/review/10807 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-05MATE: Add ~ operator supportMichael Mann1-2/+1
Bug: 9025 Change-Id: Ica92a7026ba8a89a8970b76e4e7d27f9e6288eb6 Reviewed-on: https://code.wireshark.org/review/10760 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-05Don't count packets twice for average using avg_stat_node_add_value_notick.Michael Mann1-4/+0
Bug: 10535 Change-Id: I9c61a1f10f257bc6dd390c2a9370653bbd45b205 Reviewed-on: https://code.wireshark.org/review/10772 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-09-15mate.released_time is added as a float so register it as such.Jeff Morriss1-1/+1
As noted in: https://ask.wireshark.org/questions/45835/wireshark-mate-correlation-multiple-gops Realistically all MATE's times should probably be converted to FT_RELATIVE_TIMEs but that's a project for another day. Change-Id: I11f640be769d16ccfd787ae2d7f3837fa03ad379 Reviewed-on: https://code.wireshark.org/review/10537 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-07WIMAX (msg_ucd): fix will never be executed [-Wunreachable-code]Alexis La Goutte1-6/+6
Move declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020 Found by Clang 3.7 Change-Id: Ibb14b00d7af2cb0d24eb153d40640a2f9ee4f887 Reviewed-on: https://code.wireshark.org/review/10379 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-02UNISTIM: fix dissection of some audio commandsPascal Quantin1-0/+3
Bug: 11497 Change-Id: Ifb7aeed83f9ac091349387bc425925d2441d1c06 Reviewed-on: https://code.wireshark.org/review/10365 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-08-27Lemon grammar: fix indent (use tabs)Alexis La Goutte1-65/+65
Change-Id: I6fa38d5d85b25ac6c55fcfa67d6c8dba8482cc8c Reviewed-on: https://code.wireshark.org/review/10266 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-08-23Remove some svn $Author$ lines that escaped previous cleanups.Joerg Mayer9-18/+0
git does keep of this in a much better way anyway. Change-Id: I9923516105e63e72878e0ed34c74eed44453ab01 Reviewed-on: https://code.wireshark.org/review/10207 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-08-22Add support for IPv6 stats tree statisticsJoão Valverde1-68/+127
Also add support for alphabetizing stat tree items as the addition of IPv6 stats tree makes it more obvious its needed. Change-Id: I8b319ceac805ce7e3a1fd59f92c1c6fe2a54d3de Reviewed-on: https://code.wireshark.org/review/10062 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-16Fix IP Destinations stats treeJoão Valverde1-1/+1
Change-Id: I875ecb05e0919e81e6d8d1d00f802c8d5df5b214 Reviewed-on: https://code.wireshark.org/review/10053 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: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-05Clean up some fields.Guy Harris1-19/+18
The "LEN" field is the "length of the MAC frame", in bytes; confusingly, it includes the extended header length, but not the fixed-length part of the header (including the FCS), so it's not the "length after HCS". Rename it to "docsis.len", as it's always LEN, not SID; there's a separate field for the SID. Rename the Extended Header Length field to docsis.ehdrlen, and the Number of Concatenated Frames to docsis.concat_cnt, so that different uses of the "MACPARM" part of the header are flagged differently. Update some comments while we're at it. Change-Id: Ib7c4a0cda65cef25dcaf0051b3de89758ef4c29c Reviewed-on: https://code.wireshark.org/review/9881 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17Remove all preferences related to enabling/disabling heuristic dissectors.Michael Mann7-13/+9
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector. Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled. Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22 Reviewed-on: https://code.wireshark.org/review/9610 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-12Add "user presentable" and "unique string ids" to heuristic table entries.Michael Mann7-8/+8
This allows better presentation of heuristic dissectors to the end user. Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6 Reviewed-on: https://code.wireshark.org/review/9602 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-08opcua dissector: fix display of service type in packet columnHannes Mezger1-15/+8
The loop was iterating using g_NumServices, which is the number of entries in g_arParserTable and not the number of entries in g_requesttypes. Instead now we use val_to_str which can in addition display the ServiceId instead if not found in the table. Change-Id: If15ee5c460e07c4687464805935b92c913392011 Reviewed-on: https://code.wireshark.org/review/9459 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-07-03plugins: add cleanup routinesPeter Wu6-26/+40
Destroy the reassembly tables on exit, fix memleak in profinet dissector. Change-Id: Id34dbfde42fe715513997452f87cd4fdc328e294 Reviewed-on: https://code.wireshark.org/review/9229 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-02opcua dissector: Add DefaultXml encoding IDsHannes Mezger2-4/+163
Currently only DefaultBinary encoding IDs can be displayed, this commit adds the DefaultXml encoding IDs Change-Id: I19f3693d3aa03451655058770383222c3828b570 Reviewed-on: https://code.wireshark.org/review/9442 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-02Lemon: Update lemon toolsAlexis La Goutte3-3/+3
Update from SQLite trunk (19 April 2015) Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value Add "new" version of lempar.c (3 November 2009). LEMPAR: fix trailing whitespace LEMPAR: fix -Wunused-parameter Change-Id: I2df7e39c9a6846de26743a981fb76aca423fe813 Reviewed-on: https://code.wireshark.org/review/6502 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02opcua dissector: Fix display of status code in error messageHannes Mezger1-1/+1
Instead of just displaying the hex representation, use parseStatusCode which adds the textual representation of the status code Change-Id: I43b9ff846ef48d727e77cfa247b9dcea7061bbab Reviewed-on: https://code.wireshark.org/review/9441 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-01opcua dissector: Fix parsing of 7 byte numeric service NodeIds.Gerhard Gappmeier1-2/+2
The service NodeIds of OPC UA are normally encoded as 4 byte numeric NodeId. However, it is technically also possible to encode these as (less efficient) 7 byte numeric NodeId. This kind of NodeId was already implemented, but wrong. Since then no one ever used this kind of NodeId for service NodeIds. Change-Id: I8654d969604e18bce8415931e455632e72d578ef Reviewed-on: https://code.wireshark.org/review/9435 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-29plugins/mate: fix some memleaksPeter Wu3-8/+13
Fixes about 5kB leaks in 500+ allocations. There are still some other remaining (and not fixed in this patch because it is hard to track them): - The g_strdup'ed memory via MATE_PARSE for some types (cannot simply g_free after use, it is still needed in some cases). - cfg->transforms and cfg->transport_ranges as used in pdu_decl (mate_grammar.lemon). Tested on a http capture with: tshark -o mate.config:tcp.mate -r ... where tcp.mate is from https://wiki.wireshark.org/Mate/GettingStarted?action=AttachFile&do=get&target=tcp.mate Change-Id: I4c06f948136fc30dfcdb56f7ac8a32a2326ae30d Reviewed-on: https://code.wireshark.org/review/9221 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-25Stop using atof/strtod (fixes column sorting of float types)Peter Wu1-2/+2
atof is locale-dependent. In locales such as Swedish, German and Dutch, the dot is a thousand separator, resulting in wrong conversions for floats. While at it, make the mate dissector also be independent of locale. Blacklist atof in checkAPIs. Lemon is still using strtod, but that is not our problem for now. Bug: 11297 Bug: 8964 Change-Id: I6fe3e45eb1d6d95d41aa4f3af1f81a6204a60c63 Reviewed-on: https://code.wireshark.org/review/9116 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-17Profinet: I&M5 Data is added.Birol Capa1-1/+109
This optional attribute allows identifying separately orderable OEM parts used to built the device. It consists of the following attributes: Number Of Entries, IM Annotation, Vendor ID, IM Order ID, Serial Number, Hardware Revision, Software Revision Change-Id: I793f6ecd798f93e7f40e8e1a42e42a7070a4a1c1 Reviewed-on: https://code.wireshark.org/review/8955 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-06-15Profinet: Combined Object Container is added.Birol Capa2-3/+50
An IO device may define so called “combined objects”. A particular combined object is a group of related submodules, e.g. an interface and its ports. The Combined Object Container holds the parametrization for all submodules. Change-Id: Ifb6c63d2c3a1d3cf2cf100a8f54cf0eafa84fe6c Reviewed-on: https://code.wireshark.org/review/8853 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-15icmp,wimax: Fix undefined shiftPeter Wu1-1/+1
Fixes these warnings reported by Undefined Behavior Sanitizer (UBSan) while running the test suite: icmp: left shift of 55099 by 16 places cannot be represented in type 'int' wimax: left shift of 1 by 31 places cannot be represented in type 'int' Change-Id: I72913a901b61033098750da9c8f1617b055999a1 Reviewed-on: https://code.wireshark.org/review/8913 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: Anders Broman <a.broman58@gmail.com>
2015-06-08Print "and greater" instead of a ten digit number.Gerald Combs1-1/+3
Change-Id: I97dfabe3ec48acf57b33ec15486d2d660d610f6d Reviewed-on: https://code.wireshark.org/review/8841 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-08Profinet: OEM Device ID is addedBirol Capa1-1/+32
The Device ID of the OEM part may additionally be offered using OEM Device ID Change-Id: Ic51cc4c05a41a8d18f265fb1abab739d1e82e28a Reviewed-on: https://code.wireshark.org/review/8832 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-06-05Fix a few issues reported by PVS-StudioPascal Quantin2-4/+6
See http://www.viva64.com/en/b/0328/ for details Change-Id: Ic9ddfd690b49401c96cb8a4a277c671f9824be31 Reviewed-on: https://code.wireshark.org/review/8775 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-04Profinet: Add Fiber Optic Diagnosis Info.Birol Capa1-0/+28
This make reading fiber optic diagnosis data possible. Change-Id: I90b49443ffa1b69912d37cbf7a751328eec9d590 Reviewed-on: https://code.wireshark.org/review/8750 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: Michael Mann <mmann78@netscape.net>
2015-05-30ams: fixed wrong offset calculation, adsstate has 2 bytesThomas Wiens1-1/+1
Change-Id: I95813bb49dd9a51662bac521e82599c26de59e8e Reviewed-on: https://code.wireshark.org/review/8701 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-30Fix some cases where we're shifting a signed 1 left.Guy Harris1-7/+7
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) Change-Id: I0d27565c382a04ceda9eec65f45a430ceb74cf53 Reviewed-on: https://code.wireshark.org/review/8255 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-20wimax: replace deprecated tvb_length callsEvan Huus2-16/+15
Change-Id: I9db1051e065762b826973ecbc2dba460a7f89013 Reviewed-on: https://code.wireshark.org/review/8123 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-17Fix CMake warningsGraham Bloice14-42/+42
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-06unistim: remove tvb_length deprecated APIEvan Huus1-7/+5
Change-Id: Ic2bdc6ec69dcdd856987ec74cc401cd8585727ac Reviewed-on: https://code.wireshark.org/review/7937 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-06profinet: remove tvb_length deprecated APIEvan Huus4-12/+12
Change-Id: Ie6f607d86235c0e2d4fc95f77a7500c1636da934 Reviewed-on: https://code.wireshark.org/review/7936 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-06ethercat: remove deprecated tvb_length APIEvan Huus2-4/+4
Change-Id: I76916948fc06c5a4df5a1188fde164d516b4105d Reviewed-on: https://code.wireshark.org/review/7938 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-05docsis: remove tvb_length callsEvan Huus8-10/+10
Change-Id: Ib35c6436876aa7f933dcec0a97a70ccbbc823905 Reviewed-on: https://code.wireshark.org/review/7913 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-05irda: remove tvb_length callsEvan Huus3-17/+16
Change-Id: I5ea9ed7226217ab272d957ae3240a286c6a26de9 Reviewed-on: https://code.wireshark.org/review/7912 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-03-14Update Custom.nmake.example with the change done in g2ef72cbPascal Quantin1-1/+1
Change-Id: I8d2dc7325da9cd573e87ac924feafe9b55f44a5f Reviewed-on: https://code.wireshark.org/review/7682 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-12CMake: Add a top-level nsis_package target.Gerald Combs1-3/+2
Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>