Compare commits
16 Commits
Version_2.
...
master
Author | SHA1 | Date |
---|---|---|
Robinson | 1c3a54ae22 | |
Robinson | 4b212e2e08 | |
Robinson | 86fb06e8e7 | |
Robinson | 1e3db0d1ad | |
Robinson | c9755c6c82 | |
Robinson | 217c3e89ef | |
Robinson | bb2aeec6dc | |
Robinson | 16c034e698 | |
Robinson | c75bf05ebc | |
Robinson | 7dabfc9896 | |
Robinson | f0dae840c0 | |
Robinson | 36eef77621 | |
Robinson | d6bf061351 | |
Robinson | 60297f4ce3 | |
Robinson | fc7b3761e8 | |
Robinson | 33cee07d60 |
24
LICENSE
24
LICENSE
|
@ -19,12 +19,6 @@
|
|||
The Netty Project
|
||||
Contributors. See source NOTICE
|
||||
|
||||
- SLF4J - Simple facade or abstraction for various logging frameworks
|
||||
[MIT License]
|
||||
https://www.slf4j.org
|
||||
Copyright 2023
|
||||
QOS.ch
|
||||
|
||||
- Kotlin -
|
||||
[The Apache Software License, Version 2.0]
|
||||
https://github.com/JetBrains/kotlin
|
||||
|
@ -33,6 +27,12 @@
|
|||
Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply
|
||||
See: https://github.com/JetBrains/kotlin/blob/master/license/README.md
|
||||
|
||||
- SLF4J - Simple facade or abstraction for various logging frameworks
|
||||
[MIT License]
|
||||
https://www.slf4j.org
|
||||
Copyright 2023
|
||||
QOS.ch
|
||||
|
||||
- Collections - Collection types and utilities to enhance the default collections.
|
||||
[The Apache Software License, Version 2.0]
|
||||
https://git.dorkbox.com/dorkbox/Collections
|
||||
|
@ -152,12 +152,6 @@
|
|||
Copyright 2023
|
||||
JetBrains s.r.o.
|
||||
|
||||
- SLF4J - Simple facade or abstraction for various logging frameworks
|
||||
[MIT License]
|
||||
https://www.slf4j.org
|
||||
Copyright 2023
|
||||
QOS.ch
|
||||
|
||||
- JNA - Simplified native library access for Java.
|
||||
[The Apache Software License, Version 2.0]
|
||||
https://github.com/twall/jna
|
||||
|
@ -170,6 +164,12 @@
|
|||
Copyright 2023
|
||||
Timothy Wall
|
||||
|
||||
- SLF4J - Simple facade or abstraction for various logging frameworks
|
||||
[MIT License]
|
||||
https://www.slf4j.org
|
||||
Copyright 2023
|
||||
QOS.ch
|
||||
|
||||
- Kotlin -
|
||||
[The Apache Software License, Version 2.0]
|
||||
https://github.com/JetBrains/kotlin
|
||||
|
|
|
@ -17,7 +17,7 @@ Maven Info
|
|||
<dependency>
|
||||
<groupId>com.dorkbox</groupId>
|
||||
<artifactId>NetworkDNS</artifactId>
|
||||
<version>2.11</version>
|
||||
<version>2.16</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
```
|
||||
|
@ -27,7 +27,7 @@ Gradle Info
|
|||
```
|
||||
dependencies {
|
||||
...
|
||||
implementation("com.dorkbox:NetworkDNS:2.11")
|
||||
implementation("com.dorkbox:NetworkDNS:2.16")
|
||||
}
|
||||
```
|
||||
|
||||
|
|
|
@ -25,19 +25,19 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|||
gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS // always show the stacktrace!
|
||||
|
||||
plugins {
|
||||
id("com.dorkbox.GradleUtils") version "3.17"
|
||||
id("com.dorkbox.Licensing") version "2.25"
|
||||
id("com.dorkbox.GradleUtils") version "3.18"
|
||||
id("com.dorkbox.Licensing") version "2.28"
|
||||
id("com.dorkbox.VersionUpdate") version "2.8"
|
||||
id("com.dorkbox.GradlePublish") version "1.18"
|
||||
id("com.dorkbox.GradlePublish") version "1.20"
|
||||
|
||||
kotlin("jvm") version "1.8.0"
|
||||
kotlin("jvm") version "1.9.0"
|
||||
}
|
||||
|
||||
object Extras {
|
||||
// set for the project
|
||||
const val description = "High-performance and event-driven/reactive DNS stack for Java 8+"
|
||||
const val group = "com.dorkbox"
|
||||
const val version = "2.11"
|
||||
const val version = "2.16"
|
||||
|
||||
// set as project.ext
|
||||
const val name = "NetworkDNS"
|
||||
|
@ -85,19 +85,19 @@ tasks.jar.get().apply {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
api("com.dorkbox:Collections:2.3")
|
||||
api("com.dorkbox:NetworkUtils:2.22")
|
||||
api("com.dorkbox:OS:1.6")
|
||||
api("com.dorkbox:Collections:2.6")
|
||||
api("com.dorkbox:NetworkUtils:2.23")
|
||||
api("com.dorkbox:OS:1.8")
|
||||
api("com.dorkbox:Updates:1.1")
|
||||
|
||||
val nettyVer = "4.1.96.Final"
|
||||
val nettyVer = "4.1.99.Final"
|
||||
api("io.netty:netty-buffer:$nettyVer")
|
||||
api("io.netty:netty-transport:$nettyVer")
|
||||
api("io.netty:netty-transport-native-epoll:$nettyVer")
|
||||
api("io.netty:netty-transport-classes-kqueue:$nettyVer")
|
||||
api("io.netty:netty-codec:$nettyVer")
|
||||
|
||||
api("org.slf4j:slf4j-api:2.0.7")
|
||||
implementation("org.slf4j:slf4j-api:2.0.9")
|
||||
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
testImplementation("ch.qos.logback:logback-classic:1.4.5")
|
||||
|
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
@ -205,6 +205,12 @@ set -- \
|
|||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
|
@ -25,7 +25,7 @@
|
|||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
|
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
set EXIT_CODE=%ERRORLEVEL%
|
||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||
exit /b %EXIT_CODE%
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
|
|
@ -84,7 +84,7 @@ class DnsClient(nameServerAddresses: Collection<InetSocketAddress?>? = defaultNa
|
|||
/**
|
||||
* Gets the version number.
|
||||
*/
|
||||
const val version = "2.11"
|
||||
const val version = "2.16"
|
||||
|
||||
init {
|
||||
// Add this project to the updates system, which verifies this class + UUID + version information
|
||||
|
|
|
@ -65,7 +65,7 @@ class DnsServer(host: String?, tcpPort: Int) : Shutdownable(DnsServer::class.jav
|
|||
/**
|
||||
* Gets the version number.
|
||||
*/
|
||||
const val version = "2.11"
|
||||
const val version = "2.16"
|
||||
|
||||
var workerThreadPoolSize = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2021 dorkbox, llc
|
||||
* Copyright 2023 dorkbox, llc
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -724,8 +724,6 @@ internal abstract class DnsNameResolverContext<T>(
|
|||
return null
|
||||
}
|
||||
|
||||
System.err.println("TYODO")
|
||||
|
||||
val serverNames = AuthoritativeNameServerList(questionName)
|
||||
for (i in authority.indices) {
|
||||
val dnsRecord = authority[i]
|
||||
|
|
|
@ -22,7 +22,7 @@ import java.util.concurrent.atomic.*
|
|||
/**
|
||||
* The default thread factory with names and daemon state
|
||||
*/
|
||||
class NamedThreadFactory(
|
||||
internal class NamedThreadFactory(
|
||||
/** @param namePrefix what you want the subsequent threads to be named. */
|
||||
val namePrefix: String,
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2021 dorkbox, llc
|
||||
* Copyright 2023 dorkbox, llc
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -267,7 +267,7 @@ open class Shutdownable(protected val type: Class<out Shutdownable?>) {
|
|||
// This occurs when calling stop from within a listener callback.
|
||||
val currentThread = Thread.currentThread()
|
||||
val threadName = currentThread.name
|
||||
val isShutdownThread = threadName != shutdownHookName && threadName != stopTreadName
|
||||
val isShutdownThread = currentThread != shutdownHook && threadName != stopTreadName
|
||||
|
||||
// used to check the event groups to see if we are running from one of them. NOW we force to
|
||||
// ALWAYS shutdown inside a NEW thread
|
||||
|
@ -310,7 +310,7 @@ open class Shutdownable(protected val type: Class<out Shutdownable?>) {
|
|||
|
||||
// Also, you can call client/server.stop from another thread, which is run when the JVM is shutting down
|
||||
// (as there is nothing left to do), and also have problems.
|
||||
if (Thread.currentThread().name != shutdownHookName) {
|
||||
if (Thread.currentThread() != shutdownHook) {
|
||||
try {
|
||||
Runtime.getRuntime().removeShutdownHook(shutdownHook)
|
||||
} catch (e: Exception) {
|
||||
|
|
Loading…
Reference in New Issue