Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Bug 1501621 - Enable ESLint for netwerk/dns/ and netwerk/protocol/ (a…
Browse files Browse the repository at this point in the history 
…utomatic changes) r=dragana,Standard8

Differential Revision: https://phabricator.services.mozilla.com/D10590
  • Loading branch information
@MichaelKohler
MichaelKohler committed Nov 2, 2018
1 parent 972d618 commit f067b0b
Show file tree
Hide file tree
Showing 14 changed files with 660 additions and 667 deletions.
46 changes: 23 additions & 23 deletions netwerk/dns/mdns/libmdns/MulticastDNSAndroid.jsm
View file
Expand Up @@ -23,7 +23,7 @@ const FAILURE_INTERNAL_ERROR = -65537;
// Helper function for sending commands to Java.
function send(type, data, callback) {
let msg = {
type: type
type,
};

for (let i in data) {
Expand All @@ -46,31 +46,31 @@ ServiceManager.prototype = {
listeners: {},
numListeners: 0,

onEvent: function(event, data, callback) {
onEvent(event, data, callback) {
if (event === "NsdManager:ServiceFound") {
this.onServiceFound();
} else if (event === "NsdManager:ServiceLost") {
this.onServiceLost();
}
},

registerEvent: function() {
registerEvent() {
log("registerEvent");
EventDispatcher.instance.registerListener(this, [
"NsdManager:ServiceFound",
"NsdManager:ServiceLost",
]);
},

unregisterEvent: function() {
unregisterEvent() {
log("unregisterEvent");
EventDispatcher.instance.unregisterListener(this, [
"NsdManager:ServiceFound",
"NsdManager:ServiceLost",
]);
},

addListener: function(aServiceType, aListener) {
addListener(aServiceType, aListener) {
log("addListener: " + aServiceType + ", " + aListener);

if (!this.listeners[aServiceType]) {
Expand All @@ -91,7 +91,7 @@ ServiceManager.prototype = {
log("listener added: " + this);
},

removeListener: function(aServiceType, aListener) {
removeListener(aServiceType, aListener) {
log("removeListener: " + aServiceType + ", " + aListener);

if (!this.listeners[aServiceType]) {
Expand All @@ -114,7 +114,7 @@ ServiceManager.prototype = {
log("listener removed" + this);
},

onServiceFound: function(aServiceInfo) {
onServiceFound(aServiceInfo) {
let listeners = this.listeners[aServiceInfo.serviceType];
if (listeners) {
for (let listener of listeners) {
Expand All @@ -126,7 +126,7 @@ ServiceManager.prototype = {
return {};
},

onServiceLost: function(aServiceInfo) {
onServiceLost(aServiceInfo) {
let listeners = this.listeners[aServiceInfo.serviceType];
if (listeners) {
for (let listener of listeners) {
Expand All @@ -136,7 +136,7 @@ ServiceManager.prototype = {
log("no listener");
}
return {};
}
},
};

// make an object from nsIPropertyBag2
Expand All @@ -150,7 +150,7 @@ function parsePropertyBag2(bag) {
let value = bag.getPropertyAsACString(name);
attributes.push({
"name": name,
"value": value
"value": value,
});
}

Expand All @@ -162,12 +162,12 @@ function MulticastDNS() {
}

MulticastDNS.prototype = {
startDiscovery: function(aServiceType, aListener) {
startDiscovery(aServiceType, aListener) {
this.serviceManager.addListener(aServiceType, aListener);

let serviceInfo = {
serviceType: aServiceType,
uniqueId: aListener.uuid
uniqueId: aListener.uuid,
};

send("NsdManager:DiscoverServices", serviceInfo, (result, err) => {
Expand All @@ -181,11 +181,11 @@ MulticastDNS.prototype = {
});
},

stopDiscovery: function(aServiceType, aListener) {
stopDiscovery(aServiceType, aListener) {
this.serviceManager.removeListener(aServiceType, aListener);

let serviceInfo = {
uniqueId: aListener.uuid
uniqueId: aListener.uuid,
};

send("NsdManager:StopServiceDiscovery", serviceInfo, (result, err) => {
Expand All @@ -198,26 +198,26 @@ MulticastDNS.prototype = {
});
},

registerService: function(aServiceInfo, aListener) {
registerService(aServiceInfo, aListener) {
let serviceInfo = {
port: aServiceInfo.port,
serviceType: aServiceInfo.serviceType,
uniqueId: aListener.uuid
uniqueId: aListener.uuid,
};

try {
serviceInfo.host = aServiceInfo.host;
} catch(e) {
} catch (e) {
// host unspecified
}
try {
serviceInfo.serviceName = aServiceInfo.serviceName;
} catch(e) {
} catch (e) {
// serviceName unspecified
}
try {
serviceInfo.attributes = parsePropertyBag2(aServiceInfo.attributes);
} catch(e) {
} catch (e) {
// attributes unspecified
}

Expand All @@ -231,9 +231,9 @@ MulticastDNS.prototype = {
});
},

unregisterService: function(aServiceInfo, aListener) {
unregisterService(aServiceInfo, aListener) {
let serviceInfo = {
uniqueId: aListener.uuid
uniqueId: aListener.uuid,
};

send("NsdManager:UnregisterService", serviceInfo, (result, err) => {
Expand All @@ -246,7 +246,7 @@ MulticastDNS.prototype = {
});
},

resolveService: function(aServiceInfo, aListener) {
resolveService(aServiceInfo, aListener) {
send("NsdManager:ResolveService", aServiceInfo, (result, err) => {
if (err) {
log("onResolveFailed: (" + err + ")");
Expand All @@ -255,5 +255,5 @@ MulticastDNS.prototype = {
aListener.onServiceResolved(result);
}
});
}
},
};
48 changes: 23 additions & 25 deletions netwerk/dns/mdns/libmdns/fallback/DNSPacket.jsm
View file
Expand Up @@ -4,28 +4,28 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint esnext: true, moz: true */

'use strict';
"use strict";

var EXPORTED_SYMBOLS = ['DNSPacket'];
var EXPORTED_SYMBOLS = ["DNSPacket"];

ChromeUtils.import('resource://gre/modules/Services.jsm');
ChromeUtils.import("resource://gre/modules/Services.jsm");

ChromeUtils.import('resource://gre/modules/DataReader.jsm');
ChromeUtils.import('resource://gre/modules/DataWriter.jsm');
ChromeUtils.import('resource://gre/modules/DNSRecord.jsm');
ChromeUtils.import('resource://gre/modules/DNSResourceRecord.jsm');
ChromeUtils.import("resource://gre/modules/DataReader.jsm");
ChromeUtils.import("resource://gre/modules/DataWriter.jsm");
ChromeUtils.import("resource://gre/modules/DNSRecord.jsm");
ChromeUtils.import("resource://gre/modules/DNSResourceRecord.jsm");

const DEBUG = true;

function debug(msg) {
Services.console.logStringMessage('DNSPacket: ' + msg);
Services.console.logStringMessage("DNSPacket: " + msg);
}

let DNS_PACKET_SECTION_TYPES = [
'QD', // Question
'AN', // Answer
'NS', // Authority
'AR' // Additional
"QD", // Question
"AN", // Answer
"NS", // Authority
"AR", // Additional
];

/**
Expand Down Expand Up @@ -133,7 +133,7 @@ class DNSPacket {
static parse(data) {
let reader = new DataReader(data);
if (reader.getValue(2) !== 0x0000) {
throw new Error('Packet must start with 0x0000');
throw new Error("Packet must start with 0x0000");
}

let packet = new DNSPacket();
Expand All @@ -150,20 +150,18 @@ class DNSPacket {
DNS_PACKET_SECTION_TYPES.forEach((sectionType) => {
let recordCount = recordCounts[sectionType];
for (let i = 0; i < recordCount; i++) {
if (sectionType === 'QD') {
if (sectionType === "QD") {
packet.addRecord(sectionType,
DNSRecord.parseFromPacketReader(reader));
}

else {
} else {
packet.addRecord(sectionType,
DNSResourceRecord.parseFromPacketReader(reader));
}
}
});

if (!reader.eof) {
DEBUG && debug('Did not complete parsing packet data');
DEBUG && debug("Did not complete parsing packet data");
}

return packet;
Expand Down Expand Up @@ -246,13 +244,13 @@ function _valueToFlags(value) {
QR: (value & 0x8000) >> 15,
OP: (value & 0x7800) >> 11,
AA: (value & 0x0400) >> 10,
TC: (value & 0x0200) >> 9,
RD: (value & 0x0100) >> 8,
RA: (value & 0x0080) >> 7,
UN: (value & 0x0040) >> 6,
AD: (value & 0x0020) >> 5,
CD: (value & 0x0010) >> 4,
RC: (value & 0x000f) >> 0
TC: (value & 0x0200) >> 9,
RD: (value & 0x0100) >> 8,
RA: (value & 0x0080) >> 7,
UN: (value & 0x0040) >> 6,
AD: (value & 0x0020) >> 5,
CD: (value & 0x0010) >> 4,
RC: (value & 0x000f) >> 0,
};
}

Expand Down
24 changes: 12 additions & 12 deletions netwerk/dns/mdns/libmdns/fallback/DNSRecord.jsm
View file
Expand Up @@ -4,33 +4,33 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* jshint esnext: true, moz: true */

'use strict';
"use strict";

var EXPORTED_SYMBOLS = ['DNSRecord'];
var EXPORTED_SYMBOLS = ["DNSRecord"];

ChromeUtils.import('resource://gre/modules/DataWriter.jsm');
ChromeUtils.import('resource://gre/modules/DNSTypes.jsm');
ChromeUtils.import("resource://gre/modules/DataWriter.jsm");
ChromeUtils.import("resource://gre/modules/DNSTypes.jsm");

class DNSRecord {
constructor(properties = {}) {
this.name = properties.name || '';
this.name = properties.name || "";
this.recordType = properties.recordType || DNS_RECORD_TYPES.ANY;
this.classCode = properties.classCode || DNS_CLASS_CODES.IN;
this.classCode = properties.classCode || DNS_CLASS_CODES.IN;
this.cacheFlush = properties.cacheFlush || false;
}

static parseFromPacketReader(reader) {
let name = reader.getLabel();
let recordType = reader.getValue(2);
let classCode = reader.getValue(2);
let cacheFlush = (classCode & 0x8000) ? true : false;
let cacheFlush = !!((classCode & 0x8000));
classCode &= 0xff;

return new this({
name: name,
recordType: recordType,
classCode: classCode,
cacheFlush: cacheFlush
name,
recordType,
classCode,
cacheFlush,
});
}

Expand Down Expand Up @@ -62,7 +62,7 @@ class DNSRecord {
name: this.name,
recordType: this.recordType,
classCode: this.classCode,
cacheFlush: this.cacheFlush
cacheFlush: this.cacheFlush,
};
}
}

0 comments on commit f067b0b

Please sign in to comment.