aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-01-20CMake: Set an output directory for plugins.Gerald Combs18-580/+168
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-20HTTP2: Add HPACK decode to test suiteAlexis La Goutte2-0/+16
Change-Id: Ic84942b78a795974d6e2023751245ad98b8f1142 Reviewed-on: https://code.wireshark.org/review/6415 Reviewed-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20DHCP/BOOTP: Option 125 Suboption: (5) fix display Modem CapabilitiesAlexis La Goutte1-2/+5
Only display dissect of Modem Capabilites when sub option = 5 Actually, it is always display when ftype == special (like sub option = 0) Change-Id: I5b75654b750bae5ae5022adcb5e8dd055ce6b291 Reviewed-on: https://code.wireshark.org/review/6519 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20NCP2222: fix possible buffer-overflowEvan Huus1-1/+5
Caught by ASAN (thanks Alexis!) Change-Id: Ibbe2c405ba1a3ba0d5a5b9ffff9e95282526028b Reviewed-on: https://code.wireshark.org/review/6652 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20Bug fix in json dissector that made the heuristic fail.Dario Lombardo1-3/+5
Change-Id: Iff53cfd8fd9d760b04c638c87f8a44587b268cd7 Reviewed-on: https://code.wireshark.org/review/6674 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-01-20ISIS: Making a segregated function for sub-tlv used by multiple tlvMatthieu Texier1-49/+85
Change-Id: Ifda28dea4b5282ea01a51cdcb3297aeeeb2a848d Reviewed-on: https://code.wireshark.org/review/6550 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20Possibility -> certainty.Guy Harris1-3/+4
Change-Id: I03440a9b4ca13399aa14f3baaabd7aa40a843f28 Reviewed-on: https://code.wireshark.org/review/6678 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-20pdb_zip_package: Enable multithreaded compression.Gerald Combs1-1/+3
Change-Id: If72c65663abb7e3bf1a436d1ecb5eb84f67ad3f8 Reviewed-on: https://code.wireshark.org/review/6677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-20Fix one item.Guy Harris1-7/+13
We *do* get the absolute path of the executable, so we *could* look for "run" right before the executable name. The issue is that there's not the stronger libtool-imposed convention that the executable is in ".libs", so the chances of a false positive or false negative are higher. Change-Id: Ib2d5f370d50fee07479c4ffe6f90ba4a91c7f271 Reviewed-on: https://code.wireshark.org/review/6676 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19CMake: Add a pdb_zip_package target.Gerald Combs1-0/+26
Add a "pdb_zip_package" target similar to the NMake pdb_zip target. Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9 Reviewed-on: https://code.wireshark.org/review/6673 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-19The times in question are local, not UTC.Guy Harris1-8/+26
Revert to the older code, but just show the time as "Not representable" if gmtime() fails. Change-Id: I435facc042e3ca35fb07292a4b2657ccdfd02abb Reviewed-on: https://code.wireshark.org/review/6672 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19add some more apdus to the apdu tableMartin Kaiser1-5/+15
Change-Id: Id5e5efea46e9ff6196607e56f0212fb083e8635c Reviewed-on: https://code.wireshark.org/review/6670 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19start dissecting the ZVT authentication apduMartin Kaiser1-3/+104
add a length paramenter to the body dissection functions in the apdu table Change-Id: I4abbd9078fd36385a816963ab042f443e3c26b60 Reviewed-on: https://code.wireshark.org/review/6669 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19display the control field text in the info colMartin Kaiser1-0/+2
Change-Id: I3dc0f58b4861a08be687214cae9c6681ebcac286 Reviewed-on: https://code.wireshark.org/review/6668 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19continue the dissection of ZVT APDUsMartin Kaiser1-22/+90
define an apdu table with the direction, minimum length and a fuction to dissect the apdu payload set the source and destination address columns depending on the apdu add some entries to the apdu table Change-Id: I52bd15bfab7bbe6c97dfe64084e69a51e65a8a6e Reviewed-on: https://code.wireshark.org/review/6667 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19tvb_length() -> tvb_captured_length()Martin Kaiser1-1/+1
Change-Id: I520b38ed37b2d16d9a15f57b8e83b0b59c9a528c Reviewed-on: https://code.wireshark.org/review/6666 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19synphasor: (trivial) Do dissector_add_uint("rtacser.data",...) only onceBill Meier1-12/+11
and not each time prefs are changed. Also: do minor whitespace changes. Change-Id: I04bfc212e288473a78113e8b124ce4a13ad74ad1 Reviewed-on: https://code.wireshark.org/review/6663 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19README.dissector: Minor update re date/time display.Bill Meier1-2/+3
Change-Id: Iae467efeccd2e51ea66aab029100c958de7d374e Reviewed-on: https://code.wireshark.org/review/6662 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19synphasor: prevent possible crash; gmtime() can return NULL;Bill Meier1-11/+3
Don't do manual conversion of a time-field to UTC using gmtime(). Use the standard Wireshark mechanisms. Change-Id: I2eaee074a590ecab492336bb6ad794bdd036f699 Reviewed-on: https://code.wireshark.org/review/6661 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19dmp, gmhdr, vssmonitoring: prevent possible crashes;Bill Meier3-3/+15
gmtime()/localtime() can return NULL. Change-Id: If0589261429ee15d0c07972a99d94f9fe83626f6 Reviewed-on: https://code.wireshark.org/review/6660 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19smb-pipe: prevent possible crash; gmtime() can return NULL.Bill Meier1-18/+8
For FT_ABSOLUTE_TIME fields: Instead of calling gmtime()/mktime() to convert a time to UTC time which is then displayed using proto_tree_add_time(), Use ABSOLUTE_TIME_UTC as the 'display' value for the field and then display the field using proto_tree_add_item(). Change-Id: I1926c40de76a86072437902cb7621d3873827b11 Reviewed-on: https://code.wireshark.org/review/6659 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19BGP: EVPN - Route Type 4 - "Invalid length of IP Address" - "Expert Info" ↵Alexis La Goutte1-2/+2
shows a false error Wrong offset (14 -> 20) to get IP Address Legnth Issue Reported by Rui Bug: 10873 Change-Id: Ib7aa80ac78028a2c8d548f4030278166be9ed0cc Reviewed-on: https://code.wireshark.org/review/6657 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19BGP: fix field bgp.evpn.nlri.mpls_ls is not of type FT_STRING, FT_STRINGZ, ↵Alexis La Goutte1-1/+1
or FT_STRINGZPAD Change-Id: Ida14611dee9eb01e1eab13a96c15ab3d759ed1cd Reviewed-on: https://code.wireshark.org/review/6656 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19Don't mix declarations and code - it's not legal C90.Guy Harris1-1/+2
Change-Id: I1a89c729255560d596e4d7701468cca3e9000357 Reviewed-on: https://code.wireshark.org/review/6655 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19ZigBee: fix dissection of epoch time in OTA clusterPascal Quantin1-0/+1
Bug: 10872 Change-Id: I25275ecb76cc03774ab210fb33a3bef5b1982585 Reviewed-on: https://code.wireshark.org/review/6653 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-19On my system NSIS installs in the path defined in environment variableAndersBroman1-0/+2
ProgramFiles(x86)=C:\Program Files (x86) Add that to the locations where we look for it. I couldn't use ProgramFiles(x86) as a constant so put the path verbatim. Change-Id: Ibad9d4e2544e5b3924e10c68f02e072b0012226f Reviewed-on: https://code.wireshark.org/review/6651 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-19Updated company name from Nokia Siemens Networks to Nokia Solutions and ↵Josip Medved7-22/+22
Networks. Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a Reviewed-on: https://code.wireshark.org/review/6647 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-01-19JSMN : fix typo (it will be fix make distcheck)Alexis La Goutte1-1/+1
Change-Id: I188be77b77a5a52b233d482d6d8ea8b97adc00db Reviewed-on: https://code.wireshark.org/review/6649 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19Fix make dist on Ubuntu buildbotAlexis La Goutte1-2/+1
Change-Id: Id3a5ed08fb8b7c721f8eeabbba723a9de0d47b0f Reviewed-on: https://code.wireshark.org/review/6648 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19epl: Rework POWERLINK (EPL) dissectorJosef Baumgartner1-191/+401
With this patch we want to enable a better support of POWERLINK as a protocol for people who have to perform network diagnostics using analyzing tools. Up until now, the main tool used was Omnipeek. Now wireshark will be used more and more, due to the new extcap infrastructure, which supports debug tools to be added as capture devices. To better facilitate that change, we have adapted the textual representation of the Omnipeek dissector for POWERLINK, as it allows for a faster and simpler diagnosis routine. Additionally the name of the protocol has been changed to it's correct name "POWERLINK" as this is the official name used by EPSG for describing the protocol. Changelog: - Add error code definitions and string values. - Change name for protocol column to POWERLINK which is more commonly used than EPL. - Reformat output in info column to look like output the output of the POWERLINK plugin for Omnipeek. This facilitates the transition to Wireshark. The added information and changed output improves the debugging of POWERLINK nerworks. Change-Id: I795e2487f2ae7af6b90c29366a1843c9fabffa85 Reviewed-on: https://code.wireshark.org/review/5581 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-19JSON dissector changed into heuristic dissector.Dario Lombardo11-67/+693
To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT). TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part. HPFEEDS dissector has also been changed in order to leverage the new json dissector. Bug: 10834 Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978 Reviewed-on: https://code.wireshark.org/review/6350 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19TCAP: support dialogue confirmationLuke Mewburn4-119/+115
TCAP permits the changing of the originating address on the first backwards continue (i.e. the establishment of the dialogue). See ITU-T Q.771 (06/97) clause 3.1.2.2.2.2 Confirmation of the dialogue. In practice, a BEGIN replied to with an END can also exhibit this behaviour. For example, a BEGIN from GT A TID TA -> GT B, and the reply CONTINUE from GT B2 TID TB -> GT A TID TA. To support this, only support a single address hash in tcaphash_begin_info_key_t and tcaphash_end_info_key_t. The match of the first CONTINUE should find the appropriate tcaphash_begin and create the appropriate tcaphash_end entries. Also fix compile warning with DEBUG_TCAPSRT. Bug: 10841 Change-Id: Ibe75e3940e757727357b20be10f9c195c5888fdd Reviewed-on: https://code.wireshark.org/review/6446 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19Skinny: packet-skinny.cDiederik de Groot3-48/+95
Changes: Number of small changes to the xml file: - some fields being connected to the wrong message version - some header field naming Change-Id: I062c31777a4193de3d5c44b0ba733dd9d1702352 Reviewed-on: https://code.wireshark.org/review/6602 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19RTP: Parse problem in dissect_rtp_hext_rfc5215_onebyteSergio Moreno Mozota1-0/+6
some commercial IPTV streamers send bogus info in the extension headers, add some sanity check to skip the erroneous bytes. Bug: 10513 Change-Id: I6f20073a00ed0f791fa99701534360d304060053 Reviewed-on: https://code.wireshark.org/review/6606 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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-01-19Convert OID APIs to use wmem.Michael Mann34-254/+322
There are a few oid functions that are only called in oids_test.c. I'll presume the APIs are used in proprietary dissectors rather than just remove them. Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f Reviewed-on: https://code.wireshark.org/review/6592 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19Eliminate ep_strdup(), as it's no longer used.Guy Harris4-47/+0
Also, remove some no-longer-existent functions from checkAPIs.pl. Change-Id: I2bf11e3ec03a34f9e89d58d560e340d76fd3ddc1 Reviewed-on: https://code.wireshark.org/review/6645 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19smpp: Prevent crash if invalid date/time field.Bill Meier1-4/+15
gmtime()/localtime() can return NULL; Bug 10868 Change-Id: I496bab62555c7741b3d159726e74a3d14c4b51cb Reviewed-on: https://code.wireshark.org/review/6644 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-18Reflect the disappearance of the seasonal allocator.Guy Harris1-2/+0
Change-Id: I1c76bf9eed516aa9afbc04b1b9236a04b0b1988c Reviewed-on: https://code.wireshark.org/review/6643 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18This currently requires emem.h.Guy Harris1-0/+1
Change-Id: I55cca8de9be07fbec4e771c0f6d50075fc75bef8 Reviewed-on: https://code.wireshark.org/review/6642 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18[Qt] Run windeployqt for Qt versions greater than 5.2AndersBroman1-1/+1
Change-Id: I3c7e7ed35ffead280c1ac394a4ef8172a89fe3a6 Reviewed-on: https://code.wireshark.org/review/6622 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-18Put back ep_alloc0(), accidentally deleted in the removal of the se_ stuff.Guy Harris1-6/+7
(The se_ stuff wasn't as contiguous as I thought.) Also fix some comments to no longer refer to #defines for se_ stuff. Change-Id: Ibc53e6f0f135bee9795f98550d5242e8e58afb16 Reviewed-on: https://code.wireshark.org/review/6641 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18This file currently does need emem.h.Guy Harris1-0/+5
Change-Id: I27e709470d92d4be32ae42a3f4672f2070eaf65e Reviewed-on: https://code.wireshark.org/review/6639 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18Nobody uses se_ allocations, so remove the code for them.Guy Harris5-316/+4
Don't check for se_ routines in checkAPIs; the failure to compile or link will suffice to catch attempts to use them. Update comments in another test script to reflect the disappearance of the session allocator. Change-Id: If50d953c7130f48b696bc2dd9d327bea2af49bd4 Reviewed-on: https://code.wireshark.org/review/6638 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18Remove a couple more apparently-no-longer-necessary emem.h includes.Guy Harris2-2/+0
Change-Id: I007a904613653b60a5b1a4fdc8261bc1480e41c6 Reviewed-on: https://code.wireshark.org/review/6637 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18Update some comments to reflect reality.Guy Harris10-24/+29
Get rid of references to ep_ and se_ allocation in code that now uses wmem allocation instead. Fix API documentation of conversation_table.h routines to reflect that as well - some APIs changed to pass wmem scopes. Also, zbee_sec_key_hash() now takes the output buffer as an argument and just returns it, and nobody actually uses the return value, so change it to return void. Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a Reviewed-on: https://code.wireshark.org/review/6636 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18Replace the last THROW ep_ calls with wmemEvan Huus1-13/+15
They (should) all be strictly within the context of dissection, so can just become packet_scope. Change-Id: Iaaa733628132f3ee3f1597f3df956e44080734f6 Reviewed-on: https://code.wireshark.org/review/6631 Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-18replace DISSECTOR_ASSERT ep strings with wmemEvan Huus1-16/+24
the DISSECTOR_ASSERT macro and friends are all guaranteed to be called within the scope of a dissection, so they are safe to replace with wmem_packet_scope. Change-Id: I2684fb902da78d50aca5f4644df66c060caff625 Reviewed-on: https://code.wireshark.org/review/6629 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-18Remove some apparently-unnecessary includes of emem.h.Guy Harris24-34/+0
Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80 Reviewed-on: https://code.wireshark.org/review/6635 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18CMake: Copy data files to the run directory.Gerald Combs2-39/+191
Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 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-01-18proto.c: Update some comments to reflect realityBill Meier1-7/+8
Change-Id: I0f82666cb233688d94d6f3a2c45d7490a7f79bec Reviewed-on: https://code.wireshark.org/review/6634 Reviewed-by: Bill Meier <wmeier@newsguy.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 02:41:57 +0000