From a26fef5e334bd2f80c060288a6381b0da3bad01d Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Fri, 17 Feb 2017 16:13:57 -0700 Subject: [PATCH] creater parser directory --- dns.rdata.parse.js | 4 ++-- dns.type.TEMPLATE.js => parser/type.TEMPLATE.js | 2 +- dns.type.a.js => parser/type.a.js | 2 +- dns.type.aaaa.js => parser/type.aaaa.js | 2 +- dns.type.cname.js => parser/type.cname.js | 2 +- dns.type.mx.js => parser/type.mx.js | 2 +- dns.type.ns.js => parser/type.ns.js | 4 ++-- dns.type.ptr.js => parser/type.ptr.js | 2 +- dns.type.soa.js => parser/type.soa.js | 4 ++-- dns.type.srv.js => parser/type.srv.js | 4 ++-- dns.type.txt.js => parser/type.txt.js | 0 11 files changed, 14 insertions(+), 14 deletions(-) rename dns.type.TEMPLATE.js => parser/type.TEMPLATE.js (98%) rename dns.type.a.js => parser/type.a.js (85%) rename dns.type.aaaa.js => parser/type.aaaa.js (94%) rename dns.type.cname.js => parser/type.cname.js (88%) rename dns.type.mx.js => parser/type.mx.js (92%) rename dns.type.ns.js => parser/type.ns.js (78%) rename dns.type.ptr.js => parser/type.ptr.js (90%) rename dns.type.soa.js => parser/type.soa.js (91%) rename dns.type.srv.js => parser/type.srv.js (92%) rename dns.type.txt.js => parser/type.txt.js (100%) diff --git a/dns.rdata.parse.js b/dns.rdata.parse.js index edd9f9f..4ebe0ee 100644 --- a/dns.rdata.parse.js +++ b/dns.rdata.parse.js @@ -23,13 +23,13 @@ exports.DNS_RDATA_PARSE = function (ab, packet, record) { try { parser = exports['DNS_TYPE_' + record.typeName] - || require('./dns.type.' + record.typeName.toLowerCase())['DNS_TYPE_' + record.typeName]; + || require('./parser/type.' + record.typeName.toLowerCase())['DNS_PARSER_TYPE_' + record.typeName]; } catch (e) { /*console.error(e)*/ } if (!parser) { throw new Error("Parser for DNS Type " + record.typeName + " could not be loaded." - + " Did you include ?" + + " Did you include ?" + " (or perhaps we plan to implement it and haven't yet - in which case please open an issue)" ); } diff --git a/dns.type.TEMPLATE.js b/parser/type.TEMPLATE.js similarity index 98% rename from dns.type.TEMPLATE.js rename to parser/type.TEMPLATE.js index af7fe00..97502a5 100644 --- a/dns.type.TEMPLATE.js +++ b/parser/type.TEMPLATE.js @@ -30,7 +30,7 @@ var unpackLabels = exports.DNS_UNPACK_LABELS || require('./dns.unpack-labels.js' // signifying the type at which the binary segment for this record // begins and its length // -exports.DNS_TYPE_MX = function (ab, packet, record) { +exports.DNS_PARSER_TYPE_MX = function (ab, packet, record) { // // Slicing RData // diff --git a/dns.type.a.js b/parser/type.a.js similarity index 85% rename from dns.type.a.js rename to parser/type.a.js index 5d94592..100a9c2 100644 --- a/dns.type.a.js +++ b/parser/type.a.js @@ -3,7 +3,7 @@ // An 'A' record is a 32-bit value representing the IP address -exports.DNS_TYPE_A = function (ab, packet, record) { +exports.DNS_PARSER_TYPE_A = function (ab, packet, record) { var ui8 = new Uint8Array(ab.slice(record.rdstart, record.rdstart + record.rdlength)); // i.e. 127.0.0.1 record.address = ui8[0] + '.' + ui8[1] + '.' + ui8[2] + '.' + ui8[3]; diff --git a/dns.type.aaaa.js b/parser/type.aaaa.js similarity index 94% rename from dns.type.aaaa.js rename to parser/type.aaaa.js index bce01db..9a05653 100644 --- a/dns.type.aaaa.js +++ b/parser/type.aaaa.js @@ -4,7 +4,7 @@ // Value: IP Address // Meaning:Use: 16 octets represting the IP address -exports.DNS_TYPE_AAAA = function (ab, packet, record) { +exports.DNS_PARSER_TYPE_AAAA = function (ab, packet, record) { var rdataAb = ab.slice(record.rdstart, record.rdstart + record.rdlength); // We can't use Uint16Array because it doesn't specify Endianness diff --git a/dns.type.cname.js b/parser/type.cname.js similarity index 88% rename from dns.type.cname.js rename to parser/type.cname.js index a167da7..b2b35ab 100644 --- a/dns.type.cname.js +++ b/parser/type.cname.js @@ -6,7 +6,7 @@ // Canonical simply means the expected or real name. var unpackLabels = exports.DNS_UNPACK_LABELS || require('./dns.unpack-labels.js').DNS_UNPACK_LABELS; -exports.DNS_TYPE_CNAME = function (ab, packet, record) { +exports.DNS_PARSER_TYPE_CNAME = function (ab, packet, record) { record.data = unpackLabels(new Uint8Array(ab), record.rdstart, { byteLength: 0, cpcount: 0, labels: [], name: '' }).name; return record; }; diff --git a/dns.type.mx.js b/parser/type.mx.js similarity index 92% rename from dns.type.mx.js rename to parser/type.mx.js index e01fdc4..140d5b5 100644 --- a/dns.type.mx.js +++ b/parser/type.mx.js @@ -10,7 +10,7 @@ // ab is arrayBuffer, packet is Object, Record is Object var unpackLabels = exports.DNS_UNPACK_LABELS || require('./dns.unpack-labels.js').DNS_UNPACK_LABELS; -exports.DNS_TYPE_MX = function (ab, packet, record) { +exports.DNS_PARSER_TYPE_MX = function (ab, packet, record) { var rdataAb = ab.slice(record.rdstart, record.rdstart + record.rdlength); var dv = new DataView(rdataAb); diff --git a/dns.type.ns.js b/parser/type.ns.js similarity index 78% rename from dns.type.ns.js rename to parser/type.ns.js index 0b558d5..930b9cf 100644 --- a/dns.type.ns.js +++ b/parser/type.ns.js @@ -7,8 +7,8 @@ var unpackLabels = exports.DNS_UNPACK_LABELS || require('./dns.unpack-labels.js').DNS_UNPACK_LABELS; -exports.DNS_TYPE_NS = function (ab , packet, record) { - record.data = unpackLabels(new Uint8Array(ab), record.rdstart, { byteLength: 0, cpcount: 0, labels: [], name: '' }).name; +exports.DNS_PARSER_TYPE_NS = function (ab , packet, record) { + record.data = unpackLabels(new Uint8Array(ab), record.rdstart, { byteLength: 0, cpcount: 0, labels: [], name: '' }).name; return record; }; diff --git a/dns.type.ptr.js b/parser/type.ptr.js similarity index 90% rename from dns.type.ptr.js rename to parser/type.ptr.js index 58c4b3f..1ca5db2 100644 --- a/dns.type.ptr.js +++ b/parser/type.ptr.js @@ -10,7 +10,7 @@ // 15 IN PTR www.example.com. var unpackLabels = exports.DNS_UNPACK_LABELS || require('./dns.unpack-labels.js').DNS_UNPACK_LABELS; -exports.DNS_TYPE_PTR = function (ab, pack, record) { +exports.DNS_PARSER_TYPE_PTR = function (ab, pack, record) { record.data = unpackLabels(new Uint8Array(ab), record.rdstart, { byteLength: 0, cpcount: 0, labels: [], name: '' }).name; return record; }; diff --git a/dns.type.soa.js b/parser/type.soa.js similarity index 91% rename from dns.type.soa.js rename to parser/type.soa.js index 0557151..b468e8a 100644 --- a/dns.type.soa.js +++ b/parser/type.soa.js @@ -14,8 +14,8 @@ // Minimum TTL Unsigned 32-bit integer -exports.DNS_TYPE_SOA = function (ab, packet, record) { - +exports.DNS_PARSER_TYPE_SOA = function (ab, packet, record) { + }; }('undefined' !== typeof window ? window : exports)); diff --git a/dns.type.srv.js b/parser/type.srv.js similarity index 92% rename from dns.type.srv.js rename to parser/type.srv.js index 333c446..a4b6403 100644 --- a/dns.type.srv.js +++ b/parser/type.srv.js @@ -7,7 +7,7 @@ var unpackLabels = exports.DNS_UNPACK_LABELS || require('./dns.unpack-labels.js').DNS_UNPACK_LABELS; -exports.DNS_TYPE_SRV = function (ab, packet, record) { +exports.DNS_PARSER_TYPE_SRV = function (ab, packet, record) { var rdataAb = ab.slice(record.rdstart,record.rdstart + record.rdlength) var dv = new DataView(rdataAb); @@ -16,7 +16,7 @@ exports.DNS_TYPE_SRV = function (ab, packet, record) { record.weight = dv.getUint16(2, false); record.port = dv.getUint16(4, false); record.target = unpackLabels(new Uint8Array(ab), record.rdstart+6, { byteLength: 0, cpcount: 0, labels: [], name: '' }).name; - + return record; }; diff --git a/dns.type.txt.js b/parser/type.txt.js similarity index 100% rename from dns.type.txt.js rename to parser/type.txt.js