forked from netty/netty
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce MacOSDnsServerAddressStreamProvider which correctly detect …
…all nameserver configuration on MacOS (netty#9161) Motivation: On MacOS it is not really good enough to check /etc/resolv.conf to determine the nameservers to use. We should retrieve the nameservers using the same way as mDNSResponser and chromium does by doing a JNI call. Modifications: Add MacOSDnsServerAddressStreamProvider and testcase Result: Use correct nameservers by default on MacOS.
- Loading branch information
1 parent
de537b9
commit 939e928
Showing
14 changed files
with
969 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Copyright (c) 2004-2006, 2008, 2009, 2011 Apple Inc. All rights reserved. | ||
| * | ||
| * @APPLE_LICENSE_HEADER_START@ | ||
| * | ||
| * This file contains Original Code and/or Modifications of Original Code | ||
| * as defined in and that are subject to the Apple Public Source License | ||
| * Version 2.0 (the 'License'). You may not use this file except in | ||
| * compliance with the License. Please obtain a copy of the License at | ||
| * http://www.opensource.apple.com/apsl/ and read it before using this | ||
| * file. | ||
| * | ||
| * The Original Code and all software distributed under the License are | ||
| * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER | ||
| * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, | ||
| * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. | ||
| * Please see the License for the specific language governing rights and | ||
| * limitations under the License. | ||
| * | ||
| * @APPLE_LICENSE_HEADER_END@ | ||
| */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright 2019 The Netty Project | ||
| ~ | ||
| ~ The Netty Project licenses this file to you under the Apache License, | ||
| ~ version 2.0 (the "License"); you may not use this file except in compliance | ||
| ~ with the License. You may obtain a copy of the License at: | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| ~ License for the specific language governing permissions and limitations | ||
| ~ under the License. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>io.netty</groupId> | ||
| <artifactId>netty-parent</artifactId> | ||
| <version>4.1.42.Final-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>netty-resolver-dns-native-macos</artifactId> | ||
|
|
||
| <name>Netty/Resolver/DNS/MacOS</name> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <profiles> | ||
| <profile> | ||
| <id>mac</id> | ||
| <activation> | ||
| <os> | ||
| <family>mac</family> | ||
| </os> | ||
| </activation> | ||
| <properties> | ||
| <jni.compiler.args.ldflags>LDFLAGS=-Wl,-weak_library,${unix.common.lib.unpacked.dir}/lib${unix.common.lib.name}.a</jni.compiler.args.ldflags> | ||
| <skipTests>false</skipTests> | ||
| </properties> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <executions> | ||
| <!-- unpack the unix-common static library and include files --> | ||
| <execution> | ||
| <id>unpack</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>unpack-dependencies</goal> | ||
| </goals> | ||
| <configuration> | ||
| <includeGroupIds>${project.groupId}</includeGroupIds> | ||
| <includeArtifactIds>netty-transport-native-unix-common</includeArtifactIds> | ||
| <classifier>${jni.classifier}</classifier> | ||
| <outputDirectory>${unix.common.lib.dir}</outputDirectory> | ||
| <includes>META-INF/native/**</includes> | ||
| <overWriteReleases>false</overWriteReleases> | ||
| <overWriteSnapshots>true</overWriteSnapshots> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>org.fusesource.hawtjni</groupId> | ||
| <artifactId>maven-hawtjni-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>build-native-lib</id> | ||
| <configuration> | ||
| <name>netty_resolver_dns_native_macos_${os.detected.arch}</name> | ||
| <nativeSourceDirectory>${project.basedir}/src/main/c</nativeSourceDirectory> | ||
| <libDirectory>${project.build.outputDirectory}</libDirectory> | ||
| <!-- We use Maven's artifact classifier instead. | ||
| This hack will make the hawtjni plugin to put the native library | ||
| under 'META-INF/native' rather than 'META-INF/native/${platform}'. --> | ||
| <platform>.</platform> | ||
| <configureArgs> | ||
| <arg>${jni.compiler.args.ldflags}</arg> | ||
| <arg>${jni.compiler.args.cflags}</arg> | ||
| </configureArgs> | ||
| </configuration> | ||
| <goals> | ||
| <goal>generate</goal> | ||
| <goal>build</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
| <executions> | ||
| <!-- Generate the JAR that contains the native library in it. --> | ||
| <execution> | ||
| <id>native-jar</id> | ||
| <goals> | ||
| <goal>jar</goal> | ||
| </goals> | ||
| <configuration> | ||
| <archive> | ||
| <manifest> | ||
| <addDefaultImplementationEntries>true</addDefaultImplementationEntries> | ||
| </manifest> | ||
| <manifestEntries> | ||
| <Bundle-NativeCode>META-INF/native/libnetty_resolver_dns_native_macos_${os.detected.arch}.jnilib; osname=MacOSX, processor=${os.detected.arch}"</Bundle-NativeCode> | ||
| <Automatic-Module-Name>${javaModuleName}</Automatic-Module-Name> | ||
| </manifestEntries> | ||
| <index>true</index> | ||
| <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> | ||
| </archive> | ||
| <classifier>${jni.classifier}</classifier> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.netty</groupId> | ||
| <artifactId>netty-transport-native-unix-common</artifactId> | ||
| <version>${project.version}</version> | ||
| <classifier>${jni.classifier}</classifier> | ||
| <!-- | ||
| The unix-common with classifier dependency is optional because it is not a runtime dependency, but a build time | ||
| dependency to get the static library which is built directly into the shared library generated by this project. | ||
| --> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| </dependencies> | ||
| </profile> | ||
| </profiles> | ||
|
|
||
| <properties> | ||
| <javaModuleName>io.netty.resolver.dns.macos</javaModuleName> | ||
| <!-- Needed as we use SelfSignedCertificate in our tests --> | ||
| <unix.common.lib.name>netty-unix-common</unix.common.lib.name> | ||
| <unix.common.lib.dir>${project.build.directory}/unix-common-lib</unix.common.lib.dir> | ||
| <unix.common.lib.unpacked.dir>${unix.common.lib.dir}/META-INF/native/lib</unix.common.lib.unpacked.dir> | ||
| <unix.common.include.unpacked.dir>${unix.common.lib.dir}/META-INF/native/include</unix.common.include.unpacked.dir> | ||
| <jni.compiler.args.cflags>CFLAGS=-O3 -Werror -fno-omit-frame-pointer -Wunused-variable -fvisibility=hidden -I${unix.common.include.unpacked.dir}</jni.compiler.args.cflags> | ||
| <jni.compiler.args.ldflags>LDFLAGS=-z now -L${unix.common.lib.unpacked.dir} -Wl,--whole-archive -l${unix.common.lib.name} -Wl,--no-whole-archive</jni.compiler.args.ldflags> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.netty</groupId> | ||
| <artifactId>netty-common</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.netty</groupId> | ||
| <artifactId>netty-resolver-dns</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.netty</groupId> | ||
| <artifactId>netty-transport-native-unix-common</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
| <executions> | ||
| <!-- Generate the fallback JAR that does not contain the native library. --> | ||
| <execution> | ||
| <id>default-jar</id> | ||
| <configuration> | ||
| <excludes> | ||
| <exclude>META-INF/native/**</exclude> | ||
| </excludes> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> | ||
|
|
Oops, something went wrong.