Merge pull request #886 from rtreffer/development
Switch to maven central minidns
This commit is contained in:
Daniel Gultsch
commit
92ed6c2015
|
|
@ -28,7 +28,6 @@ repositories {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':libs:minidns')
|
||||
compile project(':libs:openpgp-api-lib')
|
||||
compile project(':libs:MemorizingTrustManager')
|
||||
compile 'com.android.support:support-v13:21.0.3'
|
||||
|
|
@ -37,6 +36,7 @@ dependencies {
|
|||
compile 'org.gnu.inet:libidn:1.15'
|
||||
compile 'com.google.zxing:core:3.1.0'
|
||||
compile 'com.google.zxing:android-integration:3.1.0'
|
||||
compile 'de.measite.minidns:minidns:0.1.3'
|
||||
}
|
||||
|
||||
android {
|
||||
|
|
|
|||
|
|
@ -1,107 +0,0 @@
|
|||
# From https://github.com/github/gitignore
|
||||
|
||||
# # # # # # # # # # # #
|
||||
# Android gitignore #
|
||||
# # # # # # # # # # # #
|
||||
|
||||
# Built application files
|
||||
*.apk
|
||||
*.ap_
|
||||
|
||||
# Files for the Dalvik VM
|
||||
*.dex
|
||||
|
||||
# Java class files
|
||||
*.class
|
||||
|
||||
# Generated files
|
||||
bin/
|
||||
gen/
|
||||
|
||||
# Gradle files
|
||||
.gradle/
|
||||
build/
|
||||
|
||||
# Local configuration file (sdk path, etc)
|
||||
local.properties
|
||||
gradle.properties
|
||||
|
||||
# Proguard folder generated by Eclipse
|
||||
proguard/
|
||||
|
||||
# # # # # # # #
|
||||
# VIM / Linux #
|
||||
# # # # # # # #
|
||||
|
||||
[._]*.s[a-w][a-z]
|
||||
[._]s[a-w][a-z]
|
||||
*.un~
|
||||
Session.vim
|
||||
.netrwhist
|
||||
*~
|
||||
.directory
|
||||
|
||||
# # # # # #
|
||||
# Eclipse #
|
||||
# # # # # #
|
||||
|
||||
*.pydevproject
|
||||
.metadata
|
||||
.gradle
|
||||
bin/
|
||||
tmp/
|
||||
*.tmp
|
||||
*.bak
|
||||
*.swp
|
||||
*~.nib
|
||||
local.properties
|
||||
.settings/
|
||||
.loadpath
|
||||
.classpath
|
||||
.project
|
||||
|
||||
# External tool builders
|
||||
.externalToolBuilders/
|
||||
|
||||
# Locally stored "Eclipse launch configurations"
|
||||
*.launch
|
||||
|
||||
# CDT-specific
|
||||
.cproject
|
||||
|
||||
# PDT-specific
|
||||
.buildpath
|
||||
|
||||
# sbteclipse plugin
|
||||
.target
|
||||
|
||||
# TeXlipse plugin
|
||||
.texlipse
|
||||
|
||||
# # # # #
|
||||
# OS X #
|
||||
# # # # #
|
||||
|
||||
.DS_Store
|
||||
.AppleDouble
|
||||
.LSOverride
|
||||
|
||||
# Icon must ends with two \r.
|
||||
Icon
|
||||
|
||||
|
||||
# Thumbnails
|
||||
._*
|
||||
|
||||
# Files that might appear on external disk
|
||||
.Spotlight-V100
|
||||
.Trashes
|
||||
|
||||
# Directories potentially created on remote AFP share
|
||||
.AppleDB
|
||||
.AppleDesktop
|
||||
Network Trash Folder
|
||||
Temporary Items
|
||||
.apdisk
|
||||
|
||||
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
This software may be used under the terms of (at your choice)
|
||||
- LGPL version 2 (or later) (see LICENCE_LGPL2.1 for details)
|
||||
- Apache Software licence (see LICENCE_APACHE for details)
|
||||
- WTFPL (see LICENCE_WTFPL for details)
|
||||
|
|
@ -1,178 +0,0 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
|
|
@ -1,503 +0,0 @@
|
|||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 2.1, February 1999
|
||||
|
||||
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
[This is the first released version of the Lesser GPL. It also counts
|
||||
as the successor of the GNU Library Public License, version 2, hence
|
||||
the version number 2.1.]
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
Licenses are intended to guarantee your freedom to share and change
|
||||
free software--to make sure the software is free for all its users.
|
||||
|
||||
This license, the Lesser General Public License, applies to some
|
||||
specially designated software packages--typically libraries--of the
|
||||
Free Software Foundation and other authors who decide to use it. You
|
||||
can use it too, but we suggest you first think carefully about whether
|
||||
this license or the ordinary General Public License is the better
|
||||
strategy to use in any particular case, based on the explanations below.
|
||||
|
||||
When we speak of free software, we are referring to freedom of use,
|
||||
not price. Our General Public Licenses are designed to make sure that
|
||||
you have the freedom to distribute copies of free software (and charge
|
||||
for this service if you wish); that you receive source code or can get
|
||||
it if you want it; that you can change the software and use pieces of
|
||||
it in new free programs; and that you are informed that you can do
|
||||
these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
distributors to deny you these rights or to ask you to surrender these
|
||||
rights. These restrictions translate to certain responsibilities for
|
||||
you if you distribute copies of the library or if you modify it.
|
||||
|
||||
For example, if you distribute copies of the library, whether gratis
|
||||
or for a fee, you must give the recipients all the rights that we gave
|
||||
you. You must make sure that they, too, receive or can get the source
|
||||
code. If you link other code with the library, you must provide
|
||||
complete object files to the recipients, so that they can relink them
|
||||
with the library after making changes to the library and recompiling
|
||||
it. And you must show them these terms so they know their rights.
|
||||
|
||||
We protect your rights with a two-step method: (1) we copyright the
|
||||
library, and (2) we offer you this license, which gives you legal
|
||||
permission to copy, distribute and/or modify the library.
|
||||
|
||||
To protect each distributor, we want to make it very clear that
|
||||
there is no warranty for the free library. Also, if the library is
|
||||
modified by someone else and passed on, the recipients should know
|
||||
that what they have is not the original version, so that the original
|
||||
author's reputation will not be affected by problems that might be
|
||||
introduced by others.
|
||||
|
||||
Finally, software patents pose a constant threat to the existence of
|
||||
any free program. We wish to make sure that a company cannot
|
||||
effectively restrict the users of a free program by obtaining a
|
||||
restrictive license from a patent holder. Therefore, we insist that
|
||||
any patent license obtained for a version of the library must be
|
||||
consistent with the full freedom of use specified in this license.
|
||||
|
||||
Most GNU software, including some libraries, is covered by the
|
||||
ordinary GNU General Public License. This license, the GNU Lesser
|
||||
General Public License, applies to certain designated libraries, and
|
||||
is quite different from the ordinary General Public License. We use
|
||||
this license for certain libraries in order to permit linking those
|
||||
libraries into non-free programs.
|
||||
|
||||
When a program is linked with a library, whether statically or using
|
||||
a shared library, the combination of the two is legally speaking a
|
||||
combined work, a derivative of the original library. The ordinary
|
||||
General Public License therefore permits such linking only if the
|
||||
entire combination fits its criteria of freedom. The Lesser General
|
||||
Public License permits more lax criteria for linking other code with
|
||||
the library.
|
||||
|
||||
We call this license the "Lesser" General Public License because it
|
||||
does Less to protect the user's freedom than the ordinary General
|
||||
Public License. It also provides other free software developers Less
|
||||
of an advantage over competing non-free programs. These disadvantages
|
||||
are the reason we use the ordinary General Public License for many
|
||||
libraries. However, the Lesser license provides advantages in certain
|
||||
special circumstances.
|
||||
|
||||
For example, on rare occasions, there may be a special need to
|
||||
encourage the widest possible use of a certain library, so that it becomes
|
||||
a de-facto standard. To achieve this, non-free programs must be
|
||||
allowed to use the library. A more frequent case is that a free
|
||||
library does the same job as widely used non-free libraries. In this
|
||||
case, there is little to gain by limiting the free library to free
|
||||
software only, so we use the Lesser General Public License.
|
||||
|
||||
In other cases, permission to use a particular library in non-free
|
||||
programs enables a greater number of people to use a large body of
|
||||
free software. For example, permission to use the GNU C Library in
|
||||
non-free programs enables many more people to use the whole GNU
|
||||
operating system, as well as its variant, the GNU/Linux operating
|
||||
system.
|
||||
|
||||
Although the Lesser General Public License is Less protective of the
|
||||
users' freedom, it does ensure that the user of a program that is
|
||||
linked with the Library has the freedom and the wherewithal to run
|
||||
that program using a modified version of the Library.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow. Pay close attention to the difference between a
|
||||
"work based on the library" and a "work that uses the library". The
|
||||
former contains code derived from the library, whereas the latter must
|
||||
be combined with the library in order to run.
|
||||
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License Agreement applies to any software library or other
|
||||
program which contains a notice placed by the copyright holder or
|
||||
other authorized party saying it may be distributed under the terms of
|
||||
this Lesser General Public License (also called "this License").
|
||||
Each licensee is addressed as "you".
|
||||
|
||||
A "library" means a collection of software functions and/or data
|
||||
prepared so as to be conveniently linked with application programs
|
||||
(which use some of those functions and data) to form executables.
|
||||
|
||||
The "Library", below, refers to any such software library or work
|
||||
which has been distributed under these terms. A "work based on the
|
||||
Library" means either the Library or any derivative work under
|
||||
copyright law: that is to say, a work containing the Library or a
|
||||
portion of it, either verbatim or with modifications and/or translated
|
||||
straightforwardly into another language. (Hereinafter, translation is
|
||||
included without limitation in the term "modification".)
|
||||
|
||||
"Source code" for a work means the preferred form of the work for
|
||||
making modifications to it. For a library, complete source code means
|
||||
all the source code for all modules it contains, plus any associated
|
||||
interface definition files, plus the scripts used to control compilation
|
||||
and installation of the library.
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running a program using the Library is not restricted, and output from
|
||||
such a program is covered only if its contents constitute a work based
|
||||
on the Library (independent of the use of the Library in a tool for
|
||||
writing it). Whether that is true depends on what the Library does
|
||||
and what the program that uses the Library does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Library's
|
||||
complete source code as you receive it, in any medium, provided that
|
||||
you conspicuously and appropriately publish on each copy an
|
||||
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||
all the notices that refer to this License and to the absence of any
|
||||
warranty; and distribute a copy of this License along with the
|
||||
Library.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy,
|
||||
and you may at your option offer warranty protection in exchange for a
|
||||
fee.
|
||||
|
||||
2. You may modify your copy or copies of the Library or any portion
|
||||
of it, thus forming a work based on the Library, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) The modified work must itself be a software library.
|
||||
|
||||
b) You must cause the files modified to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
c) You must cause the whole of the work to be licensed at no
|
||||
charge to all third parties under the terms of this License.
|
||||
|
||||
d) If a facility in the modified Library refers to a function or a
|
||||
table of data to be supplied by an application program that uses
|
||||
the facility, other than as an argument passed when the facility
|
||||
is invoked, then you must make a good faith effort to ensure that,
|
||||
in the event an application does not supply such function or
|
||||
table, the facility still operates, and performs whatever part of
|
||||
its purpose remains meaningful.
|
||||
|
||||
(For example, a function in a library to compute square roots has
|
||||
a purpose that is entirely well-defined independent of the
|
||||
application. Therefore, Subsection 2d requires that any
|
||||
application-supplied function or table used by this function must
|
||||
be optional: if the application does not supply it, the square
|
||||
root function must still compute square roots.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Library,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Library, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote
|
||||
it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Library.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Library
|
||||
with the Library (or with a work based on the Library) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||
License instead of this License to a given copy of the Library. To do
|
||||
this, you must alter all the notices that refer to this License, so
|
||||
that they refer to the ordinary GNU General Public License, version 2,
|
||||
instead of to this License. (If a newer version than version 2 of the
|
||||
ordinary GNU General Public License has appeared, then you can specify
|
||||
that version instead if you wish.) Do not make any other change in
|
||||
these notices.
|
||||
|
||||
Once this change is made in a given copy, it is irreversible for
|
||||
that copy, so the ordinary GNU General Public License applies to all
|
||||
subsequent copies and derivative works made from that copy.
|
||||
|
||||
This option is useful when you wish to copy part of the code of
|
||||
the Library into a program that is not a library.
|
||||
|
||||
4. You may copy and distribute the Library (or a portion or
|
||||
derivative of it, under Section 2) in object code or executable form
|
||||
under the terms of Sections 1 and 2 above provided that you accompany
|
||||
it with the complete corresponding machine-readable source code, which
|
||||
must be distributed under the terms of Sections 1 and 2 above on a
|
||||
medium customarily used for software interchange.
|
||||
|
||||
If distribution of object code is made by offering access to copy
|
||||
from a designated place, then offering equivalent access to copy the
|
||||
source code from the same place satisfies the requirement to
|
||||
distribute the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
5. A program that contains no derivative of any portion of the
|
||||
Library, but is designed to work with the Library by being compiled or
|
||||
linked with it, is called a "work that uses the Library". Such a
|
||||
work, in isolation, is not a derivative work of the Library, and
|
||||
therefore falls outside the scope of this License.
|
||||
|
||||
However, linking a "work that uses the Library" with the Library
|
||||
creates an executable that is a derivative of the Library (because it
|
||||
contains portions of the Library), rather than a "work that uses the
|
||||
library". The executable is therefore covered by this License.
|
||||
Section 6 states terms for distribution of such executables.
|
||||
|
||||
When a "work that uses the Library" uses material from a header file
|
||||
that is part of the Library, the object code for the work may be a
|
||||
derivative work of the Library even though the source code is not.
|
||||
Whether this is true is especially significant if the work can be
|
||||
linked without the Library, or if the work is itself a library. The
|
||||
threshold for this to be true is not precisely defined by law.
|
||||
|
||||
If such an object file uses only numerical parameters, data
|
||||
structure layouts and accessors, and small macros and small inline
|
||||
functions (ten lines or less in length), then the use of the object
|
||||
file is unrestricted, regardless of whether it is legally a derivative
|
||||
work. (Executables containing this object code plus portions of the
|
||||
Library will still fall under Section 6.)
|
||||
|
||||
Otherwise, if the work is a derivative of the Library, you may
|
||||
distribute the object code for the work under the terms of Section 6.
|
||||
Any executables containing that work also fall under Section 6,
|
||||
whether or not they are linked directly with the Library itself.
|
||||
|
||||
6. As an exception to the Sections above, you may also combine or
|
||||
link a "work that uses the Library" with the Library to produce a
|
||||
work containing portions of the Library, and distribute that work
|
||||
under terms of your choice, provided that the terms permit
|
||||
modification of the work for the customer's own use and reverse
|
||||
engineering for debugging such modifications.
|
||||
|
||||
You must give prominent notice with each copy of the work that the
|
||||
Library is used in it and that the Library and its use are covered by
|
||||
this License. You must supply a copy of this License. If the work
|
||||
during execution displays copyright notices, you must include the
|
||||
copyright notice for the Library among them, as well as a reference
|
||||
directing the user to the copy of this License. Also, you must do one
|
||||
of these things:
|
||||
|
||||
a) Accompany the work with the complete corresponding
|
||||
machine-readable source code for the Library including whatever
|
||||
changes were used in the work (which must be distributed under
|
||||
Sections 1 and 2 above); and, if the work is an executable linked
|
||||
with the Library, with the complete machine-readable "work that
|
||||
uses the Library", as object code and/or source code, so that the
|
||||
user can modify the Library and then relink to produce a modified
|
||||
executable containing the modified Library. (It is understood
|
||||
that the user who changes the contents of definitions files in the
|
||||
Library will not necessarily be able to recompile the application
|
||||
to use the modified definitions.)
|
||||
|
||||
b) Use a suitable shared library mechanism for linking with the
|
||||
Library. A suitable mechanism is one that (1) uses at run time a
|
||||
copy of the library already present on the user's computer system,
|
||||
rather than copying library functions into the executable, and (2)
|
||||
will operate properly with a modified version of the library, if
|
||||
the user installs one, as long as the modified version is
|
||||
interface-compatible with the version that the work was made with.
|
||||
|
||||
c) Accompany the work with a written offer, valid for at
|
||||
least three years, to give the same user the materials
|
||||
specified in Subsection 6a, above, for a charge no more
|
||||
than the cost of performing this distribution.
|
||||
|
||||
d) If distribution of the work is made by offering access to copy
|
||||
from a designated place, offer equivalent access to copy the above
|
||||
specified materials from the same place.
|
||||
|
||||
e) Verify that the user has already received a copy of these
|
||||
materials or that you have already sent this user a copy.
|
||||
|
||||
For an executable, the required form of the "work that uses the
|
||||
Library" must include any data and utility programs needed for
|
||||
reproducing the executable from it. However, as a special exception,
|
||||
the materials to be distributed need not include anything that is
|
||||
normally distributed (in either source or binary form) with the major
|
||||
components (compiler, kernel, and so on) of the operating system on
|
||||
which the executable runs, unless that component itself accompanies
|
||||
the executable.
|
||||
|
||||
It may happen that this requirement contradicts the license
|
||||
restrictions of other proprietary libraries that do not normally
|
||||
accompany the operating system. Such a contradiction means you cannot
|
||||
use both them and the Library together in an executable that you
|
||||
distribute.
|
||||
|
||||
7. You may place library facilities that are a work based on the
|
||||
Library side-by-side in a single library together with other library
|
||||
facilities not covered by this License, and distribute such a combined
|
||||
library, provided that the separate distribution of the work based on
|
||||
the Library and of the other library facilities is otherwise
|
||||
permitted, and provided that you do these two things:
|
||||
|
||||
a) Accompany the combined library with a copy of the same work
|
||||
based on the Library, uncombined with any other library
|
||||
facilities. This must be distributed under the terms of the
|
||||
Sections above.
|
||||
|
||||
b) Give prominent notice with the combined library of the fact
|
||||
that part of it is a work based on the Library, and explaining
|
||||
where to find the accompanying uncombined form of the same work.
|
||||
|
||||
8. You may not copy, modify, sublicense, link with, or distribute
|
||||
the Library except as expressly provided under this License. Any
|
||||
attempt otherwise to copy, modify, sublicense, link with, or
|
||||
distribute the Library is void, and will automatically terminate your
|
||||
rights under this License. However, parties who have received copies,
|
||||
or rights, from you under this License will not have their licenses
|
||||
terminated so long as such parties remain in full compliance.
|
||||
|
||||
9. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Library or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Library (or any work based on the
|
||||
Library), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Library or works based on it.
|
||||
|
||||
10. Each time you redistribute the Library (or any work based on the
|
||||
Library), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute, link with or modify the Library
|
||||
subject to these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties with
|
||||
this License.
|
||||
|
||||
11. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Library at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Library by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Library.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under any
|
||||
particular circumstance, the balance of the section is intended to apply,
|
||||
and the section as a whole is intended to apply in other circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
12. If the distribution and/or use of the Library is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Library under this License may add
|
||||
an explicit geographical distribution limitation excluding those countries,
|
||||
so that distribution is permitted only in or among countries not thus
|
||||
excluded. In such case, this License incorporates the limitation as if
|
||||
written in the body of this License.
|
||||
|
||||
13. The Free Software Foundation may publish revised and/or new
|
||||
versions of the Lesser General Public License from time to time.
|
||||
Such new versions will be similar in spirit to the present version,
|
||||
but may differ in detail to address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Library
|
||||
specifies a version number of this License which applies to it and
|
||||
"any later version", you have the option of following the terms and
|
||||
conditions either of that version or of any later version published by
|
||||
the Free Software Foundation. If the Library does not specify a
|
||||
license version number, you may choose any version ever published by
|
||||
the Free Software Foundation.
|
||||
|
||||
14. If you wish to incorporate parts of the Library into other free
|
||||
programs whose distribution conditions are incompatible with these,
|
||||
write to the author to ask for permission. For software which is
|
||||
copyrighted by the Free Software Foundation, write to the Free
|
||||
Software Foundation; we sometimes make exceptions for this. Our
|
||||
decision will be guided by the two goals of preserving the free status
|
||||
of all derivatives of our free software and of promoting the sharing
|
||||
and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Libraries
|
||||
|
||||
If you develop a new library, and you want it to be of the greatest
|
||||
possible use to the public, we recommend making it free software that
|
||||
everyone can redistribute and change. You can do so by permitting
|
||||
redistribution under these terms (or, alternatively, under the terms of the
|
||||
ordinary General Public License).
|
||||
|
||||
To apply these terms, attach the following notices to the library. It is
|
||||
safest to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least the
|
||||
"copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the library's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1990
|
||||
Ty Coon, President of Vice
|
||||
|
||||
That's all there is to it!
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
|
||||
Version 2, December 2004
|
||||
|
||||
Copyright (C) 2014 Rene Treffer <treffer+wtfpl@measite.de>
|
||||
|
||||
Everyone is permitted to copy and distribute verbatim or modified
|
||||
copies of this license document, and changing it is allowed as long
|
||||
as the name is changed.
|
||||
|
||||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. You just DO WHAT THE FUCK YOU WANT TO.
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
MiniDNS
|
||||
-------
|
||||
|
||||
MiniDNS is a minimal dns client library for android. It can parse a basic set
|
||||
of resource records (A, AAAA, NS, SRV) and is easy to use and extend.
|
||||
|
||||
This library is not intended to be used as a DNS server. You might want to
|
||||
look into dnsjava for such functionality.
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
apply plugin: 'java'
|
||||
apply plugin: 'eclipse'
|
||||
apply plugin: 'osgi'
|
||||
apply plugin: 'nexus'
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7.1'
|
||||
}
|
||||
}
|
||||
|
||||
group = 'de.measite.minidns'
|
||||
description = "A minimal DNS client library with support for A, AAAA, NS and SRV records"
|
||||
sourceCompatibility = 1.7
|
||||
version = 'git tag --points-at HEAD'.execute().text.trim()
|
||||
|
||||
ext {
|
||||
isSNAPSHOT = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() == 'master'
|
||||
}
|
||||
|
||||
if (isSNAPSHOT) {
|
||||
version = version + '-SNAPSHOT'
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
nexus {
|
||||
attachSources = true
|
||||
attachTests = false
|
||||
attachJavadoc = true
|
||||
sign = true
|
||||
}
|
||||
|
||||
modifyPom {
|
||||
project {
|
||||
name 'minidns'
|
||||
description 'Minimal DNS library for java and android systems'
|
||||
url 'https://github.com/rtreffer/minidns'
|
||||
inceptionYear '2014'
|
||||
|
||||
scm {
|
||||
url 'https://github.com/rtreffer/minidns'
|
||||
connection 'scm:https://github.com/rtreffer/minidns'
|
||||
developerConnection 'scm:git://github.com/rtreffer/minidns.git'
|
||||
}
|
||||
|
||||
licenses {
|
||||
license {
|
||||
name 'The Apache Software License, Version 2.0'
|
||||
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
|
||||
distribution 'repo'
|
||||
}
|
||||
}
|
||||
|
||||
developers {
|
||||
developer {
|
||||
id 'rtreffer'
|
||||
name 'Rene Treffer'
|
||||
email 'treffer@measite.de'
|
||||
}
|
||||
developer {
|
||||
id 'flow'
|
||||
name 'Florian Schmaus'
|
||||
email 'flow@geekplace.eu'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
|
||||
#
|
||||
# GPG settings
|
||||
#
|
||||
|
||||
# gpg key id
|
||||
#signing.keyId=DEADBEEF
|
||||
# the gpg key passphrase
|
||||
#signing.password=correcthorsebatterystaple
|
||||
# gpg keyring (this is the default gnupg keyring containing private keys)
|
||||
#signing.secretKeyRingFile=/home/ubuntu/.gnupg/secring.gpg
|
||||
|
||||
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
|
||||
#
|
||||
# nexus settings
|
||||
#
|
||||
|
||||
# the nexus username used for log in
|
||||
#nexusUsername=ubuntu
|
||||
# the nexus password
|
||||
#nexusPassword=correcthorsebatterystaple
|
||||
|
|
@ -1,323 +0,0 @@
|
|||
package de.measite.minidns;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.LineNumberReader;
|
||||
import java.lang.reflect.Method;
|
||||
import java.net.DatagramPacket;
|
||||
import java.net.DatagramSocket;
|
||||
import java.net.InetAddress;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.SecureRandom;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.Random;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import de.measite.minidns.Record.CLASS;
|
||||
import de.measite.minidns.Record.TYPE;
|
||||
|
||||
/**
|
||||
* A minimal DNS client for SRV/A/AAAA/NS and CNAME lookups, with IDN support.
|
||||
* This circumvents the missing javax.naming package on android.
|
||||
*/
|
||||
public class Client {
|
||||
|
||||
private static final Logger LOGGER = Logger.getLogger(Client.class.getName());
|
||||
|
||||
/**
|
||||
* The internal random class for sequence generation.
|
||||
*/
|
||||
protected Random random;
|
||||
|
||||
/**
|
||||
* The buffer size for dns replies.
|
||||
*/
|
||||
protected int bufferSize = 1500;
|
||||
|
||||
/**
|
||||
* DNS timeout.
|
||||
*/
|
||||
protected int timeout = 5000;
|
||||
|
||||
/**
|
||||
* The internal DNS cache.
|
||||
*/
|
||||
protected DNSCache cache;
|
||||
|
||||
/**
|
||||
* Create a new DNS client with the given DNS cache.
|
||||
* @param cache The backend DNS cache.
|
||||
*/
|
||||
public Client(DNSCache cache) {
|
||||
try {
|
||||
random = SecureRandom.getInstance("SHA1PRNG");
|
||||
} catch (NoSuchAlgorithmException e1) {
|
||||
random = new SecureRandom();
|
||||
}
|
||||
this.cache = cache;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new DNS client.
|
||||
*/
|
||||
public Client() {
|
||||
this(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Query a nameserver for a single entry.
|
||||
* @param name The DNS name to request.
|
||||
* @param type The DNS type to request (SRV, A, AAAA, ...).
|
||||
* @param clazz The class of the request (usually IN for Internet).
|
||||
* @param host The DNS server host.
|
||||
* @param port The DNS server port.
|
||||
* @return The response (or null on timeout / failure).
|
||||
* @throws IOException On IO Errors.
|
||||
*/
|
||||
public DNSMessage query(String name, TYPE type, CLASS clazz, String host, int port)
|
||||
throws IOException
|
||||
{
|
||||
Question q = new Question(name, type, clazz);
|
||||
return query(q, host, port);
|
||||
}
|
||||
|
||||
/**
|
||||
* Query a nameserver for a single entry.
|
||||
* @param name The DNS name to request.
|
||||
* @param type The DNS type to request (SRV, A, AAAA, ...).
|
||||
* @param clazz The class of the request (usually IN for Internet).
|
||||
* @param host The DNS server host.
|
||||
* @return The response (or null on timeout / failure).
|
||||
* @throws IOException On IO Errors.
|
||||
*/
|
||||
public DNSMessage query(String name, TYPE type, CLASS clazz, String host)
|
||||
throws IOException
|
||||
{
|
||||
Question q = new Question(name, type, clazz);
|
||||
return query(q, host);
|
||||
}
|
||||
|
||||
/**
|
||||
* Query the system nameserver for a single entry.
|
||||
* @param name The DNS name to request.
|
||||
* @param type The DNS type to request (SRV, A, AAAA, ...).
|
||||
* @param clazz The class of the request (usually IN for Internet).
|
||||
* @return The response (or null on timeout/error).
|
||||
* @return The DNSMessage reply or null.
|
||||
*/
|
||||
public DNSMessage query(String name, TYPE type, CLASS clazz)
|
||||
{
|
||||
Question q = new Question(name, type, clazz);
|
||||
return query(q);
|
||||
}
|
||||
|
||||
/**
|
||||
* Query a specific server for one entry.
|
||||
* @param q The question section of the DNS query.
|
||||
* @param host The dns server host.
|
||||
* @return The response (or null on timeout/error).
|
||||
* @throws IOException On IOErrors.
|
||||
*/
|
||||
public DNSMessage query(Question q, String host) throws IOException {
|
||||
return query(q, host, 53);
|
||||
}
|
||||
|
||||
/**
|
||||
* Query a specific server for one entry.
|
||||
* @param q The question section of the DNS query.
|
||||
* @param host The dns server host.
|
||||
* @param port the dns port.
|
||||
* @return The response (or null on timeout/error).
|
||||
* @throws IOException On IOErrors.
|
||||
*/
|
||||
public DNSMessage query(Question q, String host, int port) throws IOException {
|
||||
DNSMessage dnsMessage = (cache == null) ? null : cache.get(q);
|
||||
if (dnsMessage != null) {
|
||||
return dnsMessage;
|
||||
}
|
||||
DNSMessage message = new DNSMessage();
|
||||
message.setQuestions(new Question[]{q});
|
||||
message.setRecursionDesired(true);
|
||||
message.setId(random.nextInt());
|
||||
byte[] buf = message.toArray();
|
||||
try (DatagramSocket socket = new DatagramSocket()) {
|
||||
DatagramPacket packet = new DatagramPacket(buf, buf.length,
|
||||
InetAddress.getByName(host), port);
|
||||
socket.setSoTimeout(timeout);
|
||||
socket.send(packet);
|
||||
packet = new DatagramPacket(new byte[bufferSize], bufferSize);
|
||||
socket.receive(packet);
|
||||
dnsMessage = DNSMessage.parse(packet.getData());
|
||||
if (dnsMessage.getId() != message.getId()) {
|
||||
return null;
|
||||
}
|
||||
for (Record record : dnsMessage.getAnswers()) {
|
||||
if (record.isAnswer(q)) {
|
||||
if (cache != null) {
|
||||
cache.put(q, dnsMessage);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return dnsMessage;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Query the system DNS server for one entry.
|
||||
* @param q The question section of the DNS query.
|
||||
* @return The response (or null on timeout/error).
|
||||
*/
|
||||
public DNSMessage query(Question q) {
|
||||
// While this query method does in fact re-use query(Question, String)
|
||||
// we still do a cache lookup here in order to avoid unnecessary
|
||||
// findDNS()calls, which are expensive on Android. Note that we do not
|
||||
// put the results back into the Cache, as this is already done by
|
||||
// query(Question, String).
|
||||
DNSMessage message = cache.get(q);
|
||||
if (message != null) {
|
||||
return message;
|
||||
}
|
||||
String dnsServer[] = findDNS();
|
||||
for (String dns : dnsServer) {
|
||||
try {
|
||||
message = query(q, dns);
|
||||
if (message == null) {
|
||||
continue;
|
||||
}
|
||||
if (message.getResponseCode() !=
|
||||
DNSMessage.RESPONSE_CODE.NO_ERROR) {
|
||||
continue;
|
||||
}
|
||||
for (Record record: message.getAnswers()) {
|
||||
if (record.isAnswer(q)) {
|
||||
return message;
|
||||
}
|
||||
}
|
||||
} catch (IOException ioe) {
|
||||
LOGGER.log(Level.FINE, "IOException in query", ioe);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve a list of currently configured DNS servers.
|
||||
* @return The server array.
|
||||
*/
|
||||
public String[] findDNS() {
|
||||
String[] result = findDNSByReflection();
|
||||
if (result != null) {
|
||||
LOGGER.fine("Got DNS servers via reflection: " + Arrays.toString(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
result = findDNSByExec();
|
||||
if (result != null) {
|
||||
LOGGER.fine("Got DNS servers via exec: " + Arrays.toString(result));
|
||||
return result;
|
||||
}
|
||||
|
||||
// fallback for ipv4 and ipv6 connectivity
|
||||
// see https://developers.google.com/speed/public-dns/docs/using
|
||||
LOGGER.fine("No DNS found? Using fallback [8.8.8.8, [2001:4860:4860::8888]]");
|
||||
|
||||
return new String[]{"8.8.8.8", "[2001:4860:4860::8888]"};
|
||||
}
|
||||
|
||||
/**
|
||||
* Try to retrieve the list of dns server by executing getprop.
|
||||
* @return Array of servers, or null on failure.
|
||||
*/
|
||||
protected String[] findDNSByExec() {
|
||||
try {
|
||||
Process process = Runtime.getRuntime().exec("getprop");
|
||||
InputStream inputStream = process.getInputStream();
|
||||
LineNumberReader lnr = new LineNumberReader(
|
||||
new InputStreamReader(inputStream));
|
||||
String line = null;
|
||||
HashSet<String> server = new HashSet<String>(6);
|
||||
while ((line = lnr.readLine()) != null) {
|
||||
int split = line.indexOf("]: [");
|
||||
if (split == -1) {
|
||||
continue;
|
||||
}
|
||||
String property = line.substring(1, split);
|
||||
String value = line.substring(split + 4, line.length() - 1);
|
||||
if (property.endsWith(".dns") || property.endsWith(".dns1") ||
|
||||
property.endsWith(".dns2") || property.endsWith(".dns3") ||
|
||||
property.endsWith(".dns4")) {
|
||||
|
||||
// normalize the address
|
||||
|
||||
InetAddress ip = InetAddress.getByName(value);
|
||||
|
||||
if (ip == null) continue;
|
||||
|
||||
value = ip.getHostAddress();
|
||||
|
||||
if (value == null) continue;
|
||||
if (value.length() == 0) continue;
|
||||
|
||||
server.add(value);
|
||||
}
|
||||
}
|
||||
if (server.size() > 0) {
|
||||
return server.toArray(new String[server.size()]);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
LOGGER.log(Level.WARNING, "Exception in findDNSByExec", e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Try to retrieve the list of dns server by calling SystemProperties.
|
||||
* @return Array of servers, or null on failure.
|
||||
*/
|
||||
protected String[] findDNSByReflection() {
|
||||
try {
|
||||
Class<?> SystemProperties =
|
||||
Class.forName("android.os.SystemProperties");
|
||||
Method method = SystemProperties.getMethod("get",
|
||||
new Class[] { String.class });
|
||||
|
||||
ArrayList<String> servers = new ArrayList<String>(5);
|
||||
|
||||
for (String propKey : new String[] {
|
||||
"net.dns1", "net.dns2", "net.dns3", "net.dns4"}) {
|
||||
|
||||
String value = (String)method.invoke(null, propKey);
|
||||
|
||||
if (value == null) continue;
|
||||
if (value.length() == 0) continue;
|
||||
if (servers.contains(value)) continue;
|
||||
|
||||
InetAddress ip = InetAddress.getByName(value);
|
||||
|
||||
if (ip == null) continue;
|
||||
|
||||
value = ip.getHostAddress();
|
||||
|
||||
if (value == null) continue;
|
||||
if (value.length() == 0) continue;
|
||||
if (servers.contains(value)) continue;
|
||||
|
||||
servers.add(value);
|
||||
}
|
||||
|
||||
if (servers.size() > 0) {
|
||||
return servers.toArray(new String[servers.size()]);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// we might trigger some problems this way
|
||||
LOGGER.log(Level.WARNING, "Exception in findDNSByReflection", e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
package de.measite.minidns;
|
||||
|
||||
/**
|
||||
* Cache for DNS Entries. Implementations must be thread safe.
|
||||
*/
|
||||
public interface DNSCache {
|
||||
|
||||
/**
|
||||
* Add an an dns answer/response for a given dns question. Implementations
|
||||
* should honor the ttl / receive timestamp.
|
||||
* @param q The question.
|
||||
* @param message The dns message.
|
||||
*/
|
||||
void put(Question q, DNSMessage message);
|
||||
|
||||
/**
|
||||
* Request a cached dns response.
|
||||
* @param q The dns question.
|
||||
* @return The dns message.
|
||||
*/
|
||||
DNSMessage get(Question q);
|
||||
|
||||
}
|
||||
|
|
@ -1,524 +0,0 @@
|
|||
package de.measite.minidns;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* A DNS message as defined by rfc1035. The message consists of a header and
|
||||
* 4 sections: question, answer, nameserver and addition resource record
|
||||
* section.
|
||||
* A message can either be parsed ({@link DNSMessage#parse(byte[])}) or serialized
|
||||
* ({@link DNSMessage#toArray()}).
|
||||
*/
|
||||
public class DNSMessage {
|
||||
|
||||
/**
|
||||
* Possible DNS reply codes.
|
||||
*/
|
||||
public static enum RESPONSE_CODE {
|
||||
NO_ERROR(0), FORMAT_ERR(1), SERVER_FAIL(2), NX_DOMAIN(3),
|
||||
NO_IMP(4), REFUSED(5), YXDOMAIN(6), YXRRSET(7),
|
||||
NXRRSET(8), NOT_AUTH(9),NOT_ZONE(10);
|
||||
|
||||
/**
|
||||
* Reverse lookup table for response codes.
|
||||
*/
|
||||
private final static RESPONSE_CODE INVERSE_LUT[] = new RESPONSE_CODE[]{
|
||||
NO_ERROR, FORMAT_ERR, SERVER_FAIL, NX_DOMAIN, NO_IMP,
|
||||
REFUSED, YXDOMAIN, YXRRSET, NXRRSET, NOT_AUTH, NOT_ZONE,
|
||||
null, null, null, null, null
|
||||
};
|
||||
|
||||
/**
|
||||
* The response code value.
|
||||
*/
|
||||
private final byte value;
|
||||
|
||||
/**
|
||||
* Create a new response code.
|
||||
* @param value The response code value.
|
||||
*/
|
||||
private RESPONSE_CODE(int value) {
|
||||
this.value = (byte)value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the byte value of the response code.
|
||||
* @return the response code.
|
||||
*/
|
||||
public byte getValue() {
|
||||
return (byte) value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the response code for a byte value.
|
||||
* @param value The byte value.
|
||||
* @return The symbolic response code or null.
|
||||
* @throws IllegalArgumentException if the value is not in the range of
|
||||
* 0..15.
|
||||
*/
|
||||
public static RESPONSE_CODE getResponseCode(int value) {
|
||||
if (value < 0 || value > 15) {
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
return INVERSE_LUT[value];
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
/**
|
||||
* Symbolic DNS Opcode values.
|
||||
*/
|
||||
public static enum OPCODE {
|
||||
QUERY(0),
|
||||
INVERSE_QUERY(1),
|
||||
STATUS(2),
|
||||
NOTIFY(4),
|
||||
UPDATE(5);
|
||||
|
||||
/**
|
||||
* Lookup table for for obcode reolution.
|
||||
*/
|
||||
private final static OPCODE INVERSE_LUT[] = new OPCODE[]{
|
||||
QUERY, INVERSE_QUERY, STATUS, null, NOTIFY, UPDATE, null,
|
||||
null, null, null, null, null, null, null, null
|
||||
};
|
||||
|
||||
/**
|
||||
* The value of this opcode.
|
||||
*/
|
||||
private final byte value;
|
||||
|
||||
/**
|
||||
* Create a new opcode for a given byte value.
|
||||
* @param value The byte value of the opcode.
|
||||
*/
|
||||
private OPCODE(int value) {
|
||||
this.value = (byte)value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the byte value of this opcode.
|
||||
* @return The byte value of this opcode.
|
||||
*/
|
||||
public byte getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the symbolic name of an opcode byte.
|
||||
* @param value The byte value of the opcode.
|
||||
* @return The symbolic opcode or null.
|
||||
* @throws IllegalArgumentException If the byte value is not in the
|
||||
* range 0..15.
|
||||
*/
|
||||
public static OPCODE getOpcode(int value) {
|
||||
if (value < 0 || value > 15) {
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
return INVERSE_LUT[value];
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
/**
|
||||
* The DNS message id.
|
||||
*/
|
||||
protected int id;
|
||||
|
||||
/**
|
||||
* The DNS message opcode.
|
||||
*/
|
||||
protected OPCODE opcode;
|
||||
|
||||
/**
|
||||
* The response code of this dns message.
|
||||
*/
|
||||
protected RESPONSE_CODE responseCode;
|
||||
|
||||
/**
|
||||
* True if this is a query.
|
||||
*/
|
||||
protected boolean query;
|
||||
|
||||
/**
|
||||
* True if this is a authorative response.
|
||||
*/
|
||||
protected boolean authoritativeAnswer;
|
||||
|
||||
/**
|
||||
* True on truncate, tcp should be used.
|
||||
*/
|
||||
protected boolean truncated;
|
||||
|
||||
/**
|
||||
* True if the server should recurse.
|
||||
*/
|
||||
protected boolean recursionDesired;
|
||||
|
||||
/**
|
||||
* True if recursion is possible.
|
||||
*/
|
||||
protected boolean recursionAvailable;
|
||||
|
||||
/**
|
||||
* True if the server regarded the response as authentic.
|
||||
*/
|
||||
protected boolean authenticData;
|
||||
|
||||
/**
|
||||
* True if the server should not check the replies.
|
||||
*/
|
||||
protected boolean checkDisabled;
|
||||
|
||||
/**
|
||||
* The question section content.
|
||||
*/
|
||||
protected Question questions[];
|
||||
|
||||
/**
|
||||
* The answers section content.
|
||||
*/
|
||||
protected Record answers[];
|
||||
|
||||
/**
|
||||
* The nameserver records.
|
||||
*/
|
||||
protected Record nameserverRecords[];
|
||||
|
||||
/**
|
||||
* Additional resousrce records.
|
||||
*/
|
||||
protected Record additionalResourceRecords[];
|
||||
|
||||
/**
|
||||
* The receive timestamp of this message.
|
||||
*/
|
||||
protected long receiveTimestamp;
|
||||
|
||||
/**
|
||||
* Retrieve the current DNS message id.
|
||||
* @return The current DNS message id.
|
||||
*/
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the current DNS message id.
|
||||
* @param id The new DNS message id.
|
||||
*/
|
||||
public void setId(int id) {
|
||||
this.id = id & 0xffff;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the receive timestamp if this message was created via parse.
|
||||
* This should be used to evaluate TTLs.
|
||||
* @return The receive timestamp in milliseconds.
|
||||
*/
|
||||
public long getReceiveTimestamp() {
|
||||
return receiveTimestamp;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the query type (true or false;
|
||||
* @return True if this DNS message is a query.
|
||||
*/
|
||||
public boolean isQuery() {
|
||||
return query;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the query status of this message.
|
||||
* @param query The new query status.
|
||||
*/
|
||||
public void setQuery(boolean query) {
|
||||
this.query = query;
|
||||
}
|
||||
|
||||
/**
|
||||
* True if the DNS message is an authoritative answer.
|
||||
* @return True if this an authoritative DNS message.
|
||||
*/
|
||||
public boolean isAuthoritativeAnswer() {
|
||||
return authoritativeAnswer;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the authoritative answer flag.
|
||||
* @param authoritativeAnswer Tge new authoritative answer value.
|
||||
*/
|
||||
public void setAuthoritativeAnswer(boolean authoritativeAnswer) {
|
||||
this.authoritativeAnswer = authoritativeAnswer;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the truncation status of this message. True means that the
|
||||
* client should try a tcp lookup.
|
||||
* @return True if this message was truncated.
|
||||
*/
|
||||
public boolean isTruncated() {
|
||||
return truncated;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the truncation bit on this DNS message.
|
||||
* @param truncated The new truncated bit status.
|
||||
*/
|
||||
public void setTruncated(boolean truncated) {
|
||||
this.truncated = truncated;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if this message preferes recursion.
|
||||
* @return True if recursion is desired.
|
||||
*/
|
||||
public boolean isRecursionDesired() {
|
||||
return recursionDesired;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the recursion desired flag on this message.
|
||||
* @param recursionDesired The new recusrion setting.
|
||||
*/
|
||||
public void setRecursionDesired(boolean recursionDesired) {
|
||||
this.recursionDesired = recursionDesired;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the recursion available flag of this DNS message.
|
||||
* @return The recursion available flag of this message.
|
||||
*/
|
||||
public boolean isRecursionAvailable() {
|
||||
return recursionAvailable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the recursion available flog from this DNS message.
|
||||
* @param recursionAvailable The new recursion available status.
|
||||
*/
|
||||
public void setRecursionAvailable(boolean recursionAvailable) {
|
||||
this.recursionAvailable = recursionAvailable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the authentic data flag of this message.
|
||||
* @return The authentic data flag.
|
||||
*/
|
||||
public boolean isAuthenticData() {
|
||||
return authenticData;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the authentic data flag on this DNS message.
|
||||
* @param authenticData The new authentic data flag value.
|
||||
*/
|
||||
public void setAuthenticData(boolean authenticData) {
|
||||
this.authenticData = authenticData;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if checks are disabled.
|
||||
* @return The status of the CheckDisabled flag.
|
||||
*/
|
||||
public boolean isCheckDisabled() {
|
||||
return checkDisabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* Change the check status of this packet.
|
||||
* @param checkDisabled The new check disabled value.
|
||||
*/
|
||||
public void setCheckDisabled(boolean checkDisabled) {
|
||||
this.checkDisabled = checkDisabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate a binary dns packet out of this message.
|
||||
* @return byte[] the binary representation.
|
||||
* @throws IOException Should never happen.
|
||||
*/
|
||||
public byte[] toArray() throws IOException {
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
|
||||
DataOutputStream dos = new DataOutputStream(baos);
|
||||
int header = 0;
|
||||
if (query) {
|
||||
header += 1 << 15;
|
||||
}
|
||||
if (opcode != null) {
|
||||
header += opcode.getValue() << 11;
|
||||
}
|
||||
if (authoritativeAnswer) {
|
||||
header += 1 << 10;
|
||||
}
|
||||
if (truncated) {
|
||||
header += 1 << 9;
|
||||
}
|
||||
if (recursionDesired) {
|
||||
header += 1 << 8;
|
||||
}
|
||||
if (recursionAvailable) {
|
||||
header += 1 << 7;
|
||||
}
|
||||
if (authenticData) {
|
||||
header += 1 << 5;
|
||||
}
|
||||
if (checkDisabled) {
|
||||
header += 1 << 4;
|
||||
}
|
||||
if (responseCode != null) {
|
||||
header += responseCode.getValue();
|
||||
}
|
||||
dos.writeShort((short)id);
|
||||
dos.writeShort((short)header);
|
||||
if (questions == null) {
|
||||
dos.writeShort(0);
|
||||
} else {
|
||||
dos.writeShort((short)questions.length);
|
||||
}
|
||||
if (answers == null) {
|
||||
dos.writeShort(0);
|
||||
} else {
|
||||
dos.writeShort((short)answers.length);
|
||||
}
|
||||
if (nameserverRecords == null) {
|
||||
dos.writeShort(0);
|
||||
} else {
|
||||
dos.writeShort((short)nameserverRecords.length);
|
||||
}
|
||||
if (additionalResourceRecords == null) {
|
||||
dos.writeShort(0);
|
||||
} else {
|
||||
dos.writeShort((short)additionalResourceRecords.length);
|
||||
}
|
||||
for (Question question: questions) {
|
||||
dos.write(question.toByteArray());
|
||||
}
|
||||
dos.flush();
|
||||
return baos.toByteArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* Build a DNS Message based on a binary DNS message.
|
||||
* @param data The DNS message data.
|
||||
* @return Parsed DNSMessage message.
|
||||
* @throws IOException On read errors.
|
||||
*/
|
||||
public static DNSMessage parse(byte data[]) throws IOException {
|
||||
ByteArrayInputStream bis = new ByteArrayInputStream(data);
|
||||
DataInputStream dis = new DataInputStream(bis);
|
||||
DNSMessage message = new DNSMessage();
|
||||
message.id = dis.readUnsignedShort();
|
||||
int header = dis.readUnsignedShort();
|
||||
message.query = ((header >> 15) & 1) == 0;
|
||||
message.opcode = OPCODE.getOpcode((header >> 11) & 0xf);
|
||||
message.authoritativeAnswer = ((header >> 10) & 1) == 1;
|
||||
message.truncated = ((header >> 9) & 1) == 1;
|
||||
message.recursionDesired = ((header >> 8) & 1) == 1;
|
||||
message.recursionAvailable = ((header >> 7) & 1) == 1;
|
||||
message.authenticData = ((header >> 5) & 1) == 1;
|
||||
message.checkDisabled = ((header >> 4) & 1) == 1;
|
||||
message.responseCode = RESPONSE_CODE.getResponseCode(header & 0xf);
|
||||
message.receiveTimestamp = System.currentTimeMillis();
|
||||
int questionCount = dis.readUnsignedShort();
|
||||
int answerCount = dis.readUnsignedShort();
|
||||
int nameserverCount = dis.readUnsignedShort();
|
||||
int additionalResourceRecordCount = dis.readUnsignedShort();
|
||||
message.questions = new Question[questionCount];
|
||||
while (questionCount-- > 0) {
|
||||
Question q = Question.parse(dis, data);
|
||||
message.questions[questionCount] = q;
|
||||
}
|
||||
message.answers = new Record[answerCount];
|
||||
while (answerCount-- > 0) {
|
||||
Record rr = new Record();
|
||||
rr.parse(dis, data);
|
||||
message.answers[answerCount] = rr;
|
||||
}
|
||||
message.nameserverRecords = new Record[nameserverCount];
|
||||
while (nameserverCount-- > 0) {
|
||||
Record rr = new Record();
|
||||
rr.parse(dis, data);
|
||||
message.nameserverRecords[nameserverCount] = rr;
|
||||
}
|
||||
message.additionalResourceRecords =
|
||||
new Record[additionalResourceRecordCount];
|
||||
while (additionalResourceRecordCount-- > 0) {
|
||||
Record rr = new Record();
|
||||
rr.parse(dis, data);
|
||||
message.additionalResourceRecords[additionalResourceRecordCount] =
|
||||
rr;
|
||||
}
|
||||
return message;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the question part of this message.
|
||||
* @param questions The questions.
|
||||
*/
|
||||
public void setQuestions(Question ... questions) {
|
||||
this.questions = questions;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the opcode of this message.
|
||||
* @return The opcode of this message.
|
||||
*/
|
||||
public OPCODE getOpcode() {
|
||||
return opcode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the response code of this message.
|
||||
* @return The response code.
|
||||
*/
|
||||
public RESPONSE_CODE getResponseCode() {
|
||||
return responseCode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the question section of this message.
|
||||
* @return The DNS question section.
|
||||
*/
|
||||
public Question[] getQuestions() {
|
||||
return questions;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the answer records of this DNS message.
|
||||
* @return The answer section of this DNS message.
|
||||
*/
|
||||
public Record[] getAnswers() {
|
||||
return answers;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the nameserver records of this DNS message.
|
||||
* @return The nameserver section of this DNS message.
|
||||
*/
|
||||
public Record[] getNameserverRecords() {
|
||||
return nameserverRecords;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the additional resource records attached to this DNS message.
|
||||
* @return The additional resource record section of this DNS message.
|
||||
*/
|
||||
public Record[] getAdditionalResourceRecords() {
|
||||
return additionalResourceRecords;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return "-- DNSMessage " + id + " --\n" +
|
||||
"Q" + Arrays.toString(questions) +
|
||||
"NS" + Arrays.toString(nameserverRecords) +
|
||||
"A" + Arrays.toString(answers) +
|
||||
"ARR" + Arrays.toString(additionalResourceRecords);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,139 +0,0 @@
|
|||
package de.measite.minidns;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
/**
|
||||
* LRU based DNSCache backed by a LinkedHashMap.
|
||||
*/
|
||||
public class LRUCache implements DNSCache {
|
||||
|
||||
/**
|
||||
* Internal miss count.
|
||||
*/
|
||||
protected long missCount = 0l;
|
||||
|
||||
/**
|
||||
* Internal expire count (subset of misses that was caused by expire).
|
||||
*/
|
||||
protected long expireCount = 0l;
|
||||
|
||||
/**
|
||||
* Internal hit count.
|
||||
*/
|
||||
protected long hitCount = 0l;
|
||||
|
||||
/**
|
||||
* The internal capacity of the backend cache.
|
||||
*/
|
||||
protected int capacity;
|
||||
|
||||
/**
|
||||
* The upper bound of the ttl. All longer TTLs will be capped by this ttl.
|
||||
*/
|
||||
protected long maxTTL;
|
||||
|
||||
/**
|
||||
* The backend cache.
|
||||
*/
|
||||
protected LinkedHashMap<Question, DNSMessage> backend;
|
||||
|
||||
/**
|
||||
* Create a new LRUCache with given capacity and upper bound ttl.
|
||||
* @param capacity The internal capacity.
|
||||
* @param maxTTL The upper bound for any ttl.
|
||||
*/
|
||||
@SuppressWarnings("serial")
|
||||
public LRUCache(final int capacity, final long maxTTL) {
|
||||
this.capacity = capacity;
|
||||
this.maxTTL = maxTTL;
|
||||
backend = new LinkedHashMap<Question,DNSMessage>(
|
||||
Math.min(capacity + (capacity + 3) / 4 + 2, 11), 0.75f, true)
|
||||
{
|
||||
@Override
|
||||
protected boolean removeEldestEntry(
|
||||
Entry<Question, DNSMessage> eldest) {
|
||||
return size() > capacity;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new LRUCache with given capacity.
|
||||
* @param capacity The capacity of this cache.
|
||||
*/
|
||||
public LRUCache(final int capacity) {
|
||||
this(capacity, Long.MAX_VALUE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void put(Question q, DNSMessage message) {
|
||||
if (message.getReceiveTimestamp() <= 0l) {
|
||||
return;
|
||||
}
|
||||
backend.put(q, message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized DNSMessage get(Question q) {
|
||||
DNSMessage message = backend.get(q);
|
||||
if (message == null) {
|
||||
missCount++;
|
||||
return null;
|
||||
}
|
||||
|
||||
long ttl = maxTTL;
|
||||
for (Record r : message.getAnswers()) {
|
||||
ttl = Math.min(ttl, r.ttl);
|
||||
}
|
||||
for (Record r : message.getAdditionalResourceRecords()) {
|
||||
ttl = Math.min(ttl, r.ttl);
|
||||
}
|
||||
if (message.getReceiveTimestamp() + ttl > System.currentTimeMillis()) {
|
||||
missCount++;
|
||||
expireCount++;
|
||||
backend.remove(q);
|
||||
return null;
|
||||
} else {
|
||||
hitCount++;
|
||||
return message;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear all entries in this cache.
|
||||
*/
|
||||
public synchronized void clear() {
|
||||
backend.clear();
|
||||
missCount = 0l;
|
||||
hitCount = 0l;
|
||||
expireCount = 0l;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the miss count of this cache which is the number of fruitless
|
||||
* get calls since this cache was last resetted.
|
||||
* @return The number of cache misses.
|
||||
*/
|
||||
public long getMissCount() {
|
||||
return missCount;
|
||||
}
|
||||
|
||||
/**
|
||||
* The number of expires (cache hits that have had a ttl to low to be
|
||||
* retrieved).
|
||||
* @return The expire count.
|
||||
*/
|
||||
public long getExpireCount() {
|
||||
return expireCount;
|
||||
}
|
||||
|
||||
/**
|
||||
* The cache hit count (all sucessful calls to get).
|
||||
* @return The hit count.
|
||||
*/
|
||||
public long getHitCount() {
|
||||
return hitCount;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,158 +0,0 @@
|
|||
package de.measite.minidns;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
|
||||
import de.measite.minidns.Record.CLASS;
|
||||
import de.measite.minidns.Record.TYPE;
|
||||
import de.measite.minidns.util.NameUtil;
|
||||
|
||||
/**
|
||||
* A DNS question (request).
|
||||
*/
|
||||
public class Question {
|
||||
|
||||
/**
|
||||
* The question string (e.g. "measite.de").
|
||||
*/
|
||||
private final String name;
|
||||
|
||||
/**
|
||||
* The question type (e.g. A).
|
||||
*/
|
||||
private final TYPE type;
|
||||
|
||||
/**
|
||||
* The question class (usually IN / internet).
|
||||
*/
|
||||
private final CLASS clazz;
|
||||
|
||||
/**
|
||||
* UnicastQueries have the highest bit of the CLASS field set to 1.
|
||||
*/
|
||||
private final boolean unicastQuery;
|
||||
|
||||
/**
|
||||
* Cache for the serialized object.
|
||||
*/
|
||||
private byte[] byteArray;
|
||||
|
||||
/**
|
||||
* Create a dns question for the given name/type/class.
|
||||
* @param name The name e.g. "measite.de".
|
||||
* @param type The type, e.g. A.
|
||||
* @param clazz The class, usually IN (internet).
|
||||
*/
|
||||
public Question(String name, TYPE type, CLASS clazz, boolean unicastQuery) {
|
||||
this.name = name;
|
||||
this.type = type;
|
||||
this.clazz = clazz;
|
||||
this.unicastQuery = unicastQuery;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a dns question for the given name/type/class.
|
||||
* @param name The name e.g. "measite.de".
|
||||
* @param type The type, e.g. A.
|
||||
* @param clazz The class, usually IN (internet).
|
||||
*/
|
||||
public Question(String name, TYPE type, CLASS clazz) {
|
||||
this(name, type, clazz, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a dns question for the given name/type/IN (internet class).
|
||||
* @param name The name e.g. "measite.de".
|
||||
* @param type The type, e.g. A.
|
||||
*/
|
||||
public Question(String name, TYPE type) {
|
||||
this(name, type, CLASS.IN);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the type of this question.
|
||||
* @return The type.
|
||||
*/
|
||||
public TYPE getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the class of this dns question (usually internet).
|
||||
* @return The class of this dns question.
|
||||
*/
|
||||
public CLASS getClazz() {
|
||||
return clazz;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the name of this dns question (e.g. "measite.de").
|
||||
* @return The name of this dns question.
|
||||
*/
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse a byte array and rebuild the dns question from it.
|
||||
* @param dis The input stream.
|
||||
* @param data The plain data (for dns name references).
|
||||
* @return The parsed dns question.
|
||||
* @throws IOException On errors (read outside of packet).
|
||||
*/
|
||||
public static Question parse(DataInputStream dis, byte[] data) throws IOException {
|
||||
String name = NameUtil.parse(dis, data);
|
||||
TYPE type = TYPE.getType(dis.readUnsignedShort());
|
||||
CLASS clazz = CLASS.getClass(dis.readUnsignedShort());
|
||||
return new Question (name, type, clazz);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate a binary paket for this dns question.
|
||||
* @return The dns question.
|
||||
*/
|
||||
public byte[] toByteArray() {
|
||||
if (byteArray == null) {
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
|
||||
DataOutputStream dos = new DataOutputStream(baos);
|
||||
|
||||
try {
|
||||
dos.write(NameUtil.toByteArray(this.name));
|
||||
dos.writeShort(type.getValue());
|
||||
dos.writeShort(clazz.getValue() | (unicastQuery ? (1 << 15) : 0));
|
||||
dos.flush();
|
||||
} catch (IOException e) {
|
||||
// Should never happen
|
||||
throw new IllegalStateException(e);
|
||||
}
|
||||
byteArray = baos.toByteArray();
|
||||
}
|
||||
return byteArray;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Arrays.hashCode(toByteArray());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
if (this == other) {
|
||||
return true;
|
||||
}
|
||||
if (!(other instanceof Question)) {
|
||||
return false;
|
||||
}
|
||||
byte t[] = toByteArray();
|
||||
byte o[] = ((Question)other).toByteArray();
|
||||
return Arrays.equals(t, o);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Question/" + clazz + "/" + type + ": " + name;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,343 +0,0 @@
|
|||
package de.measite.minidns;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import de.measite.minidns.record.A;
|
||||
import de.measite.minidns.record.AAAA;
|
||||
import de.measite.minidns.record.CNAME;
|
||||
import de.measite.minidns.record.Data;
|
||||
import de.measite.minidns.record.NS;
|
||||
import de.measite.minidns.record.PTR;
|
||||
import de.measite.minidns.record.SRV;
|
||||
import de.measite.minidns.record.TXT;
|
||||
import de.measite.minidns.util.NameUtil;
|
||||
|
||||
/**
|
||||
* A generic DNS record.
|
||||
*/
|
||||
public class Record {
|
||||
|
||||
private static final Logger LOGGER = Logger.getLogger(Client.class.getName());
|
||||
|
||||
/**
|
||||
* The record type.
|
||||
* @see <a href="http://www.iana.org/assignments/dns-parameters">IANA DNS Parameters</a>
|
||||
*/
|
||||
public static enum TYPE {
|
||||
A(1),
|
||||
NS(2),
|
||||
MD(3),
|
||||
MF(4),
|
||||
CNAME(5),
|
||||
SOA(6),
|
||||
MB(7),
|
||||
MG(8),
|
||||
MR(9),
|
||||
NULL(10),
|
||||
WKS(11),
|
||||
PTR(12),
|
||||
HINFO(13),
|
||||
MINFO(14),
|
||||
MX(15),
|
||||
TXT(16),
|
||||
RP(17),
|
||||
AFSDB(18),
|
||||
X25(19),
|
||||
ISDN(20),
|
||||
RT(21),
|
||||
NSAP(22),
|
||||
NSAP_PTR(23),
|
||||
SIG(24),
|
||||
KEY(25),
|
||||
PX(26),
|
||||
GPOS(27),
|
||||
AAAA(28),
|
||||
LOC(29),
|
||||
NXT(30),
|
||||
EID(31),
|
||||
NIMLOC(32),
|
||||
SRV(33),
|
||||
ATMA(34),
|
||||
NAPTR(35),
|
||||
KX(36),
|
||||
CERT(37),
|
||||
A6(38),
|
||||
DNAME(39),
|
||||
SINK(40),
|
||||
OPT(41),
|
||||
APL(42),
|
||||
DS(43),
|
||||
SSHFP(44),
|
||||
IPSECKEY(45),
|
||||
RRSIG(46),
|
||||
NSEC(47),
|
||||
DNSKEY(48),
|
||||
DHCID(49),
|
||||
NSEC3(50),
|
||||
NSEC3PARAM(51),
|
||||
HIP(55),
|
||||
NINFO(56),
|
||||
RKEY(57),
|
||||
TALINK(58),
|
||||
SPF(99),
|
||||
UINFO(100),
|
||||
UID(101),
|
||||
GID(102),
|
||||
TKEY(249),
|
||||
TSIG(250),
|
||||
IXFR(251),
|
||||
AXFR(252),
|
||||
MAILB(253),
|
||||
MAILA(254),
|
||||
ANY(255),
|
||||
TA(32768),
|
||||
DLV(32769);
|
||||
|
||||
/**
|
||||
* The value of this DNS record type.
|
||||
*/
|
||||
private final int value;
|
||||
|
||||
/**
|
||||
* Internal lookup table to map values to types.
|
||||
*/
|
||||
private final static HashMap<Integer, TYPE> INVERSE_LUT =
|
||||
new HashMap<Integer, TYPE>();
|
||||
|
||||
/**
|
||||
* Initialize the reverse lookup table.
|
||||
*/
|
||||
static {
|
||||
for(TYPE t: TYPE.values()) {
|
||||
INVERSE_LUT.put(t.getValue(), t);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new record type.
|
||||
* @param value The binary value of this type.
|
||||
*/
|
||||
private TYPE(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the binary value of this type.
|
||||
* @return The binary value.
|
||||
*/
|
||||
public int getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the symbolic type of the binary value.
|
||||
* @param value The binary type value.
|
||||
* @return The symbolic tpye.
|
||||
*/
|
||||
public static TYPE getType(int value) {
|
||||
return INVERSE_LUT.get(value);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* The symbolic class of a DNS record (usually IN for Internet).
|
||||
*/
|
||||
public static enum CLASS {
|
||||
IN(1),
|
||||
CH(3),
|
||||
HS(4),
|
||||
NONE(254),
|
||||
ANY(255);
|
||||
|
||||
/**
|
||||
* Internal reverse lookup table to map binary class values to symbolic
|
||||
* names.
|
||||
*/
|
||||
private final static HashMap<Integer, CLASS> INVERSE_LUT =
|
||||
new HashMap<Integer, CLASS>();
|
||||
|
||||
/**
|
||||
* Initialize the interal reverse lookup table.
|
||||
*/
|
||||
static {
|
||||
for(CLASS c: CLASS.values()) {
|
||||
INVERSE_LUT.put(c.getValue(), c);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The binary value of this dns class.
|
||||
*/
|
||||
private final int value;
|
||||
|
||||
/**
|
||||
* Create a new DNS class based on a binary value.
|
||||
* @param value The binary value of this DNS class.
|
||||
*/
|
||||
private CLASS(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the binary value of this DNS class.
|
||||
* @return The binary value of this DNS class.
|
||||
*/
|
||||
public int getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the symbolic DNS class for a binary class value.
|
||||
* @param value The binary DNS class value.
|
||||
* @return The symbolic class instance.
|
||||
*/
|
||||
public static CLASS getClass(int value) {
|
||||
return INVERSE_LUT.get(value);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* The generic name of this record.
|
||||
*/
|
||||
protected String name;
|
||||
|
||||
/**
|
||||
* The type (and payload type) of this record.
|
||||
*/
|
||||
protected TYPE type;
|
||||
|
||||
/**
|
||||
* The record class (usually CLASS.IN).
|
||||
*/
|
||||
protected CLASS clazz;
|
||||
|
||||
/**
|
||||
* The ttl of this record.
|
||||
*/
|
||||
protected long ttl;
|
||||
|
||||
/**
|
||||
* The payload object of this record.
|
||||
*/
|
||||
protected Data payloadData;
|
||||
|
||||
/**
|
||||
* MDNS defines the highest bit of the class as the unicast query bit.
|
||||
*/
|
||||
protected boolean unicastQuery;
|
||||
|
||||
/**
|
||||
* Parse a given record based on the full message data and the current
|
||||
* stream position.
|
||||
* @param dis The DataInputStream positioned at the first record byte.
|
||||
* @param data The full message data.
|
||||
* @throws IOException In case of malformed replies.
|
||||
*/
|
||||
public void parse(DataInputStream dis, byte[] data) throws IOException {
|
||||
this.name = NameUtil.parse(dis, data);
|
||||
this.type = TYPE.getType(dis.readUnsignedShort());
|
||||
int clazzValue = dis.readUnsignedShort();
|
||||
this.clazz = CLASS.getClass(clazzValue & 0x7fff);
|
||||
this.unicastQuery = (clazzValue & 0x8000) > 0;
|
||||
if (this.clazz == null) {
|
||||
LOGGER.log(Level.FINE, "Unknown class " + clazzValue);
|
||||
}
|
||||
this.ttl = (((long)dis.readUnsignedShort()) << 32) +
|
||||
dis.readUnsignedShort();
|
||||
int payloadLength = dis.readUnsignedShort();
|
||||
switch (this.type) {
|
||||
case SRV:
|
||||
this.payloadData = new SRV();
|
||||
break;
|
||||
case AAAA:
|
||||
this.payloadData = new AAAA();
|
||||
break;
|
||||
case A:
|
||||
this.payloadData = new A();
|
||||
break;
|
||||
case NS:
|
||||
this.payloadData = new NS();
|
||||
break;
|
||||
case CNAME:
|
||||
this.payloadData = new CNAME();
|
||||
break;
|
||||
case PTR:
|
||||
this.payloadData = new PTR();
|
||||
break;
|
||||
case TXT:
|
||||
this.payloadData = new TXT();
|
||||
break;
|
||||
default:
|
||||
LOGGER.log(Level.FINE, "Unparsed type " + type);
|
||||
this.payloadData = null;
|
||||
for (int i = 0; i < payloadLength; i++) {
|
||||
dis.readByte();
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (this.payloadData != null) {
|
||||
this.payloadData.parse(dis, data, payloadLength);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve a textual representation of this resource record.
|
||||
* @return String
|
||||
*/
|
||||
@Override
|
||||
public String toString() {
|
||||
if (payloadData == null) {
|
||||
return "RR " + type + "/" + clazz;
|
||||
}
|
||||
return "RR " + type + "/" + clazz + ": " + payloadData.toString();
|
||||
};
|
||||
|
||||
/**
|
||||
* Check if this record answers a given query.
|
||||
* @param q The query.
|
||||
* @return True if this record is a valid answer.
|
||||
*/
|
||||
public boolean isAnswer(Question q) {
|
||||
return ((q.getType() == type) || (q.getType() == TYPE.ANY)) &&
|
||||
((q.getClazz() == clazz) || (q.getClazz() == CLASS.ANY)) &&
|
||||
(q.getName().equals(name));
|
||||
}
|
||||
|
||||
/**
|
||||
* See if this query/response was a unicast query (highest class bit set).
|
||||
* @return True if it is a unicast query/response record.
|
||||
*/
|
||||
public boolean isUnicastQuery() {
|
||||
return unicastQuery;
|
||||
}
|
||||
|
||||
/**
|
||||
* The generic record name, e.g. "measite.de".
|
||||
* @return The record name.
|
||||
*/
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* The payload data, usually a subclass of data (A, AAAA, CNAME, ...).
|
||||
* @return The payload data.
|
||||
*/
|
||||
public Data getPayload() {
|
||||
return payloadData;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the record ttl.
|
||||
* @return The record ttl.
|
||||
*/
|
||||
public long getTtl() {
|
||||
return ttl;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
package de.measite.minidns.record;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import de.measite.minidns.Record.TYPE;
|
||||
|
||||
/**
|
||||
* A record payload (ip pointer).
|
||||
*/
|
||||
public class A implements Data {
|
||||
|
||||
/**
|
||||
* Target IP.
|
||||
*/
|
||||
private byte[] ip;
|
||||
|
||||
@Override
|
||||
public TYPE getType() {
|
||||
return TYPE.A;
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] toByteArray() {
|
||||
return ip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void parse(DataInputStream dis, byte[] data, int length)
|
||||
throws IOException {
|
||||
ip = new byte[4];
|
||||
dis.readFully(ip);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return Integer.toString(ip[0] & 0xff) + "." +
|
||||
Integer.toString(ip[1] & 0xff) + "." +
|
||||
Integer.toString(ip[2] & 0xff) + "." +
|
||||
Integer.toString(ip[3] & 0xff);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
package de.measite.minidns.record;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import de.measite.minidns.Record.TYPE;
|
||||
|
||||
/**
|
||||
* AAAA payload (an ipv6 pointer).
|
||||
*/
|
||||
public class AAAA implements Data {
|
||||
|
||||
/**
|
||||
* The ipv6 address.
|
||||
*/
|
||||
private byte[] ip;
|
||||
|
||||
@Override
|
||||
public TYPE getType() {
|
||||
return TYPE.AAAA;
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] toByteArray() {
|
||||
return ip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void parse(DataInputStream dis, byte[] data, int length)
|
||||
throws IOException {
|
||||
ip = new byte[16];
|
||||
dis.readFully(ip);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (int i = 0; i < ip.length; i += 2) {
|
||||
if (i != 0) {
|
||||
sb.append(':');
|
||||
}
|
||||
sb.append(Integer.toHexString(
|
||||
((ip[i] & 0xff) << 8) + (ip[i + 1] & 0xff)
|
||||
));
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
package de.measite.minidns.record;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import de.measite.minidns.Record.TYPE;
|
||||
import de.measite.minidns.util.NameUtil;
|
||||
|
||||
/**
|
||||
* CNAME payload (pointer to another domain / address).
|
||||
*/
|
||||
public class CNAME implements Data {
|
||||
|
||||
protected String name;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] toByteArray() {
|
||||
throw new UnsupportedOperationException("Not implemented yet");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void parse(DataInputStream dis, byte[] data, int length)
|
||||
throws IOException
|
||||
{
|
||||
this.name = NameUtil.parse(dis, data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TYPE getType() {
|
||||
return TYPE.CNAME;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "to \"" + name + "\"";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
package de.measite.minidns.record;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import de.measite.minidns.Record.TYPE;
|
||||
|
||||
/**
|
||||
* Generic payload class.
|
||||
*/
|
||||
public interface Data {
|
||||
|
||||
/**
|
||||
* The payload type.
|
||||
* @return The payload type.
|
||||
*/
|
||||
TYPE getType();
|
||||
|
||||
/**
|
||||
* Binary representation of this payload.
|
||||
* @return The binary representation of this payload.
|
||||
*/
|
||||
byte[] toByteArray();
|
||||
|
||||
/**
|
||||
* Parse this payload.
|
||||
* @param dis The input stream.
|
||||
* @param data The plain data (needed for name cross references).
|
||||
* @param length The payload length.
|
||||
* @throws IOException on io error (read past paket boundary).
|
||||
*/
|
||||
void parse(DataInputStream dis, byte data[], int length) throws IOException;
|
||||
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
package de.measite.minidns.record;
|
||||
|
||||
import de.measite.minidns.Record.TYPE;
|
||||
|
||||
/**
|
||||
* Nameserver record.
|
||||
*/
|
||||
public class NS extends CNAME {
|
||||
|
||||
@Override
|
||||
public TYPE getType() {
|
||||
return TYPE.NS;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
package de.measite.minidns.record;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import de.measite.minidns.Record.TYPE;
|
||||
import de.measite.minidns.util.NameUtil;
|
||||
|
||||
/**
|
||||
* A PTR record is handled like a CNAME
|
||||
*/
|
||||
public class PTR extends CNAME {
|
||||
|
||||
@Override
|
||||
public TYPE getType() {
|
||||
return TYPE.PTR;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,124 +0,0 @@
|
|||
package de.measite.minidns.record;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import de.measite.minidns.Record.TYPE;
|
||||
import de.measite.minidns.util.NameUtil;
|
||||
|
||||
/**
|
||||
* SRV record payload (service pointer).
|
||||
*/
|
||||
public class SRV implements Data {
|
||||
|
||||
/**
|
||||
* The priority of this service.
|
||||
*/
|
||||
protected int priority;
|
||||
|
||||
/**
|
||||
* The weight of this service.
|
||||
*/
|
||||
protected int weight;
|
||||
|
||||
/**
|
||||
* The target port.
|
||||
*/
|
||||
protected int port;
|
||||
|
||||
/**
|
||||
* The target server.
|
||||
*/
|
||||
protected String name;
|
||||
|
||||
/**
|
||||
* The priority of this service. Lower values mean higher priority.
|
||||
* @return The priority.
|
||||
*/
|
||||
public int getPriority() {
|
||||
return priority;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the priority of this service entry. Lower values have higher priority.
|
||||
* @param priority The new priority.
|
||||
*/
|
||||
public void setPriority(int priority) {
|
||||
this.priority = priority;
|
||||
}
|
||||
|
||||
/**
|
||||
* The weight of this service. Services with the same priority should be
|
||||
* balanced based on weight.
|
||||
* @return The weight of this service.
|
||||
*/
|
||||
public int getWeight() {
|
||||
return weight;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the weight of this service.
|
||||
* @param weight The new weight of this service.
|
||||
*/
|
||||
public void setWeight(int weight) {
|
||||
this.weight = weight;
|
||||
}
|
||||
|
||||
/**
|
||||
* The target port of this service.
|
||||
* @return The target port of this service.
|
||||
*/
|
||||
public int getPort() {
|
||||
return port;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the target port of this service.
|
||||
* @param port The new target port.
|
||||
*/
|
||||
public void setPort(int port) {
|
||||
this.port = port;
|
||||
}
|
||||
|
||||
/**
|
||||
* The name of the target server.
|
||||
* @return The target servers name.
|
||||
*/
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the name of the target server.
|
||||
* @param name The new target servers name.
|
||||
*/
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] toByteArray() {
|
||||
throw new UnsupportedOperationException("Not implemented yet");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void parse(DataInputStream dis, byte[] data, int length)
|
||||
throws IOException
|
||||
{
|
||||
this.priority = dis.readUnsignedShort();
|
||||
this.weight = dis.readUnsignedShort();
|
||||
this.port = dis.readUnsignedShort();
|
||||
this.name = NameUtil.parse(dis, data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "SRV " + name + ":" + port + " p:" + priority + " w:" + weight;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TYPE getType() {
|
||||
return TYPE.SRV;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
package de.measite.minidns.record;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import de.measite.minidns.Record.TYPE;
|
||||
import de.measite.minidns.util.NameUtil;
|
||||
|
||||
/**
|
||||
* TXT record (actually a binary blob with wrappers for text content).
|
||||
*/
|
||||
public class TXT implements Data {
|
||||
|
||||
protected byte[] blob;
|
||||
|
||||
public byte[] getBlob() {
|
||||
return blob;
|
||||
}
|
||||
|
||||
public void setBlob(byte[] blob) {
|
||||
this.blob = blob;
|
||||
}
|
||||
|
||||
public String getText() {
|
||||
try {
|
||||
return (new String(blob, "UTF-8")).intern();
|
||||
} catch (Exception e) {
|
||||
/* Can't happen for UTF-8 unless it's really a blob */
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void setText(String text) {
|
||||
try {
|
||||
this.blob = text.getBytes("UTF-8");
|
||||
} catch (Exception e) {
|
||||
/* Can't happen, UTF-8 IS supported */
|
||||
throw new RuntimeException("UTF-8 not supported", e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] toByteArray() {
|
||||
throw new UnsupportedOperationException("Not implemented yet");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void parse(DataInputStream dis, byte[] data, int length)
|
||||
throws IOException
|
||||
{
|
||||
blob = new byte[length];
|
||||
dis.readFully(blob);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TYPE getType() {
|
||||
return TYPE.TXT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "\"" + getText() + "\"";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,129 +0,0 @@
|
|||
package de.measite.minidns.util;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.net.IDN;
|
||||
import java.util.HashSet;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* Utilities related to internationalized domain names and dns name handling.
|
||||
*/
|
||||
public class NameUtil {
|
||||
|
||||
/**
|
||||
* Retrieve the rough binary length of a string
|
||||
* (length + 2 bytes length prefix).
|
||||
* @param name The name string.
|
||||
* @return The binary size of the string (length + 2).
|
||||
*/
|
||||
public static int size(String name) {
|
||||
return name.length() + 2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if two internationalized domain names are equal, possibly causing
|
||||
* a serialization of both domain names.
|
||||
* @param name1 The first domain name.
|
||||
* @param name2 The second domain name.
|
||||
* @return True if both domain names are the same.
|
||||
*/
|
||||
public static boolean idnEquals(String name1, String name2) {
|
||||
if (name1 == name2) return true; // catches null, null
|
||||
if (name1 == null) return false;
|
||||
if (name2 == null) return false;
|
||||
if (name1.equals(name2)) return true;
|
||||
|
||||
try {
|
||||
return Arrays.equals(toByteArray(name1),toByteArray(name2));
|
||||
} catch (IOException e) {
|
||||
return false; // impossible
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Serialize a domain name under IDN rules.
|
||||
* @param name The domain name.
|
||||
* @return The binary domain name representation.
|
||||
* @throws IOException Should never happen.
|
||||
*/
|
||||
public static byte[] toByteArray(String name) throws IOException {
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream(64);
|
||||
DataOutputStream dos = new DataOutputStream(baos);
|
||||
for (String s: name.split("[.\u3002\uFF0E\uFF61]")) {
|
||||
byte[] buffer = IDN.toASCII(s).getBytes();
|
||||
dos.writeByte(buffer.length);
|
||||
dos.write(buffer);
|
||||
}
|
||||
dos.writeByte(0);
|
||||
dos.flush();
|
||||
return baos.toByteArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse a domain name starting at the current offset and moving the input
|
||||
* stream pointer past this domain name (even if cross references occure).
|
||||
* @param dis The input stream.
|
||||
* @param data The raw data (for cross references).
|
||||
* @return The domain name string.
|
||||
* @throws IOException Should never happen.
|
||||
*/
|
||||
public static String parse(DataInputStream dis, byte data[])
|
||||
throws IOException
|
||||
{
|
||||
int c = dis.readUnsignedByte();
|
||||
if ((c & 0xc0) == 0xc0) {
|
||||
c = ((c & 0x3f) << 8) + dis.readUnsignedByte();
|
||||
HashSet<Integer> jumps = new HashSet<Integer>();
|
||||
jumps.add(c);
|
||||
return parse(data, c, jumps);
|
||||
}
|
||||
if (c == 0) {
|
||||
return "";
|
||||
}
|
||||
byte b[] = new byte[c];
|
||||
dis.readFully(b);
|
||||
String s = IDN.toUnicode(new String(b));
|
||||
String t = parse(dis, data);
|
||||
if (t.length() > 0) {
|
||||
s = s + "." + t;
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse a domain name starting at the given offset.
|
||||
* @param data The raw data.
|
||||
* @param offset The offset.
|
||||
* @param jumps The list of jumps (by now).
|
||||
* @return The parsed domain name.
|
||||
* @throws IllegalStateException on cycles.
|
||||
*/
|
||||
public static String parse(
|
||||
byte data[],
|
||||
int offset,
|
||||
HashSet<Integer> jumps
|
||||
) {
|
||||
int c = data[offset] & 0xff;
|
||||
if ((c & 0xc0) == 0xc0) {
|
||||
c = ((c & 0x3f) << 8) + (data[offset + 1] & 0xff);
|
||||
if (jumps.contains(c)) {
|
||||
throw new IllegalStateException("Cyclic offsets detected.");
|
||||
}
|
||||
jumps.add(c);
|
||||
return parse(data, c, jumps);
|
||||
}
|
||||
if (c == 0) {
|
||||
return "";
|
||||
}
|
||||
String s = new String(data,offset + 1, c);
|
||||
String t = parse(data, offset + 1 + c, jumps);
|
||||
if (t.length() > 0) {
|
||||
s = s + "." + t;
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue