ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

some more progress on MDNS

Browse source
This commit is contained in:
ziver 2017-02-06 17:32:44 +01:00
parent e50027906d
commit 6a3744eb99
1 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/zutil/net/dns/MulticastDnsServer.java
View file

@ -25,6 +25,7 @@
package zutil.net.dns; package zutil.net.dns;
import zutil.log.LogUtil; import zutil.log.LogUtil;
import zutil.net.dns.packet.DnsConstants;
import zutil.net.dns.packet.DnsPacket; import zutil.net.dns.packet.DnsPacket;
import zutil.net.dns.packet.DnsPacketQuestion; import zutil.net.dns.packet.DnsPacketQuestion;
import zutil.net.dns.packet.DnsPacketResource; import zutil.net.dns.packet.DnsPacketResource;
@ -35,6 +36,7 @@ import zutil.parser.binary.BinaryStructInputStream;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.net.DatagramPacket; import java.net.DatagramPacket;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.logging.Level; import java.util.logging.Level;
@ -55,7 +57,7 @@ public class MulticastDnsServer extends ThreadedUDPNetwork implements ThreadedUD
protected static final int MDNS_MULTICAST_PORT = 5353; protected static final int MDNS_MULTICAST_PORT = 5353;
private HashMap<String,ArrayList> entries = new HashMap<>(); private HashMap<String,ArrayList<DnsPacketResource>> entries = new HashMap<>();
@ -74,21 +76,21 @@ public class MulticastDnsServer extends ThreadedUDPNetwork implements ThreadedUD
* @param clazz {@link zutil.net.dns.packet.DnsConstants.CLASS} * @param clazz {@link zutil.net.dns.packet.DnsConstants.CLASS}
* @param data * @param data
*/ */
public void addEntry(String name, int type, int clazz, String data){ public void addEntry(String name, int type, int clazz, byte[] data){
DnsPacketResource resource = new DnsPacketResource(); DnsPacketResource resource = new DnsPacketResource();
resource.name = name; resource.name = name;
resource.type = type; resource.type = type;
resource.clazz = clazz; resource.clazz = clazz;
//resource.ttl = 10; ??? //resource.ttl = 10; ???
resource.length = data.length(); resource.length = data.length;
resource.data = data; resource.data = new String(data, StandardCharsets.ISO_8859_1);
addEntry(resource); addEntry(resource);
} }
private void addEntry(DnsPacketResource resource) { private void addEntry(DnsPacketResource resource) {
if ( ! entries.containsKey(resource.name)) if ( ! entries.containsKey(resource.name))
entries.put(resource.name, new ArrayList()); entries.put(resource.name, new ArrayList<>());
entries.get(resource.name).add(resource); entries.get(resource.name).add(resource);
} }
@ -105,10 +107,19 @@ public class MulticastDnsServer extends ThreadedUDPNetwork implements ThreadedUD
// Just handle queries and no responses // Just handle queries and no responses
if ( ! dnsPacket.getHeader().flagQueryResponse){ if ( ! dnsPacket.getHeader().flagQueryResponse){
for (DnsPacketQuestion question : dnsPacket.getQuestions()){ for (DnsPacketQuestion question : dnsPacket.getQuestions()){
if (entries.containsKey(question.name)){ if (question.name == null) continue;
// Respond with entries
switch(question.type){
} case DnsConstants.TYPE.PTR:
if (question.name.startsWith("_service")){
}
else if (entries.containsKey(question.name)){
// Respond with entries
}
break;
}
} }
} }
} catch (IOException e){ } catch (IOException e){