Skip to content

patch to support mDNS and multicast to servers #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ka2ddo wants to merge 11 commits into
base: master
Choose a base branch
from
+235 −92
Open

patch to support mDNS and multicast to servers #148

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
504fe0d
Update SimpleResolver.java
ka2ddo Jan 6, 2021
fce0cf8
Update NioUdpClient.java
ka2ddo Jan 6, 2021
544182b
Update SimpleResolver.java
ka2ddo Jan 6, 2021
855b7be
reduce duplicate code in mDNS support changes
ka2ddo Jan 7, 2021
1cf8fb8
reduce duplicated code in mDNS changes
ka2ddo Jan 7, 2021
cc916e5
resolve format complaints in mDNS-modified code
ka2ddo Jan 7, 2021
e838df6
resolve format complaints in mDNS changes
ka2ddo Jan 7, 2021
92d98d5
resolve issues reported by dnsjava over regarding consistent behavior
ka2ddo Mar 13, 2021
80aa3cd
a few more bugfixes to the mDNS changes per dnsjava author's request.
ka2ddo Mar 13, 2021
31f2621
make the format checker happy (again!).
ka2ddo Mar 13, 2021
c1ce27b
more formatting issues that the online checker didn't report on the
ka2ddo Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resolve format complaints in mDNS-modified code 
resolve maven com.coveo:format plugin's complaints
  • Loading branch information
@ka2ddo
ka2ddo authored Jan 7, 2021
commit cc916e5a6872ace64216fcf793542169a16e2e24
34 changes: 13 additions & 21 deletions src/main/java/org/xbill/DNS/NioUdpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,7 @@ private static class Transaction implements KeyProcessor {

void send() throws IOException {
ByteBuffer buffer = ByteBuffer.wrap(data);
verboseLog(
"UDP write",
channel.socket().getLocalSocketAddress(),
remoteSocketAddress,
data);
verboseLog("UDP write", channel.socket().getLocalSocketAddress(), remoteSocketAddress, data);
int n = channel.send(buffer, remoteSocketAddress);
if (n <= 0) {
throw new EOFException();
Expand Down Expand Up @@ -131,11 +127,7 @@ public void processReadyKey(SelectionKey key) {
buffer.flip();
byte[] data = new byte[read];
System.arraycopy(buffer.array(), 0, data, 0, read);
verboseLog(
"UDP read",
channel.socket().getLocalSocketAddress(),
source,
data);
verboseLog("UDP read", channel.socket().getLocalSocketAddress(), source, data);
silentCloseChannel();
f.complete(Collections.singletonList(data));
pendingTransactions.remove(this);
Expand All @@ -157,13 +149,17 @@ void closeTransaction() {
}

private static class MultiAnswerTransaction extends Transaction {
MultiAnswerTransaction(byte[] query, int max, long endTime, DatagramChannel channel,
SocketAddress remoteSocketAddress,
CompletableFuture<List<byte[]>> f) {
super(query, max, endTime, channel, remoteSocketAddress, f);
}
MultiAnswerTransaction(
byte[] query,
int max,
long endTime,
DatagramChannel channel,
SocketAddress remoteSocketAddress,
CompletableFuture<List<byte[]>> f) {
super(query, max, endTime, channel, remoteSocketAddress, f);
}

public void processReadyKey(SelectionKey key) {
public void processReadyKey(SelectionKey key) {
if (!key.isReadable()) {
silentCloseChannel();
f.completeExceptionally(new EOFException("channel not readable"));
Expand Down Expand Up @@ -191,11 +187,7 @@ public void processReadyKey(SelectionKey key) {
buffer.flip();
byte[] data = new byte[read];
System.arraycopy(buffer.array(), 0, data, 0, read);
verboseLog(
"UDP read",
channel.socket().getLocalSocketAddress(),
source,
data);
verboseLog("UDP read", channel.socket().getLocalSocketAddress(), source, data);
answers.add(data);
Copy link
Copy Markdown
Member

@ibauersachs ibauersachs Mar 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only other line in this method that differs for mDNS. Instead of duplicating everything, move the processing of the data byte-array into a separate method, e.g.

// in Transaction:
...
  System.arraycopy(buffer.array(), 0, data, 0, read);
  verboseLog("UDP read", channel.socket().getLocalSocketAddress(), source, data);
  processAnswer(data);
}

processAnswer(byte[] data) {
  silentCloseChannel();
  f.complete(Collections.singletonList(data));
  pendingTransactions.remove(this);
}

// in MultiAnswerTransaction:
processAnswer(byte[] data) {
  answers.add(data);
}

}

Expand Down