Skip to content

Commit

Permalink
quic: fixup lint issues
Browse files Browse the repository at this point in the history
PR-URL: #34160
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
jasnell committed Jul 5, 2020
1 parent 7b062ca commit 3837d9c
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
5 changes: 1 addition & 4 deletions lib/internal/quic/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ assertCrypto();
const {
Array,
BigInt64Array,
Boolean,
Error,
Map,
RegExp,
Expand All @@ -30,7 +29,6 @@ const {
setTransportParams,
toggleListeners,
validateNumber,
validateCloseCode,
validateTransportParams,
validateQuicClientSessionOptions,
validateQuicSocketOptions,
Expand Down Expand Up @@ -98,7 +96,6 @@ const {
codes: {
ERR_INVALID_ARG_TYPE,
ERR_INVALID_CALLBACK,
ERR_QUIC_ERROR,
ERR_QUICSESSION_DESTROYED,
ERR_QUICSESSION_VERSION_NEGOTIATION,
ERR_QUICSOCKET_DESTROYED,
Expand Down Expand Up @@ -1888,7 +1885,7 @@ class QuicSession extends EventEmitter {
this.removeListener('removeListener', onRemoveListener);

const handle = this[kHandle];
this[kHandle] = undefined
this[kHandle] = undefined;
if (handle !== undefined) {
// Copy the stats for use after destruction
state.stats = new BigInt64Array(handle.stats);
Expand Down
27 changes: 13 additions & 14 deletions lib/internal/quic/util.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

const {
Boolean,
Number,
NumberINFINITY,
NumberNEGATIVE_INFINITY,
} = primordials;
Expand All @@ -21,18 +23,15 @@ const {
},
} = require('internal/async_hooks');

const {
kHandle,
} = require('internal/stream_base_commons');

const endianness = require('os').endianness();

const { Readable } = require('stream');
const {
kHandle,
kUpdateTimer,
onStreamRead,
} = require('internal/stream_base_commons');

const endianness = require('os').endianness();

const assert = require('internal/assert');
assert(process.versions.ngtcp2 !== undefined);

Expand Down Expand Up @@ -874,26 +873,26 @@ class QuicSessionSharedState {

get maxStreamsBidi() {
return Number(endianness === 'BE' ?
this[kHandle].readBigInt64BE(IDX_QUICSESSION_STATE_MAX_STREAMS_BIDI) :
this[kHandle].readBigInt64LE(IDX_QUICSESSION_STATE_MAX_STREAMS_BIDI));
this[kHandle].readBigInt64BE(IDX_QUICSESSION_STATE_MAX_STREAMS_BIDI) :
this[kHandle].readBigInt64LE(IDX_QUICSESSION_STATE_MAX_STREAMS_BIDI));
}

get maxStreamsUni() {
return Number(endianness === 'BE' ?
this[kHandle].readBigInt64BE(IDX_QUICSESSION_STATE_MAX_STREAMS_UNI) :
this[kHandle].readBigInt64LE(IDX_QUICSESSION_STATE_MAX_STREAMS_UNI));
this[kHandle].readBigInt64BE(IDX_QUICSESSION_STATE_MAX_STREAMS_UNI) :
this[kHandle].readBigInt64LE(IDX_QUICSESSION_STATE_MAX_STREAMS_UNI));
}

get maxDataLeft() {
return Number(endianness === 'BE' ?
this[kHandle].readBigInt64BE(IDX_QUICSESSION_STATE_MAX_DATA_LEFT) :
this[kHandle].readBigInt64LE(IDX_QUICSESSION_STATE_MAX_DATA_LEFT));
this[kHandle].readBigInt64BE(IDX_QUICSESSION_STATE_MAX_DATA_LEFT) :
this[kHandle].readBigInt64LE(IDX_QUICSESSION_STATE_MAX_DATA_LEFT));
}

get bytesInFlight() {
return Number(endianness === 'BE' ?
this[kHandle].readBigInt64BE(IDX_QUICSESSION_STATE_BYTES_IN_FLIGHT) :
this[kHandle].readBigInt64LE(IDX_QUICSESSION_STATE_BYTES_IN_FLIGHT));
this[kHandle].readBigInt64BE(IDX_QUICSESSION_STATE_BYTES_IN_FLIGHT) :
this[kHandle].readBigInt64LE(IDX_QUICSESSION_STATE_BYTES_IN_FLIGHT));
}
}

Expand Down
6 changes: 4 additions & 2 deletions src/quic/node_quic_session.h
Original file line number Diff line number Diff line change
Expand Up @@ -837,8 +837,10 @@ class QuicSession : public AsyncWrap,
#define V(id, name) \
bool is_##name() const { return flags_ & (1 << QUICSESSION_FLAG_##id); } \
void set_##name(bool on = true) { \
if (on) flags_ |= (1 << QUICSESSION_FLAG_##id); \
else flags_ &= ~(1 << QUICSESSION_FLAG_##id); \
if (on) \
flags_ |= (1 << QUICSESSION_FLAG_##id); \
else \
flags_ &= ~(1 << QUICSESSION_FLAG_##id); \
}
QUICSESSION_FLAGS(V)
#undef V
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-quic-maxconnectionsperhost.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ const kALPN = 'zzz';
countdown.dec();
// Shutdown the remaining open sessions.
setImmediate(common.mustCall(() => {
for (const req of sessions)
req.close();
for (const req of sessions)
req.close();
}));
}));

Expand Down
2 changes: 2 additions & 0 deletions test/parallel/test-quic-qlog.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ function gatherQlog(session, id) {
switch (id) {
case 'server':
setupQlog(session.qlog);
break;
case 'client':
session.on('qlog', setupQlog);
break;
}
}

0 comments on commit 3837d9c

Please sign in to comment.