path: root/wsutil
AgeCommit message (Collapse)AuthorFilesLines
2017-05-11Put the HAVE_REMOTE hack into wsutil/wspcap.h, and include that file.Guy Harris2-1/+49
Have a header file that defines HAVE_REMOTE if HAVE_PCAP_REMOTE is defined, and then includes pcap.h. Replace all other includes of pcap.h, and the definition of HAVE_REMOTE, with includes of that file. Check for anything other than wspcap.h including pcap.h in checkAPIs.pl. Change-Id: I3cbee8208944ad6f006f568b3fe3134e10b2a883 Reviewed-on: https://code.wireshark.org/review/21605 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-04Add g_get_monotonic_time() to glib-compat and useMartin Mathieson2-0/+15
Change-Id: If41dab19692516270e8b4bcf1a8a954bb8dc3ccc Reviewed-on: https://code.wireshark.org/review/21480 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-19Fix memory leak in create_persconffile_profileMax Dmitrichenko1-0/+3
found by valgrind Change-Id: I15aef9d78dffac44e36849349dc57b4b36f23de1 Reviewed-on: https://code.wireshark.org/review/21228 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-18Check the result of localtime().Guy Harris1-2/+6
Unlikely to fail, but it squelches CID 1398220. Change-Id: I0e40146f0a32c1082e84052c6b3e382fe6a15ae7 Reviewed-on: https://code.wireshark.org/review/21177 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-08Clean up handling of enabled/disabled protocols/heuristic dissectors.Guy Harris7-122/+146
Add a "report a warning message" routine to the "report_err" code in libwsutil, and rename files and routines appropriately, as they don't only handle errors any more. Have a routine read_enabled_and_disabled_protos() that reads all the files that enable or disable protocols or heuristic dissectors, enables and disables them based on the contents of those files, and reports errors itself (as warnings) using the new "report a warning message" routine. Fix that error reporting to report separately on the disabled protocols, enabled protocols, and heuristic dissectors files. Have a routine to set up the enabled and disabled protocols and heuristic dissectors from the command-line arguments, so it's done the same way in all programs. If we try to enable or disable an unknown heuristic dissector via a command-line argument, report an error. Update a bunch of comments. Update the name of disabled_protos_cleanup(), as it cleans up information for disabled *and* enabled protocols and for heuristic dissectors. Support the command-line flags to enable and disable protocols and heuristic dissectors in tfshark. Change-Id: I9b8bd29947cccdf6dc34a0540b5509ef941391df Reviewed-on: https://code.wireshark.org/review/20966 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris6-11/+11
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-28wsutil: fix a NULL pointer dereference when there is a single plugin registeredPascal Quantin1-16/+6
Rework loop to avoid dereferencing a NULL pointer. Bug introduced in g6d79055 Change-Id: I88a9f2d045b633cc2365ff6ce939f3315e7d42cc Reviewed-on: https://code.wireshark.org/review/20751 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>
2017-03-16Add support for verifying CIP Safety CRC values.Michael Mann6-0/+281
Change-Id: I44f7ff6980f27b1a0d4199a91f9b217aec7e4652 Reviewed-on: https://code.wireshark.org/review/20557 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>
2017-03-10Replace aes.c and des.c by Libgcrypterikdejong8-1831/+33
Follow-up of https://code.wireshark.org/review/20095 Rewritten functions: - crypt_des_ecb crypt_des_ecb verified against previous crypt_des_ecb implementation with 4294967295 random keys and input buffers from /dev/random as I cannot find a suitable pcap which uses DES Change-Id: I21ec2572451e0ded4299ffadd8dd687817bc6318 Reviewed-on: https://code.wireshark.org/review/20429 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-02Rewrite dissectors to use Libgcrypt functions.Erik de Jong14-1734/+70
As discussed on the mailinglist, rewriting dissectors to use Libgcrypt functions as Libgcrypt will be mandatory after change 20030. Removal of following functions: - crypt_md4 - crypt_rc4* - aes_cmac_encrypt_* - md5_* - sha1_* - sha256_* Further candidates: - aes_* - rijndael_* - ... Added functions: - ws_hmac_buffer Added const macros: - HASH_MD5_LENGTH - HASH_SHA1_LENGTH Changes on epan/crypt/* verified with captures from https://wiki.wireshark.org/HowToDecrypt802.11 Changes on packet-snmp.c and packet-radius.c verified with captures from https://wiki.wireshark.org/SampleCapture Changes on packet-tacacs.c verified with capture from http://ccie-in-3-months.blogspot.nl/2009/04/decoding-login-credentials-regardless.html Change-Id: Iea6ba2bf207cf0f1bf2117068fb1abcfeaafaa46 Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20095 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-26wsutil: fix bugs in plugins_cleanup().Dario Lombardo1-11/+10
If plugin_list was NULL, plugin_types didn't get cleaned. Add test and set of open_info_arr. Change-Id: I7669e3ba86039fb2b26ff2da64f51896053c5e68 Reviewed-on: https://code.wireshark.org/review/20195 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-25Fix compilation without plugins:Jakub Zawadzki1-0/+2
filesystem.c: In function ‘free_progdirs’: filesystem.c:2209:12: error: ‘plugin_dir’ undeclared (first use in this function) g_free(plugin_dir); Change-Id: Ib52b86d41be79b8ed7e42f5fdfaddcae6b0ca5c8 Reviewed-on: https://code.wireshark.org/review/20270 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-22Only do save_errno = errno and errno = save_errno around g_free();Guy Harris1-7/+5
There is *no* need to do it around an assignment statement. (We *probably* don't need to do it around g_free(), but better safe than sorry - maybe some memory allocator makes system calls to hand regions of the address space back.) Change-Id: Ib57540cc36b505aadf4a5e8885b9a744a35b1f75 Reviewed-on: https://code.wireshark.org/review/20236 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-21Fix a double free.Gerald Combs1-1/+3
In create_persconffile_profile, pf_dir_path_copy needs to be allocated separately since the subsequent call to get_dirname is destructive. Add back a call to g_strdup. This should hopefully fix a crash in the Win32 buildbot. Change-Id: I591b5845032c9b8a5324bf6ac60fc43d1e92ac2e Reviewed-on: https://code.wireshark.org/review/20231 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-20Add some glib functions not available in older glibsAndersBroman4-0/+112
Change-Id: I6526d799447a3b6c0b9bb42f8d0f8c3415299ed0 Reviewed-on: https://code.wireshark.org/review/20158 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-19Clean up some memory leaks in wsutil/filesystem.cMichael Mann2-49/+54
The fixes involve functions always returning a string that needs to be freed by the caller. That way the static string pointers within the functions don't end up leaking at program end. Change-Id: I35a8dc37536c2927d88f33217887f62efafcc8ca Reviewed-on: https://code.wireshark.org/review/20175 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-18plugins: free list on cleanup.Dario Lombardo1-0/+9
Change-Id: Idff606297f72238f8539cb00ea394ee80fcb502c Reviewed-on: https://code.wireshark.org/review/20074 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-18epan/wsutil: free memory on exit.Dario Lombardo1-1/+11
Change-Id: I1cf3a4ce3b21b2e10887cbef5576e5e028e55bab Reviewed-on: https://code.wireshark.org/review/20052 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-18wsutil: remove leaks from filesystem and plugins code.Dario Lombardo4-1/+44
Change-Id: Iac2805c0130bd2ba6cdb3c9dd997050274d58d99 Reviewed-on: https://code.wireshark.org/review/20020 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-14Qt: Reset Default profile supportStig Bjørlykke1-0/+34
Add support for resetting the Default profile by deleting it in the Profile Dialog. All profile files will be deleted and all other files will be kept. Change-Id: I795a6db3ee7b2c29e7aba461183e6cc411798b75 Reviewed-on: https://code.wireshark.org/review/20097 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-02-14wiretap: add cleanup routine.Dario Lombardo2-0/+12
The cleanup routine has been added to exit section of the applications. Those which required a exit restyle have been patched as well. Change-Id: I3a8787f0718ac7fef00dc58176869c7510fda7b1 Reviewed-on: https://code.wireshark.org/review/19949 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-13Make Libgcrypt a mandatory dependencyPeter Wu2-6/+0
Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-07Make sure pid_t is defined.Guy Harris1-0/+3
Just as we include <windows.h> on Windows to get HANDLE defined, include <sys/types.h> on UN*X to get pid_t defined. We don't seem to need this (yet) on the master and 2.2 branches, but it looks as if it might be necessary on the 2.0 branch. Do it everywhere. Change-Id: I9535fa9944265746d332f8dc337e42a020b503d3 Reviewed-on: https://code.wireshark.org/review/19998 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-05pint(.h): Add Modelines and fix indent (use spaces)Michael Mann1-10/+23
Change-Id: Icadbf65ad186c775b2a0ca8596d5bf4ba66e4c68 Reviewed-on: https://code.wireshark.org/review/19873 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-02wsutil/sober128: remove unused macros and functionsPeter Wu2-429/+4
Removed unused macros/functions that are apparently imported from LibTomCrypt, only LOAD32L and STORE32L are needed. Remove code that tries to distinguish between little/big endian, since WORDS_BIGENDIAN was never defined, this would never have worked on big endian anyway. Remove the special ROR "optimization" for GCC on i386, modern compilers are able to optimize it to exactly the same thing. The generic LOAD32L/STORE32L macros are less optimized (as can be seen in the generated code), but this was not noticable in the mean running time. Tested with the packet capture from bug 3232, the result is the same: tshark -ocorosync_totemnet.private_keys:example.com -r corosync-totemsrp--key:example.com--2nodes.pcap -Vx Bug: 13368 Change-Id: I59bf27d7dd990bbcd5ad34a1797f4a6c8a04512d Reviewed-on: https://code.wireshark.org/review/19894 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-01-29(D)TLS: fix type of record sequence numberPeter Wu1-0/+11
The record sequence number is 64-bit, not 32-bit. This applies to all SSLv3/TLS/DTLS versions. Without this fix, after about four million records, the wrong MAC is calculated (for TLS 1.2) or decryption will fail (for TLS 1.3). Change-Id: I05e5e8bc4229ac443a1b06c5fe984fb885eab1ca Reviewed-on: https://code.wireshark.org/review/19824 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-01-26Clean up some UN*X-vs-Windows socket issues.Guy Harris2-0/+82
Have a wsutil/socket.h file, for inclusion by everything that uses sockets, that contains the UN*X-vs-Windows #includes and #defines to hide some UN*X-sockets vs. Winsock API differences. That stuff mostly comes from from extcap/extcap-base.h; have that file just include wsutil/socket.h rather than defining that stuff itself. Include it in sharkd_daemon.c. Use socklen_t for the size of things to pass to bind() as the last argument; wsutil/socket.h defines it as int on Windows. Ignore sharkd in Git. Change-Id: I3f2171b7aa613717f52305f62bfd7d43e0172dc6 Reviewed-on: https://code.wireshark.org/review/19796 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-25Add sharkd - daemon variantJakub Zawadzki2-0/+14
sharkd listens on UNIX socket and allows external clients to run commands like: loading file, analysing frames or running TAP(s). Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766 Reviewed-on: https://code.wireshark.org/review/18208 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-01-01Happy new Year 2017 !Alexis La Goutte1-1/+1
Change-Id: I8ae8a1fdc8d0df0779ef119c527f41dac9e0dbdb Reviewed-on: https://code.wireshark.org/review/19476 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>
2016-12-20Qt+Win32: Make software updates more friendly.Gerald Combs2-313/+323
Add WinSparkle can_shutdown and shutdown_request callbacks which are called prior to running the installer. Reject updates when we have unsaved information. Add notes about possible improvements. Ping-Bug: 9687 Ping-Bug: 12989 Change-Id: Ia126244b311417aa3105ea8136f186adc2745445 Reviewed-on: https://code.wireshark.org/review/19244 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: Anders Broman <a.broman58@gmail.com>
2016-12-20cmake,wslua,wsutil: load files from run/ instead of source treePeter Wu2-2/+20
Fixes Lua on macOS, tested with an out-of-tree build: WS_BIN_PATH=$PWD/run ../wireshark/test/test.sh -s wslua Previously programs that were ran from the build directory would load data files (radius/, diameter/, init.lua) from the source directory. Then in the case of Lua, files were loaded from the program directory ($BUILDDIR/run/init.lua on Linux) or source directory (sSOURCEDIR/epan/wslua/console.lua). On macOS, this does not work for Lua since files are installed into $BUILDDIR/run/Wireshark.app/Contents/Resources/share/wireshark/init.lua instead. Since CMake always copies data files (radius, console.lua, etc.) into the build directory, make get_datafile_dir() return this "run" directory instead. Change-Id: If97d2f5686271caf9ad4d4e4fc58e902dc592a98 Reviewed-on: https://code.wireshark.org/review/19330 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-16Improve some unit strings with unicode charactersJoão Valverde1-0/+1
Change-Id: Ic6812fd266832743962e020cfc8f0af2d4742fdf Reviewed-on: https://code.wireshark.org/review/19308 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: João Valverde <j@v6e.pt>
2016-12-15Save RTP audio to file: RTP Stream Analysis dialog allows save audio for non ↵Jiri Novak1-0/+3
G.711 codecs and mixed codecs - spaghetti code for save was split into separate functions - code saves G.711 only, all other codecs are saved as silence with correct duration - code is ready to include other codecs - code supports 8000 Hz sampling rate only, other rates are rejected with warning - bidirectional stream (forward and reverse) creates stereo .au file - output is based on timestamps in RTP streams - save operation is slower than before because it is set of seek() - one per each codec sample - code allows align of save audio: - as it is - each stream is saved from its beginning, no aling - to start of each other - later stream is prepended with silence - align saved audio to beginning of capture file - each stream is prepended with silence - save to raw works correctly now - only payload is saved - old code was inserting G.711 silence time to time to raw data Bug: 13242 Change-Id: I74d02a1cc1c75acf9ffe930d078c00a0555cbfb6 Reviewed-on: https://code.wireshark.org/review/19245 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-12-14Skip loading the Nordic BLE Sniffer dll on WIN32Stig Bjørlykke1-1/+8
The dissector for the Nordic BLE Sniffer was added as internal in g7844a118, so ensure we don’t load this third party dll on WIN32. Change-Id: I74c200d42793f3c1e764bc9f6c3a9a795d38a5a7 Reviewed-on: https://code.wireshark.org/review/19259 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-12-09ui: move filesystem code to wsutil/filesystem.cDario Lombardo2-0/+35
This function can be used by code outside ui (eg. extcap). Ping-Bug: 13218 Change-Id: Ic11f7acebefeaf777692df044ebff9b1bc387aa3 Reviewed-on: https://code.wireshark.org/review/19178 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-12-05Clean up initialization code for programs.Guy Harris1-2/+7
Make the init_progfile_dir() call unconditionally, even if plugins aren't supported, as that doesn't necessarily mean nobody uses the directory containing the executable. Report the error the same way in all programs, and free the error string after we're finished with it. Make the error - and the comment before the code - reflect what init_progfile_dir() is actually doing (the goal is to get the full pathname of the directory *containing* the executable; that's generally done by getting the pathname of the executable and stripping off the name of the executable, but that's won't necessarily always be the case). Also note for TShark that we won't be able to capture traffic, just as we do for Wireshark (if we don't have the pathname of the program file, we don't have a pathname to use to find dumpcap). Have the plugin scanner just fail silently if we weren't able to get the plugin directory path, so we don't have to worry about calling it if init_progfile_dir() fails. Clean up white space while we're at it. Change-Id: I8e580c719aab6fbf74a764bf6629962394fff7c8 Reviewed-on: https://code.wireshark.org/review/19076 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-05Update a comment to reflect current reality.Guy Harris1-11/+15
Change-Id: Ied84e0363161ebc42c8cf24e7ade4b1b4e536448 Reviewed-on: https://code.wireshark.org/review/19074 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-02Make sure config.h is included before inet_addr.h.Guy Harris1-2/+2
Otherwise, _FILE_OFFSET_BITS might be defined by a header file included by inet_addr.h before it gets defined by config.h. Change-Id: I5987b3f1493b81fd2d427d9792b9606117b255d0 Reviewed-on: https://code.wireshark.org/review/19018 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-15Add more information about UTF 8 in our source code.Gerald Combs1-3/+10
Change-Id: I81d41fdc1aa66dd904160508c4a2e634337b5ba0 Reviewed-on: https://code.wireshark.org/review/18833 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-03wsutil: add initializer (found by clang ccc).Dario Lombardo1-1/+1
Warning: wireshark/wsutil/strtoi.c:113:1: warning: The left operand of '<' is a garbage value DEFINE_WS_STRTOI_BITS(32) ^~~~~~~~~~~~~~~~~~~~~~~~~ wireshark/wsutil/strtoi.c:83:12: note: expanded from macro 'DEFINE_WS_STRTOI_BITS' if (val < 0) \ ~~~ ^ wireshark/wsutil/strtoi.c:114:1: warning: The left operand of '<' is a garbage value DEFINE_WS_STRTOI_BITS(16) ^~~~~~~~~~~~~~~~~~~~~~~~~ wireshark/wsutil/strtoi.c:83:12: note: expanded from macro 'DEFINE_WS_STRTOI_BITS' if (val < 0) \ ~~~ ^ wireshark/wsutil/strtoi.c:115:1: warning: The left operand of '<' is a garbage value DEFINE_WS_STRTOI_BITS(8) ^~~~~~~~~~~~~~~~~~~~~~~~ wireshark/wsutil/strtoi.c:83:12: note: expanded from macro 'DEFINE_WS_STRTOI_BITS' if (val < 0) \ ~~~ ^ 3 warnings generated. Change-Id: I9eef0f2c0d4500531655a8b43509205a1f4e0684 Reviewed-on: https://code.wireshark.org/review/18640 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-11-02Move Base32_encode from packet-fc00.c to wsutil (as ws_base32_decode)Michael Mann4-0/+143
There could be some reuse out of it, so but it with the rest of the general utilities. Change-Id: I404c135b933660a82678510b9ca2701985c5632a Reviewed-on: https://code.wireshark.org/review/18589 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-10-27wsutil: add check for input pointers to ws_strtoi functions.Dario Lombardo1-0/+14
Change-Id: I7353a3b00392aa606fad04ef76e8b18ffbabbf5e Reviewed-on: https://code.wireshark.org/review/18449 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: Dario Lombardo <lomato@gmail.com>
2016-10-22wsutil: add statements for c++ calls.Dario Lombardo1-0/+8
Change-Id: I082eb462b0a6ce77f9ca82c51d79d65516c92b53 Reviewed-on: https://code.wireshark.org/review/18401 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22More checks for localtime() and gmtime() returning NULL.Guy Harris1-0/+1
And some comments in the case where we're converting the result of time() - if your machine's idea of time predates January 1, 1970, 00:00:00 UTC, it'll crash on Windows, but that's not a case where a *file* can cause the problem due either to a bad file time stamp or bad time stamps in the file. Change-Id: I837a438e4b875dd8c4f3ec2137df7a16ee4e9498 Reviewed-on: https://code.wireshark.org/review/18369 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-11dumpabi: Fix log paths.Gerald Combs1-1/+1
Make sure the paths we pass to "cat" and "abi-compliance-checker -log-path" match. Change-Id: Ie68b445b9d92d85c0ed1eb508a78c0bcc960d061 Reviewed-on: https://code.wireshark.org/review/18156 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-06jsmn(.h): fix warning: '@param' command used in a comment that is not ↵Alexis La Goutte1-3/+3
attached to a function declaration [-Wdocumentation] Change-Id: Ia03fc0d1d0d4af430055f2ae3c66416922b62fd1 Reviewed-on: https://code.wireshark.org/review/18009 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-01wsjsmn(.h): fix no newline at end of file [-Wnewline-eof]Alexis La Goutte1-1/+1
Change-Id: If99fa78b20cdc9d2180652f7e4331fe2f8aacbff Reviewed-on: https://code.wireshark.org/review/18008 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-09-30wsutil: split libjsmn.Dario Lombardo6-143/+202
The libjsmn was imported into the tree and enhanced with a new function. This change splits it into the "original" libjsmn and an addictional module wsjsmn that contains the new function. This will make easier to port within the tree future versions of the library. Change-Id: I3f1caa91bee462e0767e5e18d0b6a10f0b1cad32 Reviewed-on: https://code.wireshark.org/review/17963 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-30cmake: make WERROR_COMMON_FLAGS a normal stringPeter Wu1-23/+8
Instead of checking for the boolean "FALSE", just set an empty string. This avoids the need to check for WERROR_COMMON_FLAGS before using it. The transformation is the same for all files, remove "if (WERROR_COMMON_FLAGS)" and "endif()", reindent and add quotes (since we have a string here and not a list). Modelines have been added where missing. Change-Id: I0ab05ae507c51fa77336d49a99a226399cc81b92 Reviewed-on: https://code.wireshark.org/review/17997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com>
2016-09-23Show memory info on macOS and LinuxStig Bjørlykke1-0/+3
Added support for showing memory information (amount of physical memory) in version information on macOS and Linux. Moved CPU info and memory info right after OS version info. Change-Id: I305d1b7d015d50ed137f2c80b31d698e9315d735 Reviewed-on: https://code.wireshark.org/review/17884 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>