Commit Graph

27 Commits

Author SHA1 Message Date
Gerald Combs a1da75c554 Transition from GeoIP Legacy to MaxMindDB.
MaxMind is discontinuing its legacy databases in April in favor of
GeoIP2, which use a newer database format (MaxMind DB). The reference C
library (libmaxminddb) is available under the Apache 2.0 license which
isn't quite compatible with ours.

Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin
and prints resolved information on stdout. Place it under a liberal
license (MIT) so that we can keep libmaxminddb at arm's length. Add
epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it
via stdio.

Migrate the preferences and documentation to MaxMindDB.

Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the
geographic coordinate fields to FT_DOUBLEs.

Bug: 10658
Change-Id: I24aeed637bea1b41d173270bda413af230f4425f
Reviewed-on: https://code.wireshark.org/review/26214
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-06 18:02:21 +00:00
Gerald Combs f529ab5d0a Remove the endpoint "Map" feature.
Remove the endpoint map and its button from the Qt and GTK+ UIs. It
depends on GeoIP Legacy for coordinate information and those databases
are being deprecated in favor of MaxMind DB. We *could* upgrade the code
to use mmdbresolve, but according to
https://dev.maxmind.com/geoip/geoip2/geolite2/ they're also going to
remove coordinate information from GeoLite2:

"In addition, in 2019, latitude and longitude coordinates in the
 GeoLite2 databases will be removed.* Latitude and longitude coordinates
 will continue to be provided in GeoIP2 databases. Please check back for
 updates."

Change-Id: I43e1593d282a0f1aae897b1f4724117d1496b21e
Reviewed-on: https://code.wireshark.org/review/26229
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-02 21:59:21 +00:00
Guy Harris c3c053ba1c Get rid of the ipmap.html that got dropped into Contents/MacOS.
Change-Id: Ieb94ca78a92fc5369fe3b396373c2f7a31d8894a
Reviewed-on: https://code.wireshark.org/review/26072
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-23 22:17:26 +00:00
Guy Harris 53744af182 The DOCSIS dissector isn't a plugin any more, either.
Change-Id: Ibd4b775af335a34ec27efe7454a460cd47720954
Reviewed-on: https://code.wireshark.org/review/26071
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-23 22:14:06 +00:00
Guy Harris 79d1ac994f Revert "Another change required for that."
This reverts commit 3cfa4f7602.

Nope, *not* needed, and not wanted, either.

Change-Id: I71ac174a9b9b19980d0a6f44088d0a66f71ef99b
Reviewed-on: https://code.wireshark.org/review/19538
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 11:11:24 +00:00
Guy Harris 3cfa4f7602 Another change required for that.
Bug: 13270
Change-Id: I86e779c8f7b89ca928556d8b1acc1015b96f9100
Reviewed-on: https://code.wireshark.org/review/19537
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 11:08:51 +00:00
Guy Harris 2cc215c7d0 Running Wireshark through a symlink doesn't work.
We can't just symbolically link to the executables, as that means that
the executable won't be in Contents/MacOS, which means that all
@executable_path-relative references will go to the wrong place if we
run the executables using the symlink, which means that the executables
could fail (they *do* fail to find the Cocoa Qt plugin, for example).

So, instead, we go back to the old version of the utility launcher, and
put that in Contents/Resources/bin as well as, if the user requests the
CLI utilities, /usr/local/bin.  Maybe PackageMaker will find that
acceptable and include them in the installer package.

Bug: 13270
Change-Id: I4016b58c9ce0df05d78525d35e53431750c2b4d9
Reviewed-on: https://code.wireshark.org/review/19536
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 11:06:19 +00:00
Guy Harris 0aba97a938 Oops, source and target are the other way around.
Bug: 13270
Change-Id: Ibeddb435acca298c90f2d6b9c0228e8a9a747b38
Reviewed-on: https://code.wireshark.org/review/19534
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 09:30:43 +00:00
Guy Harris 880580c252 Create the Content/Resources/bin directory if necessary.
Bug: 13270
Change-Id: Idc4223a24d6d2037d13a85331ce63e5a24168d3a
Reviewed-on: https://code.wireshark.org/review/19533
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 08:10:12 +00:00
Guy Harris 7b17883df5 Remove trailing whitespace.
Change-Id: Ifdea8516ccce7a72c88470913ce36b9226dfcb54
Reviewed-on: https://code.wireshark.org/review/19532
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 04:44:29 +00:00
Guy Harris 2cc2c2f883 Put symlinks to the executables in Contents/Resources/bin.
PackageMaker appears not to put them into the installer package, so
construct them in the Wireshark post-install script.

Bug: 13270
Change-Id: Idfa10d4d123d2c0e2f7b3ad65888e075fbfd27a7
Reviewed-on: https://code.wireshark.org/review/19531
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 04:42:50 +00:00
Guy Harris d706f9c221 Add symlinks to Wireshark binaries in Resources/bin, and point there.
That way, $PATH points to .../Wireshark.app/Contents/Resources/bin, so
the man command will look in
.../Wireshark.app/Contents/Resources/share/man.

This also may obviate the need to install the wrapper scripts in
/usr/local/bin, although those scripts obviate the need to re-set PATH
after installing Wireshark.

Change-Id: I7202b5a0fe5d2b90c956dc0db2af073f6c08b00d
Reviewed-on: https://code.wireshark.org/review/19296
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-16 01:49:43 +00:00
Guy Harris a12399018c Create /etc/paths.d and /etc/manpaths.d if they don't exist.
Bug: 13152
Change-Id: I6ecfd1e3f7f10a3a63b44b0d8bf137f0b3450391
Reviewed-on: https://code.wireshark.org/review/18871
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-18 18:52:01 +00:00
Guy Harris fb9ce2796c Add the directory containing the executables to a file in /etc/paths.d.
Do for executables what we do for man pages.

Change-Id: I066f0199fd6064cae21e6ad079a1f344e1002c66
Reviewed-on: https://code.wireshark.org/review/18205
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-15 08:08:29 +00:00
Uli Heilmeier bf424e6f84 macOS: extend MANPATH for Wireshark.app
Modify postinstall.sh script to add file /etc/manpaths.d/Wireshark
during installation.
Content of the file is the current path of the Wireshark manpages.

Bug: 12746
Change-Id: I1dc0dc9a2acf56c39c78c709294f1a6804c6ec5c
Reviewed-on: https://code.wireshark.org/review/17916
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-10-05 11:29:50 +00:00
Guy Harris 39ca18d71b Only nuke the startup item once we've installed the launch daemon.
That way, if we crash in the middle, there's still something installed
that will try to set the permissions on the BPF devices.

Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411
Reviewed-on: https://code.wireshark.org/review/2023
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07 17:47:20 +00:00
Guy Harris b319a67bfb When installing the launch daemon, get rid of the old startup item.
Only one is necessary; get rid of the startup item.

Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86
Reviewed-on: https://code.wireshark.org/review/2016
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07 06:42:59 +00:00
Guy Harris 2b2fbff2dc Switch to a launch daemon for ChmodBPF.
"Ah finally blew that varmint to Kingdom Come!"

Change-Id: I4ef5f8692924772189af4158eddbc125c1c7d521
Reviewed-on: https://code.wireshark.org/review/2004
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06 19:17:34 +00:00
Gerald Combs 3009823060 Simplify the CLI preinstall script a bit and hopefully get rid of an error.
svn path=/trunk/; revision=53296
2013-11-13 02:50:25 +00:00
Gerald Combs 30bdf66b1f Fix permissions for installed OS X files and directories.
Add a cli-preinstall script that creates missing parts of the
installation path and sets their permissions. Simply copy
"utility-launcher" to "wireshark" instead of renaming it at install
time. Explicitly set its ownership and permissions. Pretty-print some of
the PackageMaker XML files via `xmllint --format --recover`.

svn path=/trunk/; revision=53281
2013-11-12 20:38:58 +00:00
Guy Harris 3fdc413fd6 In the post-install script, get rid of plugins that got converted to
built-in dissectors in 1.8.  Hopefully, this will smash bug 7401.

svn path=/trunk/; revision=46945
2013-01-05 10:06:05 +00:00
Jeff Morriss aab480d191 Followup to r43370: don't install idl2wrs or its man page.
svn path=/trunk/; revision=43377
2012-06-19 17:32:49 +00:00
Guy Harris b7cfa1359d Now, isn't that swell! Leopard's dseditgroup doesn't return a failure
exit status if the group in question doesn't exist, so we can't use
dseditgroup on Leopard to check whether the access_bpf group exists.

Instead, as per Martin Williams' suggestion in bug 6526, use "dscl .
-read /groups/{group}" instead; the suggestion came from the addgroup.sh
script in

	https://developer.apple.com/library/mac/documentation/OpenSource/Conceptual/ShellScripting/ShellScripting.pdf

svn path=/trunk/; revision=41680
2012-03-20 04:06:36 +00:00
Bill Meier 02c8228bd2 Add svn:executable to props
svn path=/trunk/; revision=39858
2011-11-15 17:44:14 +00:00
Gerald Combs cdca166a64 Fix the ChmodBPF startup item permissions. Handling this within
PackageMaker would be a more correct fix. Replacing PackageMaker with
something that fits our development and deployment model would be an
even more correct fix.

svn path=/trunk/; revision=37167
2011-05-15 19:25:50 +00:00
Gerald Combs 67a005df11 Fix items pointed out by Guy in bug 5756.
svn path=/trunk/; revision=37129
2011-05-13 18:23:27 +00:00
Gerald Combs 835d5e4ec7 Switch to an installer package for OS X instead of a draggable app
bundle. There are still a few rough edges but it's an improvement over
what we currently have. Fixes bug 5756.

svn path=/trunk/; revision=37093
2011-05-12 18:02:00 +00:00