aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil
AgeCommit message (Collapse)AuthorFilesLines
2018-04-16glib-compat is no longer used - it provided only code for versions < 2.32Joerg Mayer4-187/+0
Change-Id: I17e2c221cc40dbe9328458db9f17480c05bdc276 Reviewed-on: https://code.wireshark.org/review/26972 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-04-08ws_pipe: Zero an array.Gerald Combs1-0/+2
Make sure we zero-initialize pipeinsts, otherwise ConnectNamedPipe will have indeterminate behavior according to the MSDN documentation for the OVERLAPPED structure. Change-Id: I38d9680cf01b0a8f9e566a85a7a330f6c0aa9a48 Ping-Bug: 14532 Reviewed-on: https://code.wireshark.org/review/26784 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-05Tweak ws_cpuid so that Valgrind is happy.Darius Davis1-1/+2
Valgrind considers the "cpuid" instruction to always depend on inputs from eax and ecx, even though it's only a subset of values of eax for which ecx is relevant. If ecx is undefined when cpuid is executed, the outputs of cpuid will be considered undefined. Instead of suppressing the resulting uninitialised-value warning (the suppression for which is now out-of-date anyway, now that register_all_protocols is moved to a worker thread), let's simply set ecx to zero in ws_cpuid. Testing done: Built Wireshark on Linux amd64. Before this change, running "tools/valgrind-wireshark.sh ./test/captures/dhcp.pcap" with valgrind-3.12.0.SVN on Debian 9.4 amd64 would yield the following Valgrind error: ==2416== Thread 2: ==2416== Conditional jump or move depends on uninitialised value(s) ==2416== at 0xACB8B22: ws_mempbrk_sse42_compile (ws_mempbrk_sse42.c:58) ==2416== by 0x74F4960: register_all_protocols_worker (register.c:37) ==2416== by 0xB1403D4: g_thread_proxy (gthread.c:784) ==2416== by 0xD438493: start_thread (pthread_create.c:333) ==2416== by 0xB4CAACE: clone (clone.S:97) With the change, the above message is gone. Inspected the disassembly of function ws_cpuid, and it looks sane -- just an added "xor ecx, ecx" at the top. Change-Id: I2fb382309cac234c400286a6e9fac7d922912c63 Reviewed-on: https://code.wireshark.org/review/26733 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-25Clean up REPORT_DISSECTOR_BUG().Guy Harris2-5/+14
Have it take a format and argument list as arguments, and have the formatting done inside the reporting code. That way, we're not relying on any particular wmem scope working. If WIRESHARK_ABORT_ON_DISSECTOR_BUG is set, try to add the message to the crash information (currently only supported in macOS), and print it to the standard error, before crashing. We won't necessarily have a usable crash dump to analyze, so we can't rely on that to find the cause of the crash. Ping-Bug: 14490 Change-Id: I2b39169c45c84f2ada31efa1d413bd28c140f8f4 Reviewed-on: https://code.wireshark.org/review/26643 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-23Include alloca.h if we have it.Guy Harris1-0/+8
Bug: 14552 Change-Id: I799691f7f33ca56748ed4e51d7d548f37769837b Reviewed-on: https://code.wireshark.org/review/26611 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-21rsa: fix memleak and accept keys from certain PKCS#12 filesPeter Wu1-12/+7
The "bag" was not deallocated when the key is successfully loaded. Parse all bag elements rather than clearing the bag after the first iteration (this restores previous behavior). Change-Id: Ib52da6586f7435d18fa5b0660e7771436544b634 Fixes: v2.5.0rc0-613-gf63b68f707 ("Further cleanups.") Reviewed-on: https://code.wireshark.org/review/26481 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-03-13Windows: Conditionally set CREATE_BREAKAWAY_FROM_JOB.Gerald Combs1-4/+13
Set CREATE_BREAKAWAY_FROM_JOB only on Windows 7 and earlier. It's not needed otherwise and might fail in some cases. Change-Id: I15843b5c1ae3c352fa267228b94b6933074a07f3 Reviewed-on: https://code.wireshark.org/review/26465 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-13Get rid of trailing white space.Guy Harris1-1/+1
Change-Id: Ib03afc7a4d6203188828fdcfec2c7604365e4d0a Reviewed-on: https://code.wireshark.org/review/26467 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-13Expand a comment.Guy Harris1-4/+20
Change-Id: I154bce4901929c5f3eafa88cae2cd4ce53b28326 Reviewed-on: https://code.wireshark.org/review/26466 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-13Windows: Always assign newly-created processes to our job.Gerald Combs4-64/+97
Move ws_pipe_kill_child_on_exit to win32-utils. Add win32_create_process, which calls CreateProcess + AssignProcessToJobObject. Use win32_create_process instead of CreateProcess everywhere. Bug: 1419 Change-Id: I7a1f17dddf6a73f6973d54621f271b69311400d1 Reviewed-on: https://code.wireshark.org/review/26448 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-13Remove popcount in favor of ws_count_ones.Gerald Combs4-54/+0
Remove our popcount implementation in favor of ws_count_ones, which is our other popcount implementation. This required updating and running process-x11-xcb.pl. Change-Id: I8634c55242113b338c5b0173837c35f98b148b4f Reviewed-on: https://code.wireshark.org/review/26454 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-12Remove some unused or hard-coded header checks.Gerald Combs2-99/+0
Remove some unused checks and code found using grep -o 'HAVE_[A-Z0-9_]*' ConfigureChecks.cmake | sort -u \ | while read have_h ; do echo = $have_h ; git --no-pager grep -cl $have_h ; done Change-Id: I86bfcfdc4f60d9d7de87017a7bb00f833a79bd2c Reviewed-on: https://code.wireshark.org/review/26451 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-09Add ws_pipe_kill_child_on_exit.Gerald Combs1-3/+55
Add ws_pipe_kill_child_on_exit, which associates a child process handle with a job object that has the JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE flag set. Call it when we create a process in ws_pipe_spawn_sync and ws_pipe_spawn_async. Note that we might want to use it elsewhere. Change-Id: Ia0f6863ea4df0ab8623bb923a49da7776d83bd33 Reviewed-on: https://code.wireshark.org/review/26398 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-09GeoIP: avoid closing random file descriptorsPeter Wu1-0/+8
Previously there were three different pipe validity checks: PID != WS_INVALID_PID, PID != 0 and stdin != 0. This resulted in using/closing file descriptors which might be owned by something else. When no GeoIP databases are defined, mmdb_resolve_stop would be called to close the pipe and set PID to WS_INVALID_PID. stdin is however not cleared and future invocations would try to close the previous fd. Change-Id: I1d15da29208efb41098ee6a4edeeabf61f84c2b3 Fixes: v2.5.1rc0-466-ga1da75c554 ("Transition from GeoIP Legacy to MaxMindDB.") Reviewed-on: https://code.wireshark.org/review/26391 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-09wsutil: add CR to license.Dario Lombardo1-1/+2
Change-Id: Ibef7761410cd4d653be0d87c2bd39c040da62e08 Reviewed-on: https://code.wireshark.org/review/26385 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-03-09spdx: more licenses converted.Dario Lombardo3-52/+3
Change-Id: I8f6693108c43959e54911d35b4fbf730c59add60 Reviewed-on: https://code.wireshark.org/review/26361 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09spdx: more licenses converted.Dario Lombardo1-13/+1
Change-Id: Ia1650bc02511f7bd47fb90be91b623177f05bcbd Reviewed-on: https://code.wireshark.org/review/26337 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07Hack to fix ABI checking.Guy Harris1-0/+8
Change-Id: I20f0fd8c7dc6f5276c19735025d719a2043c803a Reviewed-on: https://code.wireshark.org/review/26346 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-02More spawned process handling updates.Gerald Combs2-10/+58
Document ws_pipe.h. Define invalid PIDs in one place. Extcap didn't use stdin before 1a0987904f. Make sure we close it. Change-Id: I7a69cd9b5137ae82435e64628a22e4d812d58f89 Reviewed-on: https://code.wireshark.org/review/26226 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-02Generalize our process spawning code.Gerald Combs2-0/+378
Move the contents of extcap_spawn to ws_pipe. Rename various extcap_* prefixes to ws_pipe_*. Open stdin when we spawn processes. Change-Id: I9286295443ee955bb6328b0ed6f945ee0bb2a798 Reviewed-on: https://code.wireshark.org/review/26216 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-01Windows: Remove cruft for unsupported versonsGraham Bloice3-68/+23
Remove all the existing LoadDLL\GetProcAddress combinations that allowed conditional Win32 API usage if supported on the running OS version. All the required functions are present in the versions we support. Change-Id: Ibc43e51cefcd1c7562d4e251784362509f224ed6 Reviewed-on: https://code.wireshark.org/review/26215 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-02-28Include <config.h> so UNICODE is defined.Guy Harris1-0/+2
All other files should do so; this file should, so that we're using the Unicode versions of Windows APIs (especially given that other files that include wsutil/unicode-utils.h will be doing so and expecting UTF-16 strings from utf_8to16_snprintf()). Change-Id: I7eccf580ab0dc504aa78b345e36e2fcda818a7c5 Reviewed-on: https://code.wireshark.org/review/26170 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-28Make sure GetModuleHandle(_T("kernel32.dll") succeeds.Guy Harris1-21/+25
If it doesn't, we're living in the Twilight Zone - that's like not finding libc/libSystem/whatever-your-UN*X-calls-it on a UN*X - but this should at least remove one complaint from Visual Studio Code Analyzer. Change-Id: Iccb568ea022ac28be962ab3fec5bccdfdf69ac13 Reviewed-on: https://code.wireshark.org/review/26165 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-24Rename airpdcap to dot11decrypt.Gerald Combs5-8/+8
Our 802.11 decryption code isn't tied to any specific product. Change the file and API names to dot11decrypt. Change-Id: I14fd951be3ae9b656a4e1959067fc0bdcc681ee2 Reviewed-on: https://code.wireshark.org/review/26058 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-22And systemd weighs in on how to find out the distribution you're on....Guy Harris1-0/+15
Change-Id: I84e957617b81b6cfad815dc84439e166c0f936b6 Reviewed-on: https://code.wireshark.org/review/25980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-20Define macros to calculate (2^N)^M, and use them in more places.Guy Harris3-0/+31
Change-Id: I4df1b35d8d2233c301f0ba9e119d012aebe9cd17 Reviewed-on: https://code.wireshark.org/review/25913 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-17The CRC8 routines don't modify the buffer; make the pointers to it const.Guy Harris2-7/+7
This lets us get rid of some casts that provoke "drops const qualifier" warnings. Change-Id: Ia7e0863bd97bc20dbbb810e13778ec78d0cf3c91 Reviewed-on: https://code.wireshark.org/review/25837 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-17Fix casts.Guy Harris1-1/+1
A gconstpointer is a "pointer to const void", so it should be cast to "pointer to const XXX". A "pointer to const pointer to plugin" is a "plugin *const *". C's declaration syntax is not one of its strong points. There's a reason why the cdecl program, and the Web site that uses it, http://cdecl.org, exists (as the tag line says, "C gibberish <-> English"), and why I used it to make sure I got this working. Change-Id: Ia29bb25d17a1255a06b4ace542643c4b494d4977 Reviewed-on: https://code.wireshark.org/review/25835 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-17Qt: Replace the toolbar extension icon.Gerald Combs1-0/+1
The QToolBar extension button icon is ugly, particularly on HiDPI displays. Replace it with a RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK. Change-Id: I8822252ff5c328acd23aad345313e7cfafdffa47 Reviewed-on: https://code.wireshark.org/review/25821 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-17Don't have CLEAN_FILES variables for the "clean" source files.Guy Harris1-5/+1
Except for the one directory that (currently) has "not yet clean" files, epan/dissectors, we don't need a separate variable to keep track of the "clean" source files. In the cases where not all files were in CLEAN_FILES, put them into the variable used to enable -Werror or its equivalent. Change-Id: Ic4119861c1d9e381adfe31e9977e1ac71d623f5b Reviewed-on: https://code.wireshark.org/review/25830 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-15Move hkdf_extract to wsgcrypt.hPeter Wu1-0/+12
HKDF-Extract is not used in TLS, but in QUIC. For reuse in OSCORE, move it to wsutil. Adjust comments slightly to emphasize precondition. Change-Id: I5105e7416037697b383ad58f62be285c2b7ab8b7 Reviewed-on: https://code.wireshark.org/review/25802 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Mališa Vučinić <malishav@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-02-12Extract HKDF-Expand from TLS 1.3 dissectorPeter Wu2-0/+55
HKDF (RFC 5869) is a standard construct used in TLS 1.3, QUIC and OSCORE, generalize it for use outside the TLS dissector. Since none of the users need the "context" (formerly "hash_value") field, remove the parameter. Change-Id: Id952de8cb3000f6f6eda844d17c78bbd3906a84d Reviewed-on: https://code.wireshark.org/review/25723 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-10musl: compile with musl libcDan Robertson1-0/+3
Ensure that wsutil/ws_pipe.c includes <sys/select.h> as as both the timeval struct and the select function are used. Change-Id: Idbd9e9a5b9cbee9977a423c32e55be81bb6425c3 Reviewed-on: https://code.wireshark.org/review/25616 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo108-108/+108
The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07Clean up the null pointer check in profile_exists().Guy Harris1-3/+10
Check only in the if (global) case, and note that it's necessary in that case; in the !global case, note why we don't have to check for a null pointer. Change-Id: I80322204ec94eb3901f7bceabccb29351794adc8 Reviewed-on: https://code.wireshark.org/review/25674 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07wsutil: Allow NULL as profile nameStig Bjørlykke1-1/+3
Using NULL as profile name indicates the Default profile and profile_exists() must not return FALSE for the Default profile. This is a regression from ge0d04a75. Change-Id: I2463a7d3e12dda794f3391d999442a303d80621c Reviewed-on: https://code.wireshark.org/review/25659 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-07wsutil: use SPDX identifiers.Dario Lombardo5-74/+9
Change-Id: I4863416ddc425b9138ffa47621eee823db9e7fda Reviewed-on: https://code.wireshark.org/review/25557 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-01base64: Adjust whitespace for readabilityStig Bjørlykke1-10/+10
Change-Id: Ibf72dddceac925521a0fec3ab0bed7ed360e7c06 Reviewed-on: https://code.wireshark.org/review/25547 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01buffer: add g_assert to all functions.Dario Lombardo1-0/+11
This pacify clang warnings as well. Change-Id: I5d61a82bfc43b93281f0d0caabcb7109c849788b Reviewed-on: https://code.wireshark.org/review/25518 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-29Avoid #ifdef'ing out translation unitsJoão Valverde3-7/+11
Change-Id: Ibef0120184ae577f11059fcaf0eaa24a32820273 Reviewed-on: https://code.wireshark.org/review/25502 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-01-28wsutil/filesystem.c: fix memory leak in init_progfile_dir()Jakub Zawadzki1-6/+0
If file wasn't found in PATH, there is a leak of path. Don't break the loop after reaching NUL character. Check for NUL character will be done in while() start condition. Found by clang. Change-Id: I0111a71853ffd485ee1096296f92de4472409c66 Reviewed-on: https://code.wireshark.org/review/25445 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-28Minor Makefile.am cleanup.João Valverde1-5/+0
Change-Id: I3670c86a695cbea00be39d0c274a5bef0ef31cbf Reviewed-on: https://code.wireshark.org/review/25501 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-01-28plugins: Remove nordic_ble.dll exceptionJoão Valverde1-10/+0
This should no longer be necessary with the sub-version directory struture. If the user is installing a DLL for a built-in plugin, an error message is appropriate. Change-Id: I80842f1ea03a08594321a674650a1373aaa48712 Reviewed-on: https://code.wireshark.org/review/25500 Reviewed-by: João Valverde <j@v6e.pt>
2018-01-28Rename plugins_scan_dir()João Valverde1-5/+5
This makes it more obvious that it is a static function. Change-Id: I7348c4326b1e388870cb6657d9c67bd1086357b0 Reviewed-on: https://code.wireshark.org/review/25499 Reviewed-by: João Valverde <j@v6e.pt>
2018-01-28Use g_str_has_suffix()João Valverde1-3/+1
Change-Id: Ida335462efdfeef88a7afb3f27caf274632ca879 Reviewed-on: https://code.wireshark.org/review/25498 Reviewed-by: João Valverde <j@v6e.pt>
2018-01-28plugins: Use per-library data structuresJoão Valverde1-55/+41
This is cleaner and allows the "duplicate plugin name check" to be performed correctly (per module and not globally). Change-Id: I2b2122495dc047af5b7043dcf020a525766b7c30 Reviewed-on: https://code.wireshark.org/review/25496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-01-16plugins: Add source tree subfolder for plugin libraryJoão Valverde1-71/+73
This allows some simplification and makes things more consistent, particularly for loading plugins from the build dir. Also fixes the issue reported here: https://www.wireshark.org/lists/wireshark-dev/201801/msg00061.html Change-Id: I0d8a000ee679172bccad546a3b0c47a79486f44d Reviewed-on: https://code.wireshark.org/review/25329 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2018-01-11Update a comment to reflect current reality.Guy Harris1-2/+2
All plugin types now have plugin_register() as the registration function, so it's an entry point for the plugin registration function, not the particular plugin type. Clean up white space while we're at it. Change-Id: I166359deac57512cb6e87b2c7388c4b25cc54e10 Reviewed-on: https://code.wireshark.org/review/25254 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-11Use an enum for plugin types.Gerald Combs2-17/+70
Make plugins.c the source of truth for plugin names. Where plugins reside and what they do are two different things, so split the plugin directory and description into two separate elements. CMake creates portable[1] builds on Windows and macOS. That is, the build-time directory layout is the same as the installation directory layout. Adjust various plugin paths macOS accordingly. [1] You have to run osx-app.sh on macOS to prepare the application bundle, but the goal is to create a directory/bundle that can be moved or copied to a different system and run in the new location. Change-Id: Icf9d02e61918fdf1404468baf52542910edf2743 Reviewed-on: https://code.wireshark.org/review/25166 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-08extcap: remove conditional compilation.Dario Lombardo1-10/+2
Change-Id: Ia54bba388755cf27a343fe6d69d244bf1ab897f9 Reviewed-on: https://code.wireshark.org/review/25186 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 09:47:28 +0000