From f067b0b2c38b43ca33fd597e31275c73c95c1237 Mon Sep 17 00:00:00 2001 From: Michael Kohler Date: Fri, 2 Nov 2018 10:38:01 +0000 Subject: [PATCH] Bug 1501621 - Enable ESLint for netwerk/dns/ and netwerk/protocol/ (automatic changes) r=dragana,Standard8 Differential Revision: https://phabricator.services.mozilla.com/D10590 --- .../dns/mdns/libmdns/MulticastDNSAndroid.jsm | 46 +- .../dns/mdns/libmdns/fallback/DNSPacket.jsm | 48 +- .../dns/mdns/libmdns/fallback/DNSRecord.jsm | 24 +- .../libmdns/fallback/DNSResourceRecord.jsm | 32 +- .../dns/mdns/libmdns/fallback/DNSTypes.jsm | 158 ++-- .../dns/mdns/libmdns/fallback/DataReader.jsm | 12 +- .../dns/mdns/libmdns/fallback/DataWriter.jsm | 16 +- .../mdns/libmdns/fallback/MulticastDNS.jsm | 199 +++-- .../dns/mdns/libmdns/nsDNSServiceDiscovery.js | 61 +- netwerk/protocol/ftp/test/frametest/menu.html | 684 +++++++++--------- .../protocol/http/UAOverridesBootstrapper.js | 4 +- netwerk/protocol/http/UserAgentOverrides.jsm | 9 +- netwerk/protocol/http/UserAgentUpdates.jsm | 24 +- .../http/WellKnownOpportunisticUtils.js | 10 +- 14 files changed, 660 insertions(+), 667 deletions(-) diff --git a/netwerk/dns/mdns/libmdns/MulticastDNSAndroid.jsm b/netwerk/dns/mdns/libmdns/MulticastDNSAndroid.jsm index abe231ba3974..1bfd45d2411a 100644 --- a/netwerk/dns/mdns/libmdns/MulticastDNSAndroid.jsm +++ b/netwerk/dns/mdns/libmdns/MulticastDNSAndroid.jsm @@ -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) { @@ -46,7 +46,7 @@ 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") { @@ -54,7 +54,7 @@ ServiceManager.prototype = { } }, - registerEvent: function() { + registerEvent() { log("registerEvent"); EventDispatcher.instance.registerListener(this, [ "NsdManager:ServiceFound", @@ -62,7 +62,7 @@ ServiceManager.prototype = { ]); }, - unregisterEvent: function() { + unregisterEvent() { log("unregisterEvent"); EventDispatcher.instance.unregisterListener(this, [ "NsdManager:ServiceFound", @@ -70,7 +70,7 @@ ServiceManager.prototype = { ]); }, - addListener: function(aServiceType, aListener) { + addListener(aServiceType, aListener) { log("addListener: " + aServiceType + ", " + aListener); if (!this.listeners[aServiceType]) { @@ -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]) { @@ -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) { @@ -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) { @@ -136,7 +136,7 @@ ServiceManager.prototype = { log("no listener"); } return {}; - } + }, }; // make an object from nsIPropertyBag2 @@ -150,7 +150,7 @@ function parsePropertyBag2(bag) { let value = bag.getPropertyAsACString(name); attributes.push({ "name": name, - "value": value + "value": value, }); } @@ -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) => { @@ -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) => { @@ -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 } @@ -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) => { @@ -246,7 +246,7 @@ MulticastDNS.prototype = { }); }, - resolveService: function(aServiceInfo, aListener) { + resolveService(aServiceInfo, aListener) { send("NsdManager:ResolveService", aServiceInfo, (result, err) => { if (err) { log("onResolveFailed: (" + err + ")"); @@ -255,5 +255,5 @@ MulticastDNS.prototype = { aListener.onServiceResolved(result); } }); - } + }, }; diff --git a/netwerk/dns/mdns/libmdns/fallback/DNSPacket.jsm b/netwerk/dns/mdns/libmdns/fallback/DNSPacket.jsm index a645208a2a01..ce24233a5820 100644 --- a/netwerk/dns/mdns/libmdns/fallback/DNSPacket.jsm +++ b/netwerk/dns/mdns/libmdns/fallback/DNSPacket.jsm @@ -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 ]; /** @@ -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(); @@ -150,12 +150,10 @@ 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)); } @@ -163,7 +161,7 @@ class DNSPacket { }); if (!reader.eof) { - DEBUG && debug('Did not complete parsing packet data'); + DEBUG && debug("Did not complete parsing packet data"); } return packet; @@ -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, }; } diff --git a/netwerk/dns/mdns/libmdns/fallback/DNSRecord.jsm b/netwerk/dns/mdns/libmdns/fallback/DNSRecord.jsm index 9718d568aeda..688094c5e922 100644 --- a/netwerk/dns/mdns/libmdns/fallback/DNSRecord.jsm +++ b/netwerk/dns/mdns/libmdns/fallback/DNSRecord.jsm @@ -4,18 +4,18 @@ * 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; } @@ -23,14 +23,14 @@ class DNSRecord { 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, }); } @@ -62,7 +62,7 @@ class DNSRecord { name: this.name, recordType: this.recordType, classCode: this.classCode, - cacheFlush: this.cacheFlush + cacheFlush: this.cacheFlush, }; } } diff --git a/netwerk/dns/mdns/libmdns/fallback/DNSResourceRecord.jsm b/netwerk/dns/mdns/libmdns/fallback/DNSResourceRecord.jsm index ece9b2704caa..9a76777c1e97 100644 --- a/netwerk/dns/mdns/libmdns/fallback/DNSResourceRecord.jsm +++ b/netwerk/dns/mdns/libmdns/fallback/DNSResourceRecord.jsm @@ -4,18 +4,18 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ /* jshint esnext: true, moz: true */ -'use strict'; +"use strict"; -var EXPORTED_SYMBOLS = ['DNSResourceRecord']; +var EXPORTED_SYMBOLS = ["DNSResourceRecord"]; -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/DNSTypes.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/DNSTypes.jsm"); function debug(msg) { - Services.console.logStringMessage('MulticastDNS: ' + msg); + Services.console.logStringMessage("MulticastDNS: " + msg); } const DNS_RESOURCE_RECORD_DEFAULT_TTL = 120; // 120 seconds @@ -24,7 +24,7 @@ class DNSResourceRecord extends DNSRecord { constructor(properties = {}) { super(properties); - this.ttl = properties.ttl || DNS_RESOURCE_RECORD_DEFAULT_TTL; + this.ttl = properties.ttl || DNS_RESOURCE_RECORD_DEFAULT_TTL; this.data = properties.data || {}; } @@ -119,7 +119,7 @@ function _parseA(recordData, packetData) { parts.push(reader.getValue(1)); } - return parts.join('.'); + return parts.join("."); } /** @@ -141,9 +141,9 @@ function _parseTXT(recordData, packetData) { let label = reader.getLabel(packetData); if (label.length > 0) { - let parts = label.split('.'); + let parts = label.split("."); parts.forEach((part) => { - let [name] = part.split('=', 1); + let [name] = part.split("=", 1); let value = part.substr(name.length + 1); result[name] = value; }); @@ -172,7 +172,7 @@ function _parseSRV(recordData, packetData) { function _serializeA(data) { let writer = new DataWriter(); - let parts = data.split('.'); + let parts = data.split("."); for (let i = 0; i < 4; i++) { writer.putValue(parseInt(parts[i], 10) || 0); } @@ -198,7 +198,7 @@ function _serializeTXT(data) { let writer = new DataWriter(); for (let name in data) { - writer.putLengthString(name + '=' + data[name]); + writer.putLengthString(name + "=" + data[name]); } return writer.data; @@ -211,8 +211,8 @@ function _serializeSRV(data) { let writer = new DataWriter(); writer.putValue(data.priority || 0, 2); - writer.putValue(data.weight || 0, 2); - writer.putValue(data.port || 0, 2); + writer.putValue(data.weight || 0, 2); + writer.putValue(data.port || 0, 2); writer.putLabel(data.target); return writer.data; diff --git a/netwerk/dns/mdns/libmdns/fallback/DNSTypes.jsm b/netwerk/dns/mdns/libmdns/fallback/DNSTypes.jsm index 96c3c5535273..37e0fa375472 100644 --- a/netwerk/dns/mdns/libmdns/fallback/DNSTypes.jsm +++ b/netwerk/dns/mdns/libmdns/fallback/DNSTypes.jsm @@ -4,97 +4,97 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ /* jshint esnext: true, moz: true */ -'use strict'; +"use strict"; var EXPORTED_SYMBOLS = [ - 'DNS_QUERY_RESPONSE_CODES', - 'DNS_AUTHORITATIVE_ANSWER_CODES', - 'DNS_CLASS_CODES', - 'DNS_RECORD_TYPES' + "DNS_QUERY_RESPONSE_CODES", + "DNS_AUTHORITATIVE_ANSWER_CODES", + "DNS_CLASS_CODES", + "DNS_RECORD_TYPES", ]; let DNS_QUERY_RESPONSE_CODES = { - QUERY : 0, // RFC 1035 - Query - RESPONSE : 1 // RFC 1035 - Reponse + QUERY: 0, // RFC 1035 - Query + RESPONSE: 1, // RFC 1035 - Reponse }; let DNS_AUTHORITATIVE_ANSWER_CODES = { - NO : 0, // RFC 1035 - Not Authoritative - YES : 1 // RFC 1035 - Is Authoritative + NO: 0, // RFC 1035 - Not Authoritative + YES: 1, // RFC 1035 - Is Authoritative }; let DNS_CLASS_CODES = { - IN : 0x01, // RFC 1035 - Internet - CS : 0x02, // RFC 1035 - CSNET - CH : 0x03, // RFC 1035 - CHAOS - HS : 0x04, // RFC 1035 - Hesiod - NONE : 0xfe, // RFC 2136 - None - ANY : 0xff, // RFC 1035 - Any + IN: 0x01, // RFC 1035 - Internet + CS: 0x02, // RFC 1035 - CSNET + CH: 0x03, // RFC 1035 - CHAOS + HS: 0x04, // RFC 1035 - Hesiod + NONE: 0xfe, // RFC 2136 - None + ANY: 0xff, // RFC 1035 - Any }; let DNS_RECORD_TYPES = { - SIGZERO : 0, // RFC 2931 - A : 1, // RFC 1035 - NS : 2, // RFC 1035 - MD : 3, // RFC 1035 - MF : 4, // RFC 1035 - CNAME : 5, // RFC 1035 - SOA : 6, // RFC 1035 - MB : 7, // RFC 1035 - MG : 8, // RFC 1035 - MR : 9, // RFC 1035 - NULL : 10, // RFC 1035 - WKS : 11, // RFC 1035 - PTR : 12, // RFC 1035 - HINFO : 13, // RFC 1035 - MINFO : 14, // RFC 1035 - MX : 15, // RFC 1035 - TXT : 16, // RFC 1035 - RP : 17, // RFC 1183 - AFSDB : 18, // RFC 1183 - X25 : 19, // RFC 1183 - ISDN : 20, // RFC 1183 - RT : 21, // RFC 1183 - NSAP : 22, // RFC 1706 - NSAP_PTR : 23, // RFC 1348 - SIG : 24, // RFC 2535 - KEY : 25, // RFC 2535 - PX : 26, // RFC 2163 - GPOS : 27, // RFC 1712 - AAAA : 28, // RFC 1886 - LOC : 29, // RFC 1876 - NXT : 30, // RFC 2535 - EID : 31, // RFC ???? - NIMLOC : 32, // RFC ???? - SRV : 33, // RFC 2052 - ATMA : 34, // RFC ???? - NAPTR : 35, // RFC 2168 - KX : 36, // RFC 2230 - CERT : 37, // RFC 2538 - DNAME : 39, // RFC 2672 - OPT : 41, // RFC 2671 - APL : 42, // RFC 3123 - DS : 43, // RFC 4034 - SSHFP : 44, // RFC 4255 - IPSECKEY : 45, // RFC 4025 - RRSIG : 46, // RFC 4034 - NSEC : 47, // RFC 4034 - DNSKEY : 48, // RFC 4034 - DHCID : 49, // RFC 4701 - NSEC3 : 50, // RFC ???? - NSEC3PARAM : 51, // RFC ???? - HIP : 55, // RFC 5205 - SPF : 99, // RFC 4408 - UINFO : 100, // RFC ???? - UID : 101, // RFC ???? - GID : 102, // RFC ???? - UNSPEC : 103, // RFC ???? - TKEY : 249, // RFC 2930 - TSIG : 250, // RFC 2931 - IXFR : 251, // RFC 1995 - AXFR : 252, // RFC 1035 - MAILB : 253, // RFC 1035 - MAILA : 254, // RFC 1035 - ANY : 255, // RFC 1035 - DLV : 32769 // RFC 4431 + SIGZERO: 0, // RFC 2931 + A: 1, // RFC 1035 + NS: 2, // RFC 1035 + MD: 3, // RFC 1035 + MF: 4, // RFC 1035 + CNAME: 5, // RFC 1035 + SOA: 6, // RFC 1035 + MB: 7, // RFC 1035 + MG: 8, // RFC 1035 + MR: 9, // RFC 1035 + NULL: 10, // RFC 1035 + WKS: 11, // RFC 1035 + PTR: 12, // RFC 1035 + HINFO: 13, // RFC 1035 + MINFO: 14, // RFC 1035 + MX: 15, // RFC 1035 + TXT: 16, // RFC 1035 + RP: 17, // RFC 1183 + AFSDB: 18, // RFC 1183 + X25: 19, // RFC 1183 + ISDN: 20, // RFC 1183 + RT: 21, // RFC 1183 + NSAP: 22, // RFC 1706 + NSAP_PTR: 23, // RFC 1348 + SIG: 24, // RFC 2535 + KEY: 25, // RFC 2535 + PX: 26, // RFC 2163 + GPOS: 27, // RFC 1712 + AAAA: 28, // RFC 1886 + LOC: 29, // RFC 1876 + NXT: 30, // RFC 2535 + EID: 31, // RFC ???? + NIMLOC: 32, // RFC ???? + SRV: 33, // RFC 2052 + ATMA: 34, // RFC ???? + NAPTR: 35, // RFC 2168 + KX: 36, // RFC 2230 + CERT: 37, // RFC 2538 + DNAME: 39, // RFC 2672 + OPT: 41, // RFC 2671 + APL: 42, // RFC 3123 + DS: 43, // RFC 4034 + SSHFP: 44, // RFC 4255 + IPSECKEY: 45, // RFC 4025 + RRSIG: 46, // RFC 4034 + NSEC: 47, // RFC 4034 + DNSKEY: 48, // RFC 4034 + DHCID: 49, // RFC 4701 + NSEC3: 50, // RFC ???? + NSEC3PARAM: 51, // RFC ???? + HIP: 55, // RFC 5205 + SPF: 99, // RFC 4408 + UINFO: 100, // RFC ???? + UID: 101, // RFC ???? + GID: 102, // RFC ???? + UNSPEC: 103, // RFC ???? + TKEY: 249, // RFC 2930 + TSIG: 250, // RFC 2931 + IXFR: 251, // RFC 1995 + AXFR: 252, // RFC 1035 + MAILB: 253, // RFC 1035 + MAILA: 254, // RFC 1035 + ANY: 255, // RFC 1035 + DLV: 32769, // RFC 4431 }; diff --git a/netwerk/dns/mdns/libmdns/fallback/DataReader.jsm b/netwerk/dns/mdns/libmdns/fallback/DataReader.jsm index e13835783542..4f3b0f525d64 100644 --- a/netwerk/dns/mdns/libmdns/fallback/DataReader.jsm +++ b/netwerk/dns/mdns/libmdns/fallback/DataReader.jsm @@ -4,9 +4,9 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ /* jshint esnext: true, moz: true */ -'use strict'; +"use strict"; -var EXPORTED_SYMBOLS = ['DataReader']; +var EXPORTED_SYMBOLS = ["DataReader"]; class DataReader { // `data` is `Uint8Array` @@ -70,7 +70,7 @@ class DataReader { break; } - let label = parts.join('.'); + let label = parts.join("."); return _decompressLabel(label, decompressData || this._data); } @@ -100,7 +100,7 @@ function _uint8ArrayToValue(uint8Array) { function _uint8ArrayToString(uint8Array) { let length = uint8Array.length; if (length === 0) { - return ''; + return ""; } let results = []; @@ -108,14 +108,14 @@ function _uint8ArrayToString(uint8Array) { results.push(String.fromCharCode.apply(null, uint8Array.subarray(i, i + 1024))); } - return results.join(''); + return results.join(""); } /** * @private */ function _decompressLabel(label, decompressData) { - let result = ''; + let result = ""; for (let i = 0, length = label.length; i < length; i++) { if (label.charCodeAt(i) !== 0xc0) { diff --git a/netwerk/dns/mdns/libmdns/fallback/DataWriter.jsm b/netwerk/dns/mdns/libmdns/fallback/DataWriter.jsm index 9be472559d86..eb2c202c41f6 100644 --- a/netwerk/dns/mdns/libmdns/fallback/DataWriter.jsm +++ b/netwerk/dns/mdns/libmdns/fallback/DataWriter.jsm @@ -4,13 +4,13 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ /* jshint esnext: true, moz: true */ -'use strict'; +"use strict"; -var EXPORTED_SYMBOLS = ['DataWriter']; +var EXPORTED_SYMBOLS = ["DataWriter"]; class DataWriter { constructor(data, maxBytes = 512) { - if (typeof data === 'number') { + if (typeof data === "number") { maxBytes = data; data = undefined; } @@ -35,7 +35,7 @@ class DataWriter { // `data` is `Uint8Array` putBytes(data) { if (this._cursor + data.length > this._data.length) { - throw new Error('DataWriter buffer is exceeded'); + throw new Error("DataWriter buffer is exceeded"); } for (let i = 0, length = data.length; i < length; i++) { @@ -46,10 +46,10 @@ class DataWriter { putByte(byte) { if (this._cursor + 1 > this._data.length) { - throw new Error('DataWriter buffer is exceeded'); + throw new Error("DataWriter buffer is exceeded"); } - this._data[this._cursor] = byte + this._data[this._cursor] = byte; this._cursor++; } @@ -64,8 +64,8 @@ class DataWriter { putLabel(label) { // Eliminate any trailing '.'s in the label (valid in text representation). - label = label.replace(/\.$/, ''); - let parts = label.split('.'); + label = label.replace(/\.$/, ""); + let parts = label.split("."); parts.forEach((part) => { this.putLengthString(part); }); diff --git a/netwerk/dns/mdns/libmdns/fallback/MulticastDNS.jsm b/netwerk/dns/mdns/libmdns/fallback/MulticastDNS.jsm index 4998772ad7c6..d4f5ecc354b2 100644 --- a/netwerk/dns/mdns/libmdns/fallback/MulticastDNS.jsm +++ b/netwerk/dns/mdns/libmdns/fallback/MulticastDNS.jsm @@ -4,34 +4,34 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ /* jshint esnext: true, moz: true */ -'use strict'; +"use strict"; -var EXPORTED_SYMBOLS = ['MulticastDNS']; +var EXPORTED_SYMBOLS = ["MulticastDNS"]; -ChromeUtils.import('resource://gre/modules/Services.jsm'); -ChromeUtils.import('resource://gre/modules/Timer.jsm'); -ChromeUtils.import('resource://gre/modules/XPCOMUtils.jsm'); +ChromeUtils.import("resource://gre/modules/Services.jsm"); +ChromeUtils.import("resource://gre/modules/Timer.jsm"); +ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); -ChromeUtils.import('resource://gre/modules/DNSPacket.jsm'); -ChromeUtils.import('resource://gre/modules/DNSRecord.jsm'); -ChromeUtils.import('resource://gre/modules/DNSResourceRecord.jsm'); -ChromeUtils.import('resource://gre/modules/DNSTypes.jsm'); +ChromeUtils.import("resource://gre/modules/DNSPacket.jsm"); +ChromeUtils.import("resource://gre/modules/DNSRecord.jsm"); +ChromeUtils.import("resource://gre/modules/DNSResourceRecord.jsm"); +ChromeUtils.import("resource://gre/modules/DNSTypes.jsm"); -const NS_NETWORK_LINK_TOPIC = 'network:link-status-changed'; +const NS_NETWORK_LINK_TOPIC = "network:link-status-changed"; let observerService = Cc["@mozilla.org/observer-service;1"] .getService(Ci.nsIObserverService); -let networkInfoService = Cc['@mozilla.org/network-info-service;1'] +let networkInfoService = Cc["@mozilla.org/network-info-service;1"] .createInstance(Ci.nsINetworkInfoService); const DEBUG = true; -const MDNS_MULTICAST_GROUP = '224.0.0.251'; +const MDNS_MULTICAST_GROUP = "224.0.0.251"; const MDNS_PORT = 5353; const DEFAULT_TTL = 120; function debug(msg) { - dump('MulticastDNS: ' + msg + '\n'); + dump("MulticastDNS: " + msg + "\n"); } function ServiceKey(svc) { @@ -49,7 +49,7 @@ function TryGet(obj, name) { } function IsIpv4Address(addr) { - let parts = addr.split('.'); + let parts = addr.split("."); if (parts.length != 4) { return false; } @@ -67,13 +67,13 @@ function IsIpv4Address(addr) { class PublishedService { constructor(attrs) { - this.serviceType = attrs.serviceType.replace(/\.$/, ''); + this.serviceType = attrs.serviceType.replace(/\.$/, ""); this.serviceName = attrs.serviceName; - this.domainName = TryGet(attrs, 'domainName') || "local"; - this.address = TryGet(attrs, 'address') || "0.0.0.0"; + this.domainName = TryGet(attrs, "domainName") || "local"; + this.address = TryGet(attrs, "address") || "0.0.0.0"; this.port = attrs.port; - this.serviceAttrs = _propertyBagToObject(TryGet(attrs, 'attributes') || {}); - this.host = TryGet(attrs, 'host'); + this.serviceAttrs = _propertyBagToObject(TryGet(attrs, "attributes") || {}); + this.host = TryGet(attrs, "host"); this.key = this.generateKey(); this.lastAdvertised = undefined; this.advertiseTimer = undefined; @@ -114,9 +114,9 @@ class MulticastDNS { this._networkLinkObserver = { observe: (subject, topic, data) => { - DEBUG && debug(NS_NETWORK_LINK_TOPIC + '(' + data + '); Clearing list of previously discovered services'); + DEBUG && debug(NS_NETWORK_LINK_TOPIC + "(" + data + "); Clearing list of previously discovered services"); this._discovered.clear(); - } + }, }; } @@ -126,7 +126,7 @@ class MulticastDNS { } if (!this._isNetworkLinkObserverAttached) { - DEBUG && debug('Attaching observer ' + NS_NETWORK_LINK_TOPIC); + DEBUG && debug("Attaching observer " + NS_NETWORK_LINK_TOPIC); observerService.addObserver(this._networkLinkObserver, NS_NETWORK_LINK_TOPIC); this._isNetworkLinkObserverAttached = true; } @@ -139,7 +139,7 @@ class MulticastDNS { } this._networkLinkObserverTimeout = setTimeout(() => { - DEBUG && debug('Detaching observer ' + NS_NETWORK_LINK_TOPIC); + DEBUG && debug("Detaching observer " + NS_NETWORK_LINK_TOPIC); observerService.removeObserver(this._networkLinkObserver, NS_NETWORK_LINK_TOPIC); this._isNetworkLinkObserverAttached = false; this._networkLinkObserverTimeout = null; @@ -155,7 +155,7 @@ class MulticastDNS { this._addServiceListener(serviceType, aListener); try { - this._query(serviceType + '.local'); + this._query(serviceType + ".local"); aListener.onDiscoveryStarted(serviceType); } catch (e) { DEBUG && debug('startDiscovery("' + serviceType + '") FAILED: ' + e); @@ -177,21 +177,21 @@ class MulticastDNS { } resolveService(aServiceInfo, aListener) { - DEBUG && debug('resolveService(): ' + aServiceInfo.serviceName); + DEBUG && debug("resolveService(): " + aServiceInfo.serviceName); // Address info is already resolved during discovery setTimeout(() => aListener.onServiceResolved(aServiceInfo)); } registerService(aServiceInfo, aListener) { - DEBUG && debug('registerService(): ' + aServiceInfo.serviceName); + DEBUG && debug("registerService(): " + aServiceInfo.serviceName); // Initialize the broadcast receiver socket in case it // hasn't already been started so we can listen for // multicast queries/announcements on all interfaces. this._getBroadcastReceiverSocket(); - for (let name of ['port', 'serviceName', 'serviceType']) { + for (let name of ["port", "serviceName", "serviceType"]) { if (!TryGet(aServiceInfo, name)) { aListener.onRegistrationFailed(aServiceInfo, Cr.NS_ERROR_FAILURE); throw new Error('Invalid nsIDNSServiceInfo; Missing "' + name + '"'); @@ -216,7 +216,7 @@ class MulticastDNS { // Make sure that the service addr is '0.0.0.0', or there is at least one // socket open on the address the service is open on. this._getSockets().then((sockets) => { - if (publishedService.address != '0.0.0.0' && !sockets.get(publishedService.address)) { + if (publishedService.address != "0.0.0.0" && !sockets.get(publishedService.address)) { setTimeout(() => aListener.onRegistrationFailed(aServiceInfo, Cr.NS_ERROR_FAILURE)); return; } @@ -234,7 +234,7 @@ class MulticastDNS { } unregisterService(aServiceInfo, aListener) { - DEBUG && debug('unregisterService(): ' + aServiceInfo.serviceName); + DEBUG && debug("unregisterService(): " + aServiceInfo.serviceName); let serviceKey; try { @@ -271,7 +271,7 @@ class MulticastDNS { _respondToQuery(serviceKey, message) { let address = message.fromAddr.address; let port = message.fromAddr.port; - DEBUG && debug('_respondToQuery(): key=' + serviceKey + ', fromAddr=' + DEBUG && debug("_respondToQuery(): key=" + serviceKey + ", fromAddr=" + address + ":" + port); let publishedService = this._services.get(serviceKey); @@ -280,12 +280,12 @@ class MulticastDNS { return; } - DEBUG && debug('_respondToQuery(): key=' + serviceKey + ': SENDING RESPONSE'); - this._advertiseServiceHelper(publishedService, {address,port}); + DEBUG && debug("_respondToQuery(): key=" + serviceKey + ": SENDING RESPONSE"); + this._advertiseServiceHelper(publishedService, {address, port}); } _advertiseService(serviceKey, firstAdv) { - DEBUG && debug('_advertiseService(): key=' + serviceKey); + DEBUG && debug("_advertiseService(): key=" + serviceKey); let publishedService = this._services.get(serviceKey); if (!publishedService) { debug("_advertiseService Could not find service to advertise (key=" + serviceKey + ")"); @@ -299,7 +299,7 @@ class MulticastDNS { // Otherwise, set the lastAdvertised time. if (firstAdv) { publishedService.advertiseTimer = setTimeout(() => { - this._advertiseService(serviceKey) + this._advertiseService(serviceKey); }, 1000); } else { publishedService.lastAdvertised = Date.now(); @@ -310,13 +310,12 @@ class MulticastDNS { _advertiseServiceHelper(svc, target) { if (!target) { - target = {address:MDNS_MULTICAST_GROUP, port:MDNS_PORT}; + target = {address: MDNS_MULTICAST_GROUP, port: MDNS_PORT}; } return this._getSockets().then((sockets) => { sockets.forEach((socket, address) => { - if (svc.address == "0.0.0.0" || address == svc.address) - { + if (svc.address == "0.0.0.0" || address == svc.address) { let packet = this._makeServicePacket(svc, [address]); let data = packet.serialize(); try { @@ -387,14 +386,14 @@ class MulticastDNS { _query(name) { DEBUG && debug('query("' + name + '")'); let packet = new DNSPacket(); - packet.setFlag('QR', DNS_QUERY_RESPONSE_CODES.QUERY); + packet.setFlag("QR", DNS_QUERY_RESPONSE_CODES.QUERY); // PTR Record - packet.addRecord('QD', new DNSRecord({ - name: name, + packet.addRecord("QD", new DNSRecord({ + name, recordType: DNS_RECORD_TYPES.PTR, classCode: DNS_CLASS_CODES.IN, - cacheFlush: true + cacheFlush: true, })); let data = packet.serialize(); @@ -434,13 +433,13 @@ class MulticastDNS { this._discovered.forEach((discovery, key) => { if (discovery.expireTime < Date.now()) { this._discovered.delete(key); - return; + } }); } _handleQueryPacket(packet, message) { - packet.getRecords(['QD']).forEach((record) => { + packet.getRecords(["QD"]).forEach((record) => { // Don't respond if the query's class code is not IN or ANY. if (record.classCode !== DNS_CLASS_CODES.IN && record.classCode !== DNS_CLASS_CODES.ANY) { @@ -464,23 +463,23 @@ class MulticastDNS { _makeServicePacket(service, addresses) { let packet = new DNSPacket(); - packet.setFlag('QR', DNS_QUERY_RESPONSE_CODES.RESPONSE); - packet.setFlag('AA', DNS_AUTHORITATIVE_ANSWER_CODES.YES); + packet.setFlag("QR", DNS_QUERY_RESPONSE_CODES.RESPONSE); + packet.setFlag("AA", DNS_AUTHORITATIVE_ANSWER_CODES.YES); let host = service.host || _hostname; // e.g.: foo-bar-service._http._tcp.local - let serviceDomainName = service.serviceName + '.' + service.serviceType + '.local'; + let serviceDomainName = service.serviceName + "." + service.serviceType + ".local"; // PTR Record - packet.addRecord('AN', new DNSResourceRecord({ - name: service.serviceType + '.local', // e.g.: _http._tcp.local + packet.addRecord("AN", new DNSResourceRecord({ + name: service.serviceType + ".local", // e.g.: _http._tcp.local recordType: DNS_RECORD_TYPES.PTR, - data: serviceDomainName + data: serviceDomainName, })); // SRV Record - packet.addRecord('AR', new DNSResourceRecord({ + packet.addRecord("AR", new DNSResourceRecord({ name: serviceDomainName, recordType: DNS_RECORD_TYPES.SRV, classCode: DNS_CLASS_CODES.IN, @@ -489,26 +488,26 @@ class MulticastDNS { priority: 0, weight: 0, port: service.port, - target: host // e.g.: My-Android-Phone.local - } + target: host, // e.g.: My-Android-Phone.local + }, })); // A Records for (let address of addresses) { - packet.addRecord('AR', new DNSResourceRecord({ + packet.addRecord("AR", new DNSResourceRecord({ name: host, recordType: DNS_RECORD_TYPES.A, - data: address + data: address, })); } // TXT Record - packet.addRecord('AR', new DNSResourceRecord({ + packet.addRecord("AR", new DNSResourceRecord({ name: serviceDomainName, recordType: DNS_RECORD_TYPES.TXT, classCode: DNS_CLASS_CODES.IN, cacheFlush: true, - data: service.serviceAttrs || {} + data: service.serviceAttrs || {}, })); return packet; @@ -518,10 +517,10 @@ class MulticastDNS { let services = {}; let hosts = {}; - let srvRecords = packet.getRecords(['AN', 'AR'], DNS_RECORD_TYPES.SRV); - let txtRecords = packet.getRecords(['AN', 'AR'], DNS_RECORD_TYPES.TXT); - let ptrRecords = packet.getRecords(['AN', 'AR'], DNS_RECORD_TYPES.PTR); - let aRecords = packet.getRecords(['AN', 'AR'], DNS_RECORD_TYPES.A); + let srvRecords = packet.getRecords(["AN", "AR"], DNS_RECORD_TYPES.SRV); + let txtRecords = packet.getRecords(["AN", "AR"], DNS_RECORD_TYPES.TXT); + let ptrRecords = packet.getRecords(["AN", "AR"], DNS_RECORD_TYPES.PTR); + let aRecords = packet.getRecords(["AN", "AR"], DNS_RECORD_TYPES.A); srvRecords.forEach((record) => { let data = record.data || {}; @@ -529,7 +528,7 @@ class MulticastDNS { services[record.name] = { host: data.target, port: data.port, - ttl: record.ttl + ttl: record.ttl, }; }); @@ -570,13 +569,13 @@ class MulticastDNS { let ttl = services[name].ttl || 0; let serviceInfo = { - serviceName: serviceName, - serviceType: serviceType, - host: host, - address: address, - port: port, - domainName: domainName, - attributes: services[name].attributes || {} + serviceName, + serviceType, + host, + address, + port, + domainName, + attributes: services[name].attributes || {}, }; this._onServiceFound(serviceInfo, ttl); @@ -585,10 +584,10 @@ class MulticastDNS { _onServiceFound(serviceInfo, ttl = 0) { let expireTime = Date.now() + (ttl * 1000); - let key = serviceInfo.serviceName + '.' + - serviceInfo.serviceType + '.' + - serviceInfo.domainName + ' @' + - serviceInfo.address + ':' + + let key = serviceInfo.serviceName + "." + + serviceInfo.serviceType + "." + + serviceInfo.domainName + " @" + + serviceInfo.address + ":" + serviceInfo.port; // If this service was already discovered, just update @@ -599,8 +598,8 @@ class MulticastDNS { } this._discovered.set(key, { - serviceInfo: serviceInfo, - expireTime: expireTime + serviceInfo, + expireTime, }); let listeners = this._listeners.get(serviceInfo.serviceType) || []; @@ -608,7 +607,7 @@ class MulticastDNS { listener.onServiceFound(serviceInfo); }); - DEBUG && debug('_onServiceFound()' + serviceInfo.serviceName); + DEBUG && debug("_onServiceFound()" + serviceInfo.serviceName); } /** @@ -622,9 +621,9 @@ class MulticastDNS { _getQuerySocket() { return new Promise((resolve, reject) => { if (!this._querySocket) { - this._querySocket = _openSocket('0.0.0.0', 0, { + this._querySocket = _openSocket("0.0.0.0", 0, { onPacketReceived: this._onPacketReceived.bind(this), - onStopListening: this._onStopListening.bind(this) + onStopListening: this._onStopListening.bind(this), }); } resolve(this._querySocket); @@ -641,10 +640,10 @@ class MulticastDNS { _getBroadcastReceiverSocket() { return new Promise((resolve, reject) => { if (!this._broadcastReceiverSocket) { - this._broadcastReceiverSocket = _openSocket('0.0.0.0', MDNS_PORT, { + this._broadcastReceiverSocket = _openSocket("0.0.0.0", MDNS_PORT, { onPacketReceived: this._onPacketReceived.bind(this), - onStopListening: this._onStopListening.bind(this) - }, /* multicastInterface = */ '0.0.0.0'); + onStopListening: this._onStopListening.bind(this), + }, /* multicastInterface = */ "0.0.0.0"); } resolve(this._broadcastReceiverSocket); }); @@ -703,7 +702,7 @@ class MulticastDNS { _onPacketReceived(socket, message) { let packet = DNSPacket.parse(message.rawData); - switch (packet.getFlag('QR')) { + switch (packet.getFlag("QR")) { case DNS_QUERY_RESPONSE_CODES.QUERY: this._handleQueryPacket(packet, message); break; @@ -716,7 +715,7 @@ class MulticastDNS { } _onStopListening(socket, status) { - DEBUG && debug('_onStopListening() ' + status); + DEBUG && debug("_onStopListening() " + status); } _addServiceListener(serviceType, listener) { @@ -763,19 +762,19 @@ function getAddresses() { networkInfoService.listNetworkAddresses({ onListedNetworkAddresses(aAddressArray) { _addresses = aAddressArray.filter((address) => { - return !address.includes('%p2p') && // No WiFi Direct interfaces - !address.includes(':') && // XXX: No IPv6 for now - address != "127.0.0.1" // No ipv4 loopback addresses. + return !address.includes("%p2p") && // No WiFi Direct interfaces + !address.includes(":") && // XXX: No IPv6 for now + address != "127.0.0.1"; // No ipv4 loopback addresses. }); - DEBUG && debug('getAddresses(): ' + _addresses); + DEBUG && debug("getAddresses(): " + _addresses); resolve(_addresses); }, onListNetworkAddressesFailed() { - DEBUG && debug('getAddresses() FAILED!'); + DEBUG && debug("getAddresses() FAILED!"); resolve([]); - } + }, }); }); } @@ -794,16 +793,16 @@ function getHostname() { networkInfoService.getHostname({ onGotHostname(aHostname) { - _hostname = aHostname.replace(/\s/g, '-') + '.local'; + _hostname = aHostname.replace(/\s/g, "-") + ".local"; - DEBUG && debug('getHostname(): ' + _hostname); + DEBUG && debug("getHostname(): " + _hostname); resolve(_hostname); }, onGetHostnameFailed() { - DEBUG && debug('getHostname() FAILED'); - resolve('localhost'); - } + DEBUG && debug("getHostname() FAILED"); + resolve("localhost"); + }, }); }); } @@ -821,13 +820,13 @@ function getHostname() { * @private */ function _parseServiceDomainName(serviceDomainName) { - let parts = serviceDomainName.split('.'); - let index = Math.max(parts.lastIndexOf('_tcp'), parts.lastIndexOf('_udp')); + let parts = serviceDomainName.split("."); + let index = Math.max(parts.lastIndexOf("_tcp"), parts.lastIndexOf("_udp")); return { - serviceName: parts.splice(0, index - 1).join('.'), - serviceType: parts.splice(0, 2).join('.'), - domainName: parts.join('.') + serviceName: parts.splice(0, index - 1).join("."), + serviceType: parts.splice(0, 2).join("."), + domainName: parts.join("."), }; } @@ -853,13 +852,13 @@ function _propertyBagToObject(propBag) { * @private */ function _openSocket(addr, port, handler, multicastInterface) { - let socket = Cc['@mozilla.org/network/udp-socket;1'].createInstance(Ci.nsIUDPSocket); + let socket = Cc["@mozilla.org/network/udp-socket;1"].createInstance(Ci.nsIUDPSocket); socket.init2(addr, port, Services.scriptSecurityManager.getSystemPrincipal(), true); if (handler) { socket.asyncListen({ onPacketReceived: handler.onPacketReceived, - onStopListening: handler.onStopListening + onStopListening: handler.onStopListening, }); } diff --git a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.js b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.js index fcaaf741d02a..99d4b3e5311a 100644 --- a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.js +++ b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.js @@ -4,7 +4,7 @@ "use strict"; ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); -ChromeUtils.import('resource://gre/modules/Services.jsm'); +ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); if (AppConstants.platform == "android" && !Services.prefs.getBoolPref("network.mdns.use_js_fallback")) { @@ -43,10 +43,10 @@ function ListenerWrapper(aListener, aMdns) { ListenerWrapper.prototype = { // Helper function for transforming an Object into nsIDNSServiceInfo. - makeServiceInfo: function (aServiceInfo) { + makeServiceInfo(aServiceInfo) { let serviceInfo = Cc[DNSSERVICEINFO_CONTRACT_ID].createInstance(Ci.nsIDNSServiceInfo); - for (let name of ['host', 'address', 'port', 'serviceName', 'serviceType']) { + for (let name of ["host", "address", "port", "serviceName", "serviceType"]) { try { serviceInfo[name] = aServiceInfo[name]; } catch (e) { @@ -60,7 +60,7 @@ ListenerWrapper.prototype = { } catch (err) { // Ignore unset attributes in object. log("Caught unset attributes error: " + err + " - " + err.stack); - attributes = Cc['@mozilla.org/hash-property-bag;1'] + attributes = Cc["@mozilla.org/hash-property-bag;1"] .createInstance(Ci.nsIWritablePropertyBag2); } serviceInfo.attributes = attributes; @@ -69,7 +69,7 @@ ListenerWrapper.prototype = { }, /* transparent types */ - onDiscoveryStarted: function(aServiceType) { + onDiscoveryStarted(aServiceType) { this.discoveryStarting = false; this.listener.onDiscoveryStarted(aServiceType); @@ -77,28 +77,28 @@ ListenerWrapper.prototype = { this.mdns.stopDiscovery(aServiceType, this); } }, - onDiscoveryStopped: function(aServiceType) { + onDiscoveryStopped(aServiceType) { this.listener.onDiscoveryStopped(aServiceType); }, - onStartDiscoveryFailed: function(aServiceType, aErrorCode) { - log('onStartDiscoveryFailed: ' + aServiceType + ' (' + aErrorCode + ')'); + onStartDiscoveryFailed(aServiceType, aErrorCode) { + log("onStartDiscoveryFailed: " + aServiceType + " (" + aErrorCode + ")"); this.discoveryStarting = false; this.stopDiscovery = true; this.listener.onStartDiscoveryFailed(aServiceType, aErrorCode); }, - onStopDiscoveryFailed: function(aServiceType, aErrorCode) { - log('onStopDiscoveryFailed: ' + aServiceType + ' (' + aErrorCode + ')'); + onStopDiscoveryFailed(aServiceType, aErrorCode) { + log("onStopDiscoveryFailed: " + aServiceType + " (" + aErrorCode + ")"); this.listener.onStopDiscoveryFailed(aServiceType, aErrorCode); }, /* transform types */ - onServiceFound: function(aServiceInfo) { + onServiceFound(aServiceInfo) { this.listener.onServiceFound(this.makeServiceInfo(aServiceInfo)); }, - onServiceLost: function(aServiceInfo) { + onServiceLost(aServiceInfo) { this.listener.onServiceLost(this.makeServiceInfo(aServiceInfo)); }, - onServiceRegistered: function(aServiceInfo) { + onServiceRegistered(aServiceInfo) { this.registrationStarting = false; this.listener.onServiceRegistered(this.makeServiceInfo(aServiceInfo)); @@ -106,27 +106,27 @@ ListenerWrapper.prototype = { this.mdns.unregisterService(aServiceInfo, this); } }, - onServiceUnregistered: function(aServiceInfo) { + onServiceUnregistered(aServiceInfo) { this.listener.onServiceUnregistered(this.makeServiceInfo(aServiceInfo)); }, - onServiceResolved: function(aServiceInfo) { + onServiceResolved(aServiceInfo) { this.listener.onServiceResolved(this.makeServiceInfo(aServiceInfo)); }, - onRegistrationFailed: function(aServiceInfo, aErrorCode) { - log('onRegistrationFailed: (' + aErrorCode + ')'); + onRegistrationFailed(aServiceInfo, aErrorCode) { + log("onRegistrationFailed: (" + aErrorCode + ")"); this.registrationStarting = false; this.stopRegistration = true; this.listener.onRegistrationFailed(this.makeServiceInfo(aServiceInfo), aErrorCode); }, - onUnregistrationFailed: function(aServiceInfo, aErrorCode) { - log('onUnregistrationFailed: (' + aErrorCode + ')'); + onUnregistrationFailed(aServiceInfo, aErrorCode) { + log("onUnregistrationFailed: (" + aErrorCode + ")"); this.listener.onUnregistrationFailed(this.makeServiceInfo(aServiceInfo), aErrorCode); }, - onResolveFailed: function(aServiceInfo, aErrorCode) { - log('onResolveFailed: (' + aErrorCode + ')'); + onResolveFailed(aServiceInfo, aErrorCode) { + log("onResolveFailed: (" + aErrorCode + ")"); this.listener.onResolveFailed(this.makeServiceInfo(aServiceInfo), aErrorCode); - } + }, }; function nsDNSServiceDiscovery() { @@ -138,7 +138,7 @@ nsDNSServiceDiscovery.prototype = { classID: DNSSERVICEDISCOVERY_CID, QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIDNSServiceDiscovery]), - startDiscovery: function(aServiceType, aListener) { + startDiscovery(aServiceType, aListener) { log("startDiscovery"); let listener = new ListenerWrapper(aListener, this.mdns); listener.discoveryStarting = true; @@ -152,11 +152,11 @@ nsDNSServiceDiscovery.prototype = { return; } this.mdns.stopDiscovery(aServiceType, listener); - }).bind(listener) + }).bind(listener), }; }, - registerService: function(aServiceInfo, aListener) { + registerService(aServiceInfo, aListener) { log("registerService"); let listener = new ListenerWrapper(aListener, this.mdns); listener.registrationStarting = true; @@ -170,25 +170,24 @@ nsDNSServiceDiscovery.prototype = { return; } this.mdns.unregisterService(aServiceInfo, listener); - }).bind(listener) + }).bind(listener), }; }, - resolveService: function(aServiceInfo, aListener) { + resolveService(aServiceInfo, aListener) { log("resolveService"); this.mdns.resolveService(aServiceInfo, new ListenerWrapper(aListener)); - } + }, }; this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsDNSServiceDiscovery]); -function _toPropertyBag2(obj) -{ +function _toPropertyBag2(obj) { if (obj.QueryInterface) { return obj.QueryInterface(Ci.nsIPropertyBag2); } - let result = Cc['@mozilla.org/hash-property-bag;1'] + let result = Cc["@mozilla.org/hash-property-bag;1"] .createInstance(Ci.nsIWritablePropertyBag2); for (let name in obj) { result.setPropertyAsAString(name, obj[name]); diff --git a/netwerk/protocol/ftp/test/frametest/menu.html b/netwerk/protocol/ftp/test/frametest/menu.html index afe3afcf2cd4..4fc096b805ea 100644 --- a/netwerk/protocol/ftp/test/frametest/menu.html +++ b/netwerk/protocol/ftp/test/frametest/menu.html @@ -4,8 +4,7 @@ diff --git a/netwerk/protocol/http/UAOverridesBootstrapper.js b/netwerk/protocol/http/UAOverridesBootstrapper.js index 5be5215bc172..3e43ed70b434 100644 --- a/netwerk/protocol/http/UAOverridesBootstrapper.js +++ b/netwerk/protocol/http/UAOverridesBootstrapper.js @@ -14,7 +14,7 @@ function UAOverridesBootstrapper() { UAOverridesBootstrapper.prototype = { init: function uaob_init() { - Services.obs.addObserver(this, "profile-change-net-teardown", false); + Services.obs.addObserver(this, "profile-change-net-teardown"); UserAgentOverrides.init(); }, @@ -26,7 +26,7 @@ UAOverridesBootstrapper.prototype = { }, QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), - classID: Components.ID("{965b0ca8-155b-11e7-93ae-92361f002671}") + classID: Components.ID("{965b0ca8-155b-11e7-93ae-92361f002671}"), }; const components = [UAOverridesBootstrapper]; diff --git a/netwerk/protocol/http/UserAgentOverrides.jsm b/netwerk/protocol/http/UserAgentOverrides.jsm index cf7d0017d791..4e3d21a0b091 100644 --- a/netwerk/protocol/http/UserAgentOverrides.jsm +++ b/netwerk/protocol/http/UserAgentOverrides.jsm @@ -26,7 +26,7 @@ var gUpdatedOverrides; var gOverrideForHostCache = new Map; var gInitialized = false; var gOverrideFunctions = [ - function (aHttpChannel) { return UserAgentOverrides.getOverrideForURI(aHttpChannel.URI); } + function(aHttpChannel) { return UserAgentOverrides.getOverrideForURI(aHttpChannel.URI); }, ]; var gBuiltUAs = new Map; @@ -90,7 +90,7 @@ var UserAgentOverrides = { let userAgent = overrides.get(searchHost); while (!userAgent) { - let dot = searchHost.indexOf('.'); + let dot = searchHost.indexOf("."); if (dot === -1) { return null; } @@ -121,11 +121,10 @@ var UserAgentOverrides = { Services.prefs.removeObserver(PREF_OVERRIDES_ENABLED, buildOverrides); Services.obs.removeObserver(HTTP_on_useragent_request, "http-on-useragent-request"); - } + }, }; -function getUserAgentFromOverride(override) -{ +function getUserAgentFromOverride(override) { let userAgent = gBuiltUAs.get(override); if (userAgent !== undefined) { return userAgent; diff --git a/netwerk/protocol/http/UserAgentUpdates.jsm b/netwerk/protocol/http/UserAgentUpdates.jsm index c6c3d298986f..e346eda00d21 100644 --- a/netwerk/protocol/http/UserAgentUpdates.jsm +++ b/netwerk/protocol/http/UserAgentUpdates.jsm @@ -86,7 +86,7 @@ function readChannel(url) { } var UserAgentUpdates = { - init: function(callback) { + init(callback) { if (gInitialized) { return; } @@ -99,7 +99,7 @@ var UserAgentUpdates = { Services.prefs.addObserver(PREF_UPDATES, this); }, - uninit: function() { + uninit() { if (!gInitialized) { return; } @@ -107,7 +107,7 @@ var UserAgentUpdates = { Services.prefs.removeObserver(PREF_UPDATES, this); }, - _applyUpdate: function(update) { + _applyUpdate(update) { // Check pref again in case it has changed if (update && this._getPref(PREF_UPDATES_ENABLED, false)) { this._callback(update); @@ -116,7 +116,7 @@ var UserAgentUpdates = { } }, - _applySavedUpdate: function() { + _applySavedUpdate() { if (!this._getPref(PREF_UPDATES_ENABLED, false)) { // remove previous overrides this._applyUpdate(null); @@ -154,7 +154,7 @@ var UserAgentUpdates = { this._scheduleUpdate(); }, - _saveToFile: function(update) { + _saveToFile(update) { let file = FileUtils.getFile(KEY_PREFDIR, [FILE_UPDATES], true); let path = file.path; let bytes = gEncoder.encode(JSON.stringify(update)); @@ -168,7 +168,7 @@ var UserAgentUpdates = { ); }, - _getPref: function(name, def) { + _getPref(name, def) { try { switch (typeof def) { case "number": return Services.prefs.getIntPref(name); @@ -194,7 +194,7 @@ var UserAgentUpdates = { }; }, - _getUpdateURL: function() { + _getUpdateURL() { let url = this._getPref(PREF_UPDATES_URL, ""); let params = this._getParameters(); return url.replace(/%[A-Z_]+%/g, function(match) { @@ -204,7 +204,7 @@ var UserAgentUpdates = { }); }, - _fetchUpdate: function(url, success, error) { + _fetchUpdate(url, success, error) { let request = new XMLHttpRequest(); request.mozBackgroundRequest = true; request.timeout = this._getPref(PREF_UPDATES_TIMEOUT, 60000); @@ -220,7 +220,7 @@ var UserAgentUpdates = { request.send(); }, - _update: function() { + _update() { let url = this._getUpdateURL(); url && this._fetchUpdate(url, response => { // success @@ -234,7 +234,7 @@ var UserAgentUpdates = { }); }, - _scheduleUpdate: function(retry) { + _scheduleUpdate(retry) { // only schedule updates in the main process if (gApp.processType !== Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT) { return; @@ -246,14 +246,14 @@ var UserAgentUpdates = { gUpdateTimer.registerTimer(TIMER_ID, this, Math.max(1, interval)); }, - notify: function(timer) { + notify(timer) { // timer notification if (this._getPref(PREF_UPDATES_ENABLED, false)) { this._update(); } }, - observe: function(subject, topic, data) { + observe(subject, topic, data) { switch (topic) { case "nsPref:changed": if (data === PREF_UPDATES_ENABLED) { diff --git a/netwerk/protocol/http/WellKnownOpportunisticUtils.js b/netwerk/protocol/http/WellKnownOpportunisticUtils.js index d30addd21253..1464a88f3083 100644 --- a/netwerk/protocol/http/WellKnownOpportunisticUtils.js +++ b/netwerk/protocol/http/WellKnownOpportunisticUtils.js @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -'use strict'; +"use strict"; ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -22,15 +22,15 @@ WellKnownOpportunisticUtils.prototype = { classDescription: "Well-Known Opportunistic Utils", QueryInterface: ChromeUtils.generateQI([Ci.nsIWellKnownOpportunisticUtils]), - verify: function(aJSON, aOrigin, aAlternatePort) { + verify(aJSON, aOrigin, aAlternatePort) { try { let obj = JSON.parse(aJSON.toLowerCase()); - let ports = obj[aOrigin.toLowerCase()]['tls-ports']; + let ports = obj[aOrigin.toLowerCase()]["tls-ports"]; if (!ports.includes(aAlternatePort)) { throw "invalid port"; } - this.lifetime = obj[aOrigin.toLowerCase()]['lifetime']; - this.mixed = obj[aOrigin.toLowerCase()]['mixed-scheme']; + this.lifetime = obj[aOrigin.toLowerCase()].lifetime; + this.mixed = obj[aOrigin.toLowerCase()]["mixed-scheme"]; } catch (e) { return; }