Added a MDNS test exec class and did some fixes
This commit is contained in:
parent
581b76687f
commit
bae988e8dd
7 changed files with 76 additions and 26 deletions
|
|
@ -67,8 +67,7 @@ public class DNSPacket {
|
|||
}
|
||||
|
||||
|
||||
public static DNSPacket read(InputStream in) throws IOException {
|
||||
BinaryStructInputStream structIn = new BinaryStructInputStream(in);
|
||||
public static DNSPacket read(BinaryStructInputStream structIn) throws IOException {
|
||||
DNSPacket packet = new DNSPacket();
|
||||
structIn.read(packet.header);
|
||||
|
||||
|
|
@ -90,8 +89,7 @@ public class DNSPacket {
|
|||
}
|
||||
}
|
||||
|
||||
public void write(OutputStream out) throws IOException {
|
||||
BinaryStructOutputStream structOut = new BinaryStructOutputStream(out);
|
||||
public void write(BinaryStructOutputStream structOut) throws IOException {
|
||||
structOut.write(header);
|
||||
|
||||
for (DNSPacketQuestion question : questions)
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ public class DNSPacketQuestion implements BinaryStruct {
|
|||
if (c > 0)
|
||||
str.append('.');
|
||||
}
|
||||
return toString();
|
||||
return str.toString();
|
||||
}
|
||||
|
||||
public void write(OutputStream out, String domain, BinaryFieldData field) throws IOException {
|
||||
|
|
|
|||
|
|
@ -24,20 +24,32 @@
|
|||
|
||||
package zutil.net.dns;
|
||||
|
||||
import zutil.ByteUtil;
|
||||
import zutil.converter.Converter;
|
||||
import zutil.io.MultiPrintStream;
|
||||
import zutil.log.LogUtil;
|
||||
import zutil.net.threaded.ThreadedUDPNetwork;
|
||||
import zutil.net.threaded.ThreadedUDPNetworkThread;
|
||||
import zutil.parser.binary.BinaryStructInputStream;
|
||||
import zutil.parser.binary.BinaryStructOutputStream;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.net.DatagramPacket;
|
||||
import java.net.InetAddress;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* This class implements a MDNS Client. MDNS is a version
|
||||
* of the DNS protocol but used a Zeroconf application.
|
||||
*
|
||||
* Created by Ziver
|
||||
*/
|
||||
public class MulticastDNSClient extends ThreadedUDPNetwork implements ThreadedUDPNetworkThread{
|
||||
private static final Logger logger = LogUtil.getLogger();
|
||||
|
||||
private static final String MDNS_MULTICAST_ADDR = "224.0.0.251";
|
||||
private static final int MDNS_MULTICAST_PORT = 5353;
|
||||
|
||||
|
|
@ -48,24 +60,42 @@ public class MulticastDNSClient extends ThreadedUDPNetwork implements ThreadedUD
|
|||
}
|
||||
|
||||
|
||||
public void sendProbe() throws IOException {
|
||||
public void sendProbe(String service) throws IOException {
|
||||
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
|
||||
BinaryStructOutputStream out = new BinaryStructOutputStream(buffer);
|
||||
|
||||
DNSPacketHeader header = new DNSPacketHeader();
|
||||
header.setDefaultQueryData();
|
||||
out.write(header);
|
||||
DNSPacket dnsPacket = new DNSPacket();
|
||||
dnsPacket.getHeader().setDefaultQueryData();
|
||||
dnsPacket.addQuestion(new DNSPacketQuestion(
|
||||
service,
|
||||
DNSPacketQuestion.QTYPE_A,
|
||||
DNSPacketQuestion.QCLASS_IN));
|
||||
dnsPacket.write(out);
|
||||
|
||||
DatagramPacket packet = new DatagramPacket(
|
||||
DatagramPacket udpPacket = new DatagramPacket(
|
||||
buffer.toByteArray(), buffer.size(),
|
||||
InetAddress.getByName( MDNS_MULTICAST_ADDR ),
|
||||
MDNS_MULTICAST_PORT );
|
||||
send(packet);
|
||||
|
||||
System.out.println("#### Sending Request");
|
||||
System.out.println(ByteUtil.toFormattedString(udpPacket.getData()));
|
||||
MultiPrintStream.out.dump(dnsPacket,3);
|
||||
|
||||
//send(udpPacket);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void receivedPacket(DatagramPacket packet, ThreadedUDPNetwork network) {
|
||||
DNSPacketHeader header = new DNSPacketHeader();
|
||||
BinaryStructInputStream.read(header, packet.getData());
|
||||
try {
|
||||
ByteArrayInputStream buffer = new ByteArrayInputStream(packet.getData(),
|
||||
packet.getOffset(), packet.getLength());
|
||||
BinaryStructInputStream in = new BinaryStructInputStream(buffer);
|
||||
DNSPacket dnsPacket = DNSPacket.read(in);
|
||||
System.out.println("#### Received response from "+packet.getAddress());
|
||||
System.out.println(ByteUtil.toFormattedString(packet.getData()));
|
||||
MultiPrintStream.out.dump(dnsPacket,3);
|
||||
} catch (IOException e){
|
||||
logger.log(Level.WARNING, null, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
4
src/zutil/net/torrent/TorrentFile.java
Normal file → Executable file
4
src/zutil/net/torrent/TorrentFile.java
Normal file → Executable file
|
|
@ -24,14 +24,12 @@
|
|||
|
||||
package zutil.net.torrent;
|
||||
|
||||
import zutil.Dumpable;
|
||||
|
||||
/**
|
||||
* This class represents a File for download
|
||||
*
|
||||
* @author Ziver
|
||||
*/
|
||||
public class TorrentFile implements Dumpable{
|
||||
public class TorrentFile{
|
||||
private String filename;
|
||||
private long length;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package zutil.parser.binary;
|
|||
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.*;
|
||||
|
||||
import zutil.ByteUtil;
|
||||
|
|
@ -94,7 +95,7 @@ public class BinaryFieldData {
|
|||
else if (field.getType() == Integer.class || field.getType() == int.class)
|
||||
field.set(obj, Converter.toInt(data));
|
||||
else if (field.getType() == String.class)
|
||||
field.set(obj, new String(data));
|
||||
field.set(obj, new String(data, StandardCharsets.ISO_8859_1));
|
||||
else
|
||||
throw new UnsupportedOperationException("Unsupported BinaryStruct field class: "+ field.getClass());
|
||||
} catch (IllegalAccessException e){
|
||||
|
|
@ -124,7 +125,7 @@ public class BinaryFieldData {
|
|||
else if (field.getType() == String.class)
|
||||
return ByteUtil.getReverseByteOrder(
|
||||
ByteUtil.getBits(
|
||||
((String)(field.get(obj))).getBytes(),
|
||||
((String)(field.get(obj))).getBytes(StandardCharsets.ISO_8859_1),
|
||||
getBitLength(obj)));
|
||||
else
|
||||
throw new UnsupportedOperationException("Unsupported BinaryStruct field type: "+ getType());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue