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

Renamed some classes to lowercase

Browse source
This commit is contained in:
Ziver Koc 2017-01-19 17:12:11 +01:00
parent 89076bfa54
commit 1d34a264b1
9 changed files with 70 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/zutil/net/dns/DNSPacket.java
View file

@ -14,16 +14,16 @@ import java.util.List;
* @see <a href="https://tools.ietf.org/html/rfc1035">rfc1035</a>
* @author Ziver on 2016-04-11.
*/
public class DNSPacket {
private DNSPacketHeader header;
private ArrayList<DNSPacketQuestion> questions;
private ArrayList<DNSPacketResource> answerRecords;
private ArrayList<DNSPacketResource> nameServers;
private ArrayList<DNSPacketResource> additionalRecords;
public class DnsPacket {
private DnsPacketHeader header;
private ArrayList<DnsPacketQuestion> questions;
private ArrayList<DnsPacketResource> answerRecords;
private ArrayList<DnsPacketResource> nameServers;
private ArrayList<DnsPacketResource> additionalRecords;
public DNSPacket(){
header = new DNSPacketHeader();
public DnsPacket(){
header = new DnsPacketHeader();
questions = new ArrayList<>();
answerRecords = new ArrayList<>();
nameServers = new ArrayList<>();
@ -31,47 +31,47 @@ public class DNSPacket {
}
public DNSPacketHeader getHeader(){
public DnsPacketHeader getHeader(){
return header;
}
public List<DNSPacketQuestion> getQuestions(){
public List<DnsPacketQuestion> getQuestions(){
return Collections.unmodifiableList(questions);
}
public List<DNSPacketResource> getAnswerRecords(){
public List<DnsPacketResource> getAnswerRecords(){
return Collections.unmodifiableList(answerRecords);
}
public List<DNSPacketResource> getNameServers(){
public List<DnsPacketResource> getNameServers(){
return Collections.unmodifiableList(nameServers);
}
public List<DNSPacketResource> getAdditionalRecords(){
public List<DnsPacketResource> getAdditionalRecords(){
return Collections.unmodifiableList(additionalRecords);
}
public void addQuestion(DNSPacketQuestion question){
public void addQuestion(DnsPacketQuestion question){
questions.add(question);
header.countQuestion = questions.size();
}
public void addAnswerRecord(DNSPacketResource resource){
public void addAnswerRecord(DnsPacketResource resource){
answerRecords.add(resource);
header.countAnswerRecord = answerRecords.size();
}
public void addNameServer(DNSPacketResource resource){
public void addNameServer(DnsPacketResource resource){
nameServers.add(resource);
header.countNameServer = nameServers.size();
}
public void addAdditionalRecord(DNSPacketResource resource){
public void addAdditionalRecord(DnsPacketResource resource){
additionalRecords.add(resource);
header.countAdditionalRecord = additionalRecords.size();
}
public static DNSPacket read(BinaryStructInputStream structIn) throws IOException {
DNSPacket packet = new DNSPacket();
public static DnsPacket read(BinaryStructInputStream structIn) throws IOException {
DnsPacket packet = new DnsPacket();
structIn.read(packet.header);
for (int i=0; i<packet.header.countQuestion; ++i) {
DNSPacketQuestion question = new DNSPacketQuestion();
DnsPacketQuestion question = new DnsPacketQuestion();
structIn.read(question);
packet.questions.add(question);
}
@ -80,9 +80,9 @@ public class DNSPacket {
readResource(structIn, packet.header.countAdditionalRecord, packet.additionalRecords);
return packet;
}
private static void readResource(BinaryStructInputStream structIn, int count, ArrayList<DNSPacketResource> list) throws IOException {
private static void readResource(BinaryStructInputStream structIn, int count, ArrayList<DnsPacketResource> list) throws IOException {
for (int i=0; i<count; ++i){
DNSPacketResource resource = new DNSPacketResource();
DnsPacketResource resource = new DnsPacketResource();
structIn.read(resource);
list.add(resource);
}
@ -91,13 +91,13 @@ public class DNSPacket {
public void write(BinaryStructOutputStream structOut) throws IOException {
structOut.write(header);
for (DNSPacketQuestion question : questions)
for (DnsPacketQuestion question : questions)
structOut.write(question);
for (DNSPacketResource answerRecord : answerRecords)
for (DnsPacketResource answerRecord : answerRecords)
structOut.write(answerRecord);
for (DNSPacketResource nameServer : nameServers)
for (DnsPacketResource nameServer : nameServers)
structOut.write(nameServer);
for (DNSPacketResource additionalRecord : additionalRecords)
for (DnsPacketResource additionalRecord : additionalRecords)
structOut.write(additionalRecord);
}

2
src/zutil/net/dns/DNSPacketHeader.java
View file

@ -30,7 +30,7 @@ import zutil.parser.binary.BinaryStruct;
* Created by Ziver on 2016-02-09.
* Reference: http://tools.ietf.org/html/rfc1035
*/
public class DNSPacketHeader implements BinaryStruct {
public class DnsPacketHeader implements BinaryStruct {
public static final int OPCODE_QUERY = 0;
public static final int OPCODE_IQUERY = 1;
public static final int OPCODE_STATUS = 2;

6
src/zutil/net/dns/DNSPacketQuestion.java
View file

@ -36,7 +36,7 @@ import java.io.OutputStream;
* Created by Ziver on 2016-02-09.
* Reference: http://tools.ietf.org/html/rfc1035
*/
public class DNSPacketQuestion implements BinaryStruct {
public class DnsPacketQuestion implements BinaryStruct {
/** a host address */
public static final int QTYPE_A = 1;
/** an authoritative name server */
@ -135,8 +135,8 @@ public class DNSPacketQuestion implements BinaryStruct {
public DNSPacketQuestion() {}
public DNSPacketQuestion(String qName, int qType, int qClass) {
public DnsPacketQuestion() {}
public DnsPacketQuestion(String qName, int qType, int qClass) {
this.qName = qName;
this.qType = qType;
this.qClass = qClass;

4
src/zutil/net/dns/DNSPacketResource.java
View file

@ -31,7 +31,7 @@ import zutil.parser.binary.BinaryStruct;
* Created by Ziver on 2016-02-09.
* Reference: http://tools.ietf.org/html/rfc1035
*/
public class DNSPacketResource implements BinaryStruct {
public class DnsPacketResource implements BinaryStruct {
/** a host address */
public static final int TYPE_A = 1;
@ -110,7 +110,7 @@ public class DNSPacketResource implements BinaryStruct {
/**
* a domain name to which this resource record pertains.
*/
@CustomBinaryField(index=10, serializer=DNSPacketQuestion.FQDNStringSerializer.class)
@CustomBinaryField(index=10, serializer=DnsPacketQuestion.FQDNStringSerializer.class)
public String name;
/**

4
src/zutil/net/dns/DNSResolutionListener.java
View file

@ -24,6 +24,6 @@
package zutil.net.dns;
public interface DNSResolutionListener{
void receivedResponse(DNSPacket packet);
public interface DnsResolutionListener {
void receivedResponse(DnsPacket packet);
}

23
src/zutil/net/dns/MulticastDNSClient.java
View file

@ -24,7 +24,6 @@
package zutil.net.dns;
import zutil.ByteUtil;
import zutil.io.MultiPrintStream;
import zutil.log.LogUtil;
import zutil.net.threaded.ThreadedUDPNetwork;
@ -47,7 +46,7 @@ import java.util.logging.Logger;
*
* Created by Ziver
*/
public class MulticastDNSClient extends ThreadedUDPNetwork implements ThreadedUDPNetworkThread{
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";
@ -55,17 +54,17 @@ public class MulticastDNSClient extends ThreadedUDPNetwork implements ThreadedUD
private HashSet<Integer> activeProbes;
private DNSResolutionListener listener;
private DnsResolutionListener listener;
public MulticastDNSClient() throws IOException {
public MulticastDnsClient() throws IOException {
super(MDNS_MULTICAST_ADDR, MDNS_MULTICAST_PORT);
setThread( this );
this.activeProbes = new HashSet<>();
}
public void setListener(DNSResolutionListener listener){
public void setListener(DnsResolutionListener listener){
this.listener = listener;
}
@ -76,13 +75,13 @@ public class MulticastDNSClient extends ThreadedUDPNetwork implements ThreadedUD
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
BinaryStructOutputStream out = new BinaryStructOutputStream(buffer);
DNSPacket dnsPacket = new DNSPacket();
DnsPacket dnsPacket = new DnsPacket();
dnsPacket.getHeader().id = id;
dnsPacket.getHeader().setDefaultQueryData();
dnsPacket.addQuestion(new DNSPacketQuestion(
dnsPacket.addQuestion(new DnsPacketQuestion(
domain,
DNSPacketQuestion.QTYPE_A,
DNSPacketQuestion.QCLASS_IN));
DnsPacketQuestion.QTYPE_A,
DnsPacketQuestion.QCLASS_IN));
dnsPacket.write(out);
DatagramPacket udpPacket = new DatagramPacket(
@ -103,18 +102,18 @@ public class MulticastDNSClient extends ThreadedUDPNetwork implements ThreadedUD
ByteArrayInputStream buffer = new ByteArrayInputStream(packet.getData(),
packet.getOffset(), packet.getLength());
BinaryStructInputStream in = new BinaryStructInputStream(buffer);
DNSPacket dnsPacket = DNSPacket.read(in);
DnsPacket dnsPacket = DnsPacket.read(in);
//System.out.println("Received:\n"+ByteUtil.toFormattedString(packet.getData(), packet.getOffset(), packet.getLength()));
MultiPrintStream.out.dump(dnsPacket,3);
if (dnsPacket.getHeader().flagQueryResponse) {
if (activeProbes.contains(dnsPacket.getHeader().id)){
logger.fine("Received MDSN response from: "+packet.getAddress()+", msg id: " + dnsPacket.getHeader().id);
logger.fine("Received MDNS response from: "+packet.getAddress()+", msg id: " + dnsPacket.getHeader().id);
if (listener != null)
listener.receivedResponse(dnsPacket);
} else {
logger.fine("Received MDSN packet: "+packet.getAddress()+", msg id: " + dnsPacket.getHeader().id);
logger.fine("Received MDNS packet: "+packet.getAddress()+", msg id: " + dnsPacket.getHeader().id);
}
}
} catch (IOException e){