summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2017-05-12 08:25:11 +0200
committerDaniel Bevenius <daniel.bevenius@gmail.com>2017-05-15 07:22:43 +0200
commit60f0dc7d429e1ac612ea46ec815ff20c07807909 (patch)
tree227be8a01db395080bc7fb6d04a7c357814f8844
parent72e3dda93c7cae1035521adc67d5b80c735a3ac3 (diff)
downloadnode-new-60f0dc7d429e1ac612ea46ec815ff20c07807909.tar.gz
src: rename CONNECTION provider to SSLCONNECTION
Currently the async provider type CONNECTION is used in node_crypto.h and it might be clearer if it was named SSLCONNECTION as suggested by addaleax. This commit renames only the provider type as I was not sure if it was alright to change the class Connection as well. Refs: https://github.com/nodejs/node/pull/12967#discussion_r115978735 PR-URL: https://github.com/nodejs/node/pull/12989 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
-rw-r--r--src/async-wrap.h2
-rw-r--r--src/node_crypto.h2
-rw-r--r--test/async-hooks/test-connection.ssl.js12
3 files changed, 8 insertions, 8 deletions
diff --git a/src/async-wrap.h b/src/async-wrap.h
index 50d4f626ed..235828f36e 100644
--- a/src/async-wrap.h
+++ b/src/async-wrap.h
@@ -60,7 +60,7 @@ namespace node {
#if HAVE_OPENSSL
#define NODE_ASYNC_CRYPTO_PROVIDER_TYPES(V) \
- V(CONNECTION) \
+ V(SSLCONNECTION) \
V(PBKDF2REQUEST) \
V(RANDOMBYTESREQUEST) \
V(TLSWRAP)
diff --git a/src/node_crypto.h b/src/node_crypto.h
index ad1b493596..bd5ed517c5 100644
--- a/src/node_crypto.h
+++ b/src/node_crypto.h
@@ -402,7 +402,7 @@ class Connection : public AsyncWrap, public SSLWrap<Connection> {
v8::Local<v8::Object> wrap,
SecureContext* sc,
SSLWrap<Connection>::Kind kind)
- : AsyncWrap(env, wrap, AsyncWrap::PROVIDER_CONNECTION),
+ : AsyncWrap(env, wrap, AsyncWrap::PROVIDER_SSLCONNECTION),
SSLWrap<Connection>(env, sc, kind),
bio_read_(nullptr),
bio_write_(nullptr),
diff --git a/test/async-hooks/test-connection.ssl.js b/test/async-hooks/test-connection.ssl.js
index 69e31d85df..13a2967e0d 100644
--- a/test/async-hooks/test-connection.ssl.js
+++ b/test/async-hooks/test-connection.ssl.js
@@ -37,11 +37,11 @@ function createServerConnection(
// creating first server connection
const sc1 = createServerConnection(common.mustCall(onfirstHandShake));
-let as = hooks.activitiesOfTypes('CONNECTION');
+let as = hooks.activitiesOfTypes('SSLCONNECTION');
assert.strictEqual(as.length, 1,
'one CONNECTION after first connection created');
const f1 = as[0];
-assert.strictEqual(f1.type, 'CONNECTION', 'connection');
+assert.strictEqual(f1.type, 'SSLCONNECTION', 'connection');
assert.strictEqual(typeof f1.uid, 'number', 'uid is a number');
assert.strictEqual(typeof f1.triggerId, 'number', 'triggerId is a number');
checkInvocations(f1, { init: 1 }, 'first connection, when first created');
@@ -49,11 +49,11 @@ checkInvocations(f1, { init: 1 }, 'first connection, when first created');
// creating second server connection
const sc2 = createServerConnection(common.mustCall(onsecondHandShake));
-as = hooks.activitiesOfTypes('CONNECTION');
+as = hooks.activitiesOfTypes('SSLCONNECTION');
assert.strictEqual(as.length, 2,
- 'two CONNECTIONs after second connection created');
+ 'two SSLCONNECTIONs after second connection created');
const f2 = as[1];
-assert.strictEqual(f2.type, 'CONNECTION', 'connection');
+assert.strictEqual(f2.type, 'SSLCONNECTION', 'connection');
assert.strictEqual(typeof f2.uid, 'number', 'uid is a number');
assert.strictEqual(typeof f2.triggerId, 'number', 'triggerId is a number');
checkInvocations(f1, { init: 1 }, 'first connection, when second created');
@@ -81,7 +81,7 @@ process.on('exit', onexit);
function onexit() {
hooks.disable();
- hooks.sanityCheck('CONNECTION');
+ hooks.sanityCheck('SSLCONNECTION');
checkInvocations(f1, { init: 1, before: 1, after: 1 },
'first connection, when process exits');