aboutsummaryrefslogtreecommitdiffstats
path: root/epan/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2016-02-08Rename Bluetooth OBEX dissector to OBEXMichal Labedzki1-1/+1
For historiacal reasons OBEX protocol was implemented as "Bluetooth OBEX", that means it is OBEX + Bluetooth related stuff. However Bluetooth related stuff does not caused any issue right now, so allow to use this dissector in non-Bluetooth cases. Bug: 11724 Change-Id: Ic645308bc854602d009f254ebbfd1b703a4c6a25 Reviewed-on: https://code.wireshark.org/review/13740 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-08TCAP: Fix warning [-Wclobbered]João Valverde1-1/+1
Add TCAP to clean ASN.1 dissector list. Change-Id: I256dabe0961b681d22c230378f19968d9f7eda26 Reviewed-on: https://code.wireshark.org/review/13812 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-07SNMP: Fix warning [-Wunused-function]João Valverde1-1/+1
Add SNMP to clean dissectors also. Change-Id: Ifc4d5a03c13f864bd9219294028323761cd19368 Reviewed-on: https://code.wireshark.org/review/13786 Petri-Dish: João Valverde <j@v6e.pt> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-05Network Service Header Dissector for Ethernet & GRE encapsulationChidambaram Arunachalam1-0/+1
draft-ietf-sfc-nsh-01.txt Bug: 11490 Change-Id: I95adb1e0b1e42ba8c75e82145a756e2836a9a989 Reviewed-on: https://code.wireshark.org/review/13633 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>
2016-02-03Add Userlog dissectorJun Wang1-0/+1
Userlog is user flow logs of H3C device. Flow logging records users' access to the extranet. The device classifies and calculates flows through the 5-tuple information, which includes source IP address, destination IP address, source port, destination port, and protocol number, and generates user flow logs. Flow logging records the 5-tuple information of the packets and number of the bytes received and sent. With flow logs, administrators can track and record accesses to the network, facilitating the availability and security of the network. examplecapture: https://wiki.wireshark.org/SampleCaptures#UserLog Bug: 11878 Change-Id: If3b5ca75bdd6cd8dc12af4a35401c5a6aa193a73 Reviewed-on: https://code.wireshark.org/review/8148 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>
2016-02-01Get rid of unused redundant OSI COTP dissector.Guy Harris1-1/+0
packet-ositp.c is more complete and is what's used, so we don't need packet-x224.c. Change-Id: Id3409d7b2af0e4ecbc64c74bb6d1ed9ea8f31738 Reviewed-on: https://code.wireshark.org/review/13650 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-28packet-simple: SIMPLE dissectorPeter Ross1-0/+1
Change-Id: Ia3fc0a959c4f5930bd5ab2b58065f55dcec407de Reviewed-on: https://code.wireshark.org/review/13409 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-25Move the proto data stuff out of frame_data.[ch].Guy Harris1-0/+1
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-20IPOS: Add Ericsson IPOS kernel packet header dissectorChuan He1-0/+1
IPOS is the networking operating system used in Ericsson's SSR 8000, Router 6000, and SP routers, etc.. This change added the IPOS kernel packet header dissector. The change creates a new file for IPOS protocol named "packet-ipos.c". IPOS will register sub dissectors with the dissect table "sll_linux_dissector_table" for IPOS internal ethernet packet types. IPOS dissector also calls the existing REDBACK dissector. Change-Id: I642b932010be6aa05314f21ea8596d1c45eacf5b Reviewed-on: https://code.wireshark.org/review/13408 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>
2016-01-14Adding IAS WD cluster and IAS ACE Cluster for Zigbee Protocol.Aditya Jain1-0/+1
Change-Id: Ib5cf998cd0217e9335d826962efdc29ff13af12a Reviewed-on: https://code.wireshark.org/review/13214 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>
2016-01-09Adding following dissectors for HVAC clusters for Zigbee Protocol:Aditya Jain1-2/+3
1. Pump Configuration and Control 2. Fan Control 3. Dehumidification Control 4. Thermostat User Interface Configuration Change-Id: I854f992a0c6e8a5714f308e97f30e7bc26fb73fc Reviewed-on: https://code.wireshark.org/review/13102 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-08LAT dissector.Guy Harris1-0/+1
Only 15 years later: https://www.wireshark.org/lists/ethereal-dev/200010/msg00070.html as I clean up stuff I've had lying around for a while. LAT spec found at bitsavers.org; further work can use that. Change-Id: I486e4ab1ffb74d6e0b323202514cc352d63e9eef Reviewed-on: https://code.wireshark.org/review/13118 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-06Adding Color Control and Ballast Configuration(Lighting Chapter) Clusters ↵Aditya Jain1-0/+1
for Zigbee Change-Id: Ib8f68ce06c52fcbc1f66597f6f2c6f5e0b6a56d8 Reviewed-on: https://code.wireshark.org/review/12909 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-05GFP: Add support for Generic Framing Procedure (ITU-T G.7041/Y.1303)John A. Thacker1-0/+1
Add support for Generic Framing Procedure. Generic Framing Procedure (GFP) is used to map octet-aligned variable length payloads (e.g. Ethernet, MPLS, octet-aligned PPP, IP) into octet-synchronous signals such as SONET/SDH (ITU-T G.707) and OTN (ITU-T G.709). GFP is a telecommunications industry standard defined in ITU-T G.7041/Y.1303. (https://www.itu.int/rec/T-REC-G.7041/) Bug: 11961 Change-Id: Idf5b311e82b051b1ee65bde5149b3de405537b02 Reviewed-on: https://code.wireshark.org/review/13043 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-12-29Add support for IEEE-11073 FLOATsMichal Labedzki1-0/+1
Add support for IEEE-11073 32-bit FLOAT and 16 bit SFLOAT field types. Use them in Bluetooth ATT dissector. Change-Id: Ife0f3843da84a9af23483b0a0d9b69cd2f511d08 Reviewed-on: https://code.wireshark.org/review/12680 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> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-28Refactor GUI dependencies out of color_filters.[ch] and move it to epan ↵Michael Mann1-1/+2
directory. This also moved color.h into color_filters.h Change-Id: Ic19e27aa1b3ec67e764aa7ee8bbef7b1187bb12e Reviewed-on: https://code.wireshark.org/review/12831 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-12-22Adding Shade Configuration and Door Lock Clusters for ZigbeeAditya Jain1-0/+1
Change-Id: Ifc99c47e4bf8c03355f60ab508cd7f9b2fb249e4 Reviewed-on: https://code.wireshark.org/review/12776 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22RTITCP: Added new dissectorJuanjo Martin1-0/+1
This dissector was mostly code-reviewed in a previous change: https://code.wireshark.org/review/#/c/11305 But it had an issue with a pointer using a sequence number (8 Bytes). This change is meant to correct that, as well as a small formatting error I found in the text shown. Change-Id: Ib7e27eb2734c46e970b99161bd04438b5675bde4 Reviewed-on: https://code.wireshark.org/review/12660 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-20Condense DMX dissectors into a single file and create a dissector table for ↵Michael Mann1-4/+0
them. Change-Id: Ie7b8964fcbb5e0a7c6b4296ee2b63e168dcc55fa Reviewed-on: https://code.wireshark.org/review/12738 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13Create a way to register "capture" dissectors.Michael Mann1-0/+1
Capture dissectors could be architected like dissection dissectors, with tables and subtables and possibly using tvbs to pass there data instead of raw byte arrays. This is a first step towards that by refactoring capture_info_packet() to work off of a "capture dissector table" Registering the capture dissection functions instead of calling them directly also clears up a bunch of dissector header files who sole purpose was providing the capture dissection function definition. Change-Id: I10e9b79e061f32d2572f009823601d4f048d37aa Reviewed-on: https://code.wireshark.org/review/12581 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-12-10Revert "Added RTI TCP dissector"Anders Broman1-1/+0
This reverts commit 1788e2c33a631056ae02e6cd8f75bd48696faf35. Change-Id: Ie86aa71f92e02935663b46ca00f38e0b8d8ae411 Reviewed-on: https://code.wireshark.org/review/12494 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-10Added RTI TCP dissectorJuanjo Martin1-0/+1
This dissector shows the information related to the RTI TCP Control messages used to manage the TCP connections, but also dissects the RTPS data that is sent on top of RTI TCP. This only happens with RTI's DDS implementation. Bug: 11640 Change-Id: I89fcb620256aeed7cae5829b70d92c6868d94929 Reviewed-on: https://code.wireshark.org/review/11305 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-05Revert "Build Flex-generated files with "warnings are errors"."Guy Harris1-8/+8
This reverts commit b56f53884be3bab935058b2bbbb4da0b8bbbe7f6. Sadly, we *do* get warnings at this point with older versions of Flex, such as the one on the 32-bit OS X buildbot. Change-Id: I9aec1a16e9f2e1bbcfaac3dffdabdd89af5815e3 Reviewed-on: https://code.wireshark.org/review/12443 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-05Build Flex-generated files with "warnings are errors".Guy Harris1-8/+8
We shouldn't be getting warnings at this point. Change-Id: I363a48546cb8d916425f42962ae1697d52ed9a29 Reviewed-on: https://code.wireshark.org/review/12436 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-02eCMP Dissector - Extensible Control & Management ProtocolJames Lynch1-0/+1
Developed by Emerson Industrial Automation (Control Techniques Division) eCMP is a protocol for setting up and controlling the devices in a factory automation system. eCMP has about 30 commands; most are embedded into TCP/IP messages, but cyclic data messages use the UDP protocol. Bug: 10562 Change-Id: I9a421f39dfbdbc9e28d8f7cba72c22e270064641 Reviewed-on: https://code.wireshark.org/review/3157 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-11-29Support building the X11 dissector outside the source tree.Jeff Morriss1-13/+7
Use relative path names for the script names and mesa/xcbproto directories so different paths (from different users) don't cause deltas. Also, with help from Peter Wu and Graham, get generation of the X11 dissector working from cmake. Change-Id: I95cd2a0f973dcbc67f457ff94c28e46a666afb74 Reviewed-on: https://code.wireshark.org/review/12213 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> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-26Process the radio information internally for AiroPeek classic files.Guy Harris1-1/+0
Process it in libwiretap; no need to hand it to libwireshark for dissection, it can just dissect the radio information pseudo-header with the processed information. Change-Id: I482697947eecbd3967cf1910ba2fa2bff805cd66 Reviewed-on: https://code.wireshark.org/review/12202 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-24Introduces augmented interval treesMatthieu Coudron1-0/+1
Interval trees (wmem_itree_t) are implemented as an extension of wmem_tree with a guint64-based range as the key. This is useful for instance in MPTCP analysis, to look for packets matching a range defined by a mapping across TCP subflows. Change-Id: Iea706d44fe975e390a4191ad0257ef37d5c71525 Reviewed-on: https://code.wireshark.org/review/11714 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-22Cisco FabricPath MiM: rename file nameAlexis La Goutte1-1/+1
packet-mim -> packet-cisco-fp-mim.c Change-Id: Ife2414f8e74ec818720da1e80d6b8f87589d8150 Reviewed-on: https://code.wireshark.org/review/12008 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-11-21Have a separate dissector for pcap/pcapng-format packet data.Guy Harris1-0/+1
Put that dissector into its own file, and get handles for it from the pcap and pcapng file dissectors. Put the value_string of pcap/pcapng LINKTYPE_ values there, and have the pcap and pcapng file dissectors import it. Expand that table to include all LINKTYPE_ values in the current libpcap. Change-Id: I9397035efa5711e8a18a26e056d3b54494fd3148 Reviewed-on: https://code.wireshark.org/review/12000 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-17Commiting CISCO ERSPAN3 Marker dissector for pushing to upstreamPeter Membrey1-0/+1
Change-Id: Id0c583eacbef01d9dbdb54c27893d44cc32d9a31 Reviewed-on: https://code.wireshark.org/review/11680 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-11-12dissector for ISO14443 protocolsMartin Kaiser1-0/+1
This is a dissector for the ISO14443 protocols between a contactless smartcard and a card reader. The overall approach is similar to DVB-CI. We have a pseudo-header in front of the captured data that has information about the type of the captured data and the direction. For now, the dissector registers itself by name so it can be linked to a user-DLT. I am applying for an official DLT. Change-Id: I9c4a28ef5b220f205baf58381bf1962996887a9d Reviewed-on: https://code.wireshark.org/review/11663 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> 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-11-10Initial Sysdig syscall (event) support.Gerald Combs1-0/+1
Add a dissector for reading Sysdig event blocks. It only handles plain events but it's usable for reading trace files on hand here. Use a script to generate various parts of the dissector. As an experiment, update parts in-place instead of using a template. Ultimately there should probably be a top-level "Syscall" or "Event" dissector alongside the "Frame" dissector, which could then call this. You could then directly compare an executable's system calls alongside its network traffic. For now leverage the pcapng_block dissector and keep everything under "Frame". Next steps: - Items listed at the top of packet-sysdig-event.c. Change-Id: I17077e8d7f40d10a946d61189ebc077d81c4da37 Reviewed-on: https://code.wireshark.org/review/11103 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-06Add Nokia Intelligent Service Interface (ISI) dissectorTyson Key1-0/+1
From: https://github.com/shr-project/isi-wireshark-plugin/ Bug: 11676 Change-Id: If3f4d7e3e1dd674cb99e96eabdc3491dec76ea3a Reviewed-on: https://code.wireshark.org/review/11580 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-11-03packet-dcerpc-witness: initial implementation based on the idl file from sambaGregor Beck1-0/+1
See [MS-SWN], https://msdn.microsoft.com/en-us/library/hh536748.aspx Change-Id: Ie92dad2c229ec08e7f7e31be9422450305b3908a Signed-off-by: Gregor Beck <gbeck@sernet.de> Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-on: https://code.wireshark.org/review/11366 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-29"Color dissector filters" are just filters.Guy Harris1-1/+1
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-27Replace all "dissector filter" registrations with "dissector color filter" ↵Michael Mann1-1/+0
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-16CMake: Add /WXGerald Combs1-2/+2
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-05Initialize 2.1.Gerald Combs1-1/+1
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-30Add more CORBA dissectors back to the dirty list.Gerald Combs1-3/+3
Change-Id: Ic55a2d444b924a6b13bdfd479a38d90589be8a1f Reviewed-on: https://code.wireshark.org/review/10709 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-09-30nwp: add support for NWP packetsCody Doucette1-0/+1
Neighborhood Watch Protocol (NWP) is an XIA protocol for resolving network addresses to link-layer addresses. Hosts on a LAN send NWP Announcement packets with their host identifiers (HIDs), and neighbors in the LAN respond with NWP Neighbor List packets containing their HIDs and associated link-layer addresses. Bug: 11492 Change-Id: Ib1e801474b1aa72f5dd3d8303eeec36b96ee0a99 Reviewed-on: https://code.wireshark.org/review/10316 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-09-29Add back DIRTY_CORBA_IDL_DISSECTOR_SRC.Gerald Combs1-1/+5
Add DIRTY_CORBA_IDL_DISSECTOR_SRC back to our various makefiles and move packet-cosnaming.c back to it. Change-Id: I2f0427ad47bf0e2f166577608da7f5feaf848a48 Reviewed-on: https://code.wireshark.org/review/10691 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-28idl2wrs: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangMichael Mann1-9/+5
It looks like "items" could have contributed to fields/data being at an incorrect level off of a tree. Change-Id: I93616ef8b6b364c578f989882045dee42cb6d3c3 Reviewed-on: https://code.wireshark.org/review/8558 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: 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-09-19TCPROS - Initial implementation for the Robot Operating System TCP protocolGuillaume Autran1-0/+1
TCPROS is a transport layer for ROS Messages and Services. It uses standard TCP/IP sockets for transporting message data. Inbound connections are received via a TCP Server Socket with a header containing message data type and routing information. For more information, see: http://wiki.ros.org/ROS/TCPROS Bug: 11404 Change-Id: If8810dbb2cb6d6522eb035fd0fa1cf49933bad3d Reviewed-on: https://code.wireshark.org/review/9807 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-11dfilter: Add membership operatorJeffrey Smith1-0/+1
Added a new relational test: 'x in {a b c}'. The only LHS entity supported at this time is a field. The generated DFVM operations are equivalent to an OR'ed series of =='s, but with the redundant existence tests removed. Change-Id: Iddc89b81cf7ad6319aef1a2a94f93314cb721a8a Reviewed-on: https://code.wireshark.org/review/10246 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-04xip-serval: add support for XIP Serval packetsCody Doucette1-0/+1
Serval is a service-centric architecture that has been ported to XIA to allow applications to communicate using service names. This change adds a dissector for XIP Serval, which sits between layers 3 and 4, and also amends the XIP dissector to be able to invoke it. Bug: 11491 Change-Id: I11299ddbd0fb9eaf8728f8b3fde2a63656963114 Reviewed-on: https://code.wireshark.org/review/10315 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-09-021.99.9 → 1.99.10.Gerald Combs1-1/+1
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-23CBOR: add Concise Binary Object Representation (RFC 7049) dissectorHauke Mehrtens1-0/+1
This adds a dissector Concise Binary Object Representation (CBOR) (RFC 7049). CBOR is a binary data format designed for implementations with small code size as used in the IoT. It uses a structure similar to JSON, but encodes the data in binary format. This is used on top of CoAP for example. Change-Id: I9d7b7d4f7609c899bfc68250cdfebd5dc64e0402 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/9848 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: Pascal Quantin <pascal.quantin@gmail.com>
2015-08-19Added TDMoP protocol dissectorAndrew Chernyh1-0/+1
Bug: 11340 Change-Id: I04408db376718c7a5392f9521d7d75d0481ec30e Reviewed-on: https://code.wireshark.org/review/9514 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18File-format: Add PCAP and PCAPNG dissectorsMichal Labedzki1-0/+2
They have educational values and can be used to debugging some issues. Now Wireshark can open three files (BTSNOOP, PCAP, PCAPNG) in two modes: Capture (Traditional) and File-Format. Change-Id: I833b2464d11864f170923dc989a1925d3d217943 Reviewed-on: https://code.wireshark.org/review/10089 Reviewed-by: Anders Broman <a.broman58@gmail.com>