aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-23ui: Code cleanupStig Bjørlykke27-231/+192
Fixed code layout to use common style in the file. Mostly whitespace changes. Change-Id: Id37b57717a9e26248fad07322dff09b1d1f45ac2 Reviewed-on: https://code.wireshark.org/review/13504 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-23ANSI A: get rid of a global bufferPascal Quantin1-29/+26
Change-Id: Iba66af0b3dca683c3f9cf5497ddda46469cd4695 Reviewed-on: https://code.wireshark.org/review/13506 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>
2016-01-23CMake: Produce correct plugindir for pkg-configMichal Privoznik1-1/+1
So far the plugindir variable in the pkg-config file is set like this: set( plugindir "\${libdir}/${PLUGIN_INSTALL_DIR}" ) where libdir is set to: set( libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}" ) However, PLUGIN_INSTALL_DIR already contains CMAKE_INSTALL_LIBDIR: set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/\ ${CPACK_PACKAGE_NAME}/plugins/${CPACK_PACKAGE_VERSION}") Therefore, if the pkg-config file is generated by cmake, the resulting plugindir points to: plugindir=${libdir}/lib/wireshark/plugins/2.1.0 libdir=${exec_prefix}/lib This is obviously wrong as after variable substitution the resulting path is /usr/lib/lib/wireshark/plugins/... Change-Id: I448991284d8948434311b1c0828828fd93d0baf8 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-on: https://code.wireshark.org/review/13258 Tested-by: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-23More structure assignments for nstime_t.Guy Harris3-10/+5
Change-Id: I4d320b50d7d74b6fc423014c9611a60d49c6be02 Reviewed-on: https://code.wireshark.org/review/13503 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Set the pinfo time stamps based on the frame_data time stamps.Guy Harris1-2/+2
That takes into account any time-shifting that's been done. Change-Id: Ib4c01e7b055f5ac2f1111bcbe946c6094dcb70ae Reviewed-on: https://code.wireshark.org/review/13502 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23More pinfo->fd->abs_ts to pinfo->abs_ts.Guy Harris22-68/+68
Change-Id: I70db0a345cc4c5c57c454371deb4f92f9ac4b9ac Reviewed-on: https://code.wireshark.org/review/13501 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Fix template files to refer directly to pinfo->abs_ts.Guy Harris5-23/+23
Change-Id: I10ac1ee42ba17d3faf3d76f9d4d7fe8cba8043bc Reviewed-on: https://code.wireshark.org/review/13500 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Add more fields to packet_info structure and use them.Guy Harris96-317/+327
Add fields for the absolute time stamp (and another field for a presence flag for the absolute time stamp) and the packet encapsulation for the packet. This lets us remove the field for the packet encapsulation in the frame_data structure; do so. Change-Id: Ifb910a9a192414e2a53086f3f7b97f39ed36aa39 Reviewed-on: https://code.wireshark.org/review/13499 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Use structure assignment for nstime_t.Guy Harris1-2/+1
Change-Id: Iab049e7708642a306764d80839bf0d5139889212 Reviewed-on: https://code.wireshark.org/review/13498 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Avoid inhaling fumes. Do not use near open flame.Guy Harris1-1/+1
Change-Id: I9040745b2878a9ba8a0677e19af6702c2a766ce2 Reviewed-on: https://code.wireshark.org/review/13496 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Fix handling of the byte order magic number.Guy Harris1-28/+26
Just treat it as an array of bytes. When checking for whether it's a pcapng file, also determine whether it's big-endian or little-endian. Note that reading it in *host* byte order will tell you whether it's in your byte order or byte-swapped; you have to know your byte order to know whether that means little-endian or big-endian. Have a #define for the byte-order magic number size, as all byte order magic number values must be that size, and use that as the size of the magic-number arrays. Also use a #define for the SHB block type magic number. Get rid of a now-unused expert info. (If the magic number isn't something we recognize, we don't treat the file as a pcap file, so it can never be "unknown".) Change-Id: Ic74cceac17d1490eb70a28f67cb4dbb512e031ac Reviewed-on: https://code.wireshark.org/review/13494 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Get rid of now-unused expert info.Guy Harris1-10/+0
(If the magic number isn't something we recognize, we don't treat the file as a pcap file, so it can never be "unknown".) Change-Id: I7e8bac1ebd2cbfd6d603035428274a1098ff7544 Reviewed-on: https://code.wireshark.org/review/13491 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23Fix handling of the magic number.Guy Harris1-23/+44
Just treat it as an array of bytes. When checking for whether it's a pcap file, also determine whether it's big-endian or little-endian. Note that reading it in *host* byte order will tell you whether it's in your byte order or byte-swapped; you have to know your byte order to know whether that means little-endian or big-endian. Have a #define for the magic number size, as all magic number values must be that size, and use that as the size of the magic-number arrays. Handle nanosecond timestamp resolution while we're at it. Change-Id: I4d83579d919ae9f15888afca14317631d413ca51 Reviewed-on: https://code.wireshark.org/review/13490 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-22That warning is bogus; squelch it with an otherwise-unnecessary cast.Guy Harris1-3/+10
The compiler being used for the 64-bit OS X build is buggy; throw in an otherwise-unnecessary cast to squelch its bogus warning. Change-Id: Ie2104ba861493870191530ca391a089ca3951929 Reviewed-on: https://code.wireshark.org/review/13489 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-22Try to fix compiler warnings.Guy Harris1-3/+3
Parenthesize differently and, while we're at it, don't use the useless gsize data type - C has had size_t since C89, use it. gsize's only purpose is to use in APIs defined to take gsize arguments. Change-Id: I7d68273e7e0f0e71947d3505cb283bfa216fce03 Reviewed-on: https://code.wireshark.org/review/13488 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-22Fix DIAG_OFF() and DIAG_ON() calls.Guy Harris1-2/+2
DIAG_O{FF,N} take a warning flag name *without* the "W". Change-Id: I00558e42804b9f2ec4e80fae7c739541880381ca Reviewed-on: https://code.wireshark.org/review/13487 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-22lemon (tools): Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-22/+25
Change-Id: Ica08d9372fbe3809eb078e0285cba2a49cee6b8d Reviewed-on: https://code.wireshark.org/review/13331 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-22Fix warnings for qt_ui_utils.cpp [-Wcast-qual]João Valverde1-4/+4
Change-Id: Ie1d2779d9eaf59c2f440efa096f6707375f11c6f Reviewed-on: https://code.wireshark.org/review/13443 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>
2016-01-22[iso14443] dissect two more components of the ATQBMartin Kaiser1-6/+24
Change-Id: I4fc1962a391549e880dcdf52dfa13a94d3568ea8 Reviewed-on: https://code.wireshark.org/review/13483 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-22GSM A DTAP: fix display of calling/called party BCD number in parent treePascal Quantin1-24/+22
Change-Id: I0a492d1c304c285b831f553158777843ad195c2d Reviewed-on: https://code.wireshark.org/review/13481 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-22GSM A DTAP: get rid of a global bufferPascal Quantin1-23/+21
Change-Id: Icdd58960ca2673ea19b1005c47f3b06f1165caa2 Reviewed-on: https://code.wireshark.org/review/13482 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: Michael Mann <mmann78@netscape.net>
2016-01-22sshdump: fix leak in ssh_open_remote_connection() (CID 1349731)Dario Lombardo1-10/+12
Change-Id: I55656d4600edb800fd93532345f7ea2c7fc16f7d Reviewed-on: https://code.wireshark.org/review/13466 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-22ISAKMP: Try to really fix implicit conversion warning on OSX 64 bit.João Valverde1-2/+2
Change-Id: I2cfb58fdd076a474946c3a51e522307f103d9319 Reviewed-on: https://code.wireshark.org/review/13480 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-22ISAKMP: Fix implicit conversion to shorter type.João Valverde1-1/+2
Change-Id: I6b3c20d3aa1ade39739cad560d9f27242a9c8a4a Reviewed-on: https://code.wireshark.org/review/13479 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-22CIP: Add support for Get Attributes AllMichael Mann6-223/+473
Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-22ISAKMP: Optimize loopsJoão Valverde1-58/+26
Change-Id: I2e7ae0c3d8cba4255dd725db39a02be8ecce94d8 Reviewed-on: https://code.wireshark.org/review/13469 Reviewed-by: João Valverde <j@v6e.pt> 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-01-22NFSv4.1 bugfixesTrond Myklebust1-1/+14
nfs: Fix up the SEQUENCE status flags The SEQUENCE status flags are being displayed incorrectly (after the NFSv4 operations) due to being attached to the COMPOUND tree instead of the SEQUENCE op's tree. nfs/flexfiles: Ensure that we account for the layout_flags in the offset nfs/flexfiles: Add a dissector for the optional layoutget "stats collect hint" field Change-Id: I8744254aa9f65a0b33510f2352875b01804149c2 Fixes: d892c32cc2d0 ("Eliminate proto_tree_add_text from packet-nfs.c") Fixes: 79b88aacb6d1 ("nfs: Cleanup of FlexFiles Layout Type") Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Reviewed-on: https://code.wireshark.org/review/13477 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>
2016-01-21GSM SMS: add dissection of Special SMS Message Indication IEPascal Quantin1-1/+75
Change-Id: I154c3b4c4ef7dd3a243c9df003df01807b45c095 Reviewed-on: https://code.wireshark.org/review/13475 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-21Qt: Add some window title variablesStig Bjørlykke3-5/+17
Add some variables to be used in custom window title. %P = profile name %V = version info Change-Id: I049717432a4d3523b541bb4f6f882c75abc38ddb Reviewed-on: https://code.wireshark.org/review/13419 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-21ZigBee: ZBOSS v2 traffic dump dissector.dsrsupport1-2/+78
Added ZBOSS wpan traffic dump dissector. ZBOSS stack has a debug feature: dump of traffic between stack logic and transceiver radio. Traffic dump now has TI 25xx FCS format plus ZBOSS additions: trace id, ZigBee channel, i/o direction. This is new dissector implementation. Change-Id: Ic442e73f86e0900eb729e85e31c698131c0028d5 Reviewed-on: https://code.wireshark.org/review/13435 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-01-21Revert "Diameter: Add Redknee AVPs."Jeff Morriss4-364/+2
As requested by the supplier of the data. This reverts commit ab754d6ba4c0bc6d8d00aec137d8b1e97331d1f4. Change-Id: I3f4e19a0a7f4c75da0e2e2b5a01b187692ebf0a9 Reviewed-on: https://code.wireshark.org/review/13468 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-21Update my e-mail address.Stephen Fisher2-5/+5
Change-Id: Ie215b8b8bb97d0a1be8feedd175e28283773b3f9 Reviewed-on: https://code.wireshark.org/review/13472 Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
2016-01-21Fix warning for epan/color-filters.c -[-Wcast-qual]João Valverde2-4/+4
Change-Id: I99ec380c844c597d397ec5d261d6bddac8d1999b Reviewed-on: https://code.wireshark.org/review/13449 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21[IP] IP fragment reassembly gets thrown off if there is the same packetsAndersBroman1-1/+1
with different VLAN Ids in the trace in some cases. Add VLAN Id to the ID used to identify fragments. As discussed in https://code.wireshark.org/review/#/c/13452/ this may not be a complete solution but fixes the emediate problem. Change-Id: Id418304268d2bf4d0af863de11c4db02dc0854db Reviewed-on: https://code.wireshark.org/review/13470 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-21Add VLAN ID to pinfoAndersBroman2-2/+8
I have traces where IP reassembly gets confused by multiple frames from different VLANS and ends up adding fragments from differet messages togeter after IP Identification is reused. I think VLAN ID could be useful in other places too to aviliate duplicate packet detection. Making this a separate patch while testing the usage. Change-Id: Id7c23dc52f6de2e1f2e980ec8fe61d0598500d0d Reviewed-on: https://code.wireshark.org/review/13452 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-21Add a link for LINUX_SLL values.AndersBroman1-0/+1
Change-Id: Ic45f88984af01b9705ace944a89f49f705301d21 Reviewed-on: https://code.wireshark.org/review/13467 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-21mrdisc: don't THROW() an exception from a dissectorMartin Kaiser1-6/+0
in this case, we can just continue dissecting proto_tree_add_item() will throw the exception for us if we don't have enough data Change-Id: I8c0bfa8eaff9119ae00e69601bf5f37501574044 Reviewed-on: https://code.wireshark.org/review/13462 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-21Fix warning for funnel.c [-Wcast-qual]João Valverde1-3/+3
Change-Id: Ib80b2f56ab76d72e89f6a0fbe2d0903d1029ed19 Reviewed-on: https://code.wireshark.org/review/13448 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21SDP: Fix warnings [-Wcast-qual]João Valverde1-2/+2
Change-Id: Ie61cb44976afc27b700652da0d471a4c6711756d Reviewed-on: https://code.wireshark.org/review/13446 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21XMPP utils: Don't cast away constness [-Wcast-qual]João Valverde1-2/+2
Change-Id: Iba2d88a5d44c88d2e257435fa8881a2aab2af283 Reviewed-on: https://code.wireshark.org/review/13445 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21RPC: Fix warnings [-Wcast-qual]João Valverde1-5/+5
Change-Id: I4a3b0ffd8b42c19e3f3687be6c62be56e9b76bdb Reviewed-on: https://code.wireshark.org/review/13444 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21decode_as_utils: Fix warning [-Wcast-qual]João Valverde1-2/+2
Change-Id: Ia30c3fd579a72b3bff882cb03c06de12bcd743b3 Reviewed-on: https://code.wireshark.org/review/13442 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21IMF: Don't declare 'imf_field' *name as const [-Wcast-qual]João Valverde1-3/+3
Change-Id: I9b556a0a046c3f87bf908a0315fbf4a8c2b47ae7 Reviewed-on: https://code.wireshark.org/review/13441 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21profile_name_is_valid() returns a malloced string [-Wcast-qual]João Valverde3-3/+3
Change-Id: I584cdbf6a09e818e0d14c951defdde2fc96787f3 Reviewed-on: https://code.wireshark.org/review/13440 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21Avoid returning malloced memory as const [-Wcast-qual]João Valverde9-45/+46
Change-Id: I0b2c03cbde963d13d07ef13284d85b922eec3be9 Reviewed-on: https://code.wireshark.org/review/13439 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21Add missing const qualifiers for packet-ssl.c [-Wcast-qual]João Valverde1-2/+2
Change-Id: Idb7e3e1be3f876d5953b7dc667c7bc3feceff331 Reviewed-on: https://code.wireshark.org/review/13438 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-21Define ZLIB_CONST for packet-ssl-utilsJoão Valverde1-1/+8
Change-Id: I630c8398c612ad125d8fbba53fb7c5aba32d089c Reviewed-on: https://code.wireshark.org/review/13447 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-20Qt: fix a crash when trying to open TCP stream graph on a truncated TCP packetPascal Quantin3-2/+5
Do not try to show TCP stream graph window if it was rejected in constructor Change-Id: I4d1401e2c356391ceb8c8e3d37a668fc2a9fc92f Reviewed-on: https://code.wireshark.org/review/13454 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>
2016-01-20Qt: ensure to call destructor when closing a few QDialog windowsPascal Quantin3-0/+3
Change-Id: I10d2a610e852fdc2f38b84e561f04783af0d612e Reviewed-on: https://code.wireshark.org/review/13453 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-20HTTP: fix Control flow issues (UNREACHABLE) reported by Coverity ( CID 1348060)Alexis La Goutte1-1/+0
Change-Id: I1e9b32e30844438419c9aa839b3fcd6c0c88835d Reviewed-on: https://code.wireshark.org/review/13459 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 13:28:50 +0000