1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: rename CONNECTION provider to SSLCONNECTION

Browse Source 
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>
This commit is contained in:
Daniel Bevenius 2017-05-12 08:25:11 +02:00
parent 72e3dda93c
commit 60f0dc7d42
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/async-wrap.h
View File

@ -60,7 +60,7 @@ namespace node {
#if HAVE_OPENSSL #if HAVE_OPENSSL
#define NODE_ASYNC_CRYPTO_PROVIDER_TYPES(V) \ #define NODE_ASYNC_CRYPTO_PROVIDER_TYPES(V) \
V(CONNECTION) \ V(SSLCONNECTION) \
V(PBKDF2REQUEST) \ V(PBKDF2REQUEST) \
V(RANDOMBYTESREQUEST) \ V(RANDOMBYTESREQUEST) \
V(TLSWRAP) V(TLSWRAP)

2
src/node_crypto.h
View File

@ -402,7 +402,7 @@ class Connection : public AsyncWrap, public SSLWrap<Connection> {
v8::Local<v8::Object> wrap, v8::Local<v8::Object> wrap,
SecureContext* sc, SecureContext* sc,
SSLWrap<Connection>::Kind kind) SSLWrap<Connection>::Kind kind)
: AsyncWrap(env, wrap, AsyncWrap::PROVIDER_CONNECTION), : AsyncWrap(env, wrap, AsyncWrap::PROVIDER_SSLCONNECTION),
SSLWrap<Connection>(env, sc, kind), SSLWrap<Connection>(env, sc, kind),
bio_read_(nullptr), bio_read_(nullptr),
bio_write_(nullptr), bio_write_(nullptr),

12
test/async-hooks/test-connection.ssl.js
View File

@ -37,11 +37,11 @@ function createServerConnection(
// creating first server connection // creating first server connection
const sc1 = createServerConnection(common.mustCall(onfirstHandShake)); const sc1 = createServerConnection(common.mustCall(onfirstHandShake));
let as = hooks.activitiesOfTypes('CONNECTION'); let as = hooks.activitiesOfTypes('SSLCONNECTION');
assert.strictEqual(as.length, 1, assert.strictEqual(as.length, 1,
'one CONNECTION after first connection created'); 'one CONNECTION after first connection created');
const f1 = as[0]; 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.uid, 'number', 'uid is a number');
assert.strictEqual(typeof f1.triggerId, 'number', 'triggerId is a number'); assert.strictEqual(typeof f1.triggerId, 'number', 'triggerId is a number');
checkInvocations(f1, { init: 1 }, 'first connection, when first created'); 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 // creating second server connection
const sc2 = createServerConnection(common.mustCall(onsecondHandShake)); const sc2 = createServerConnection(common.mustCall(onsecondHandShake));
as = hooks.activitiesOfTypes('CONNECTION'); as = hooks.activitiesOfTypes('SSLCONNECTION');
assert.strictEqual(as.length, 2, assert.strictEqual(as.length, 2,
'two CONNECTIONs after second connection created'); 'two SSLCONNECTIONs after second connection created');
const f2 = as[1]; 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.uid, 'number', 'uid is a number');
assert.strictEqual(typeof f2.triggerId, 'number', 'triggerId is a number'); assert.strictEqual(typeof f2.triggerId, 'number', 'triggerId is a number');
checkInvocations(f1, { init: 1 }, 'first connection, when second created'); checkInvocations(f1, { init: 1 }, 'first connection, when second created');
@ -81,7 +81,7 @@ process.on('exit', onexit);
function onexit() { function onexit() {
hooks.disable(); hooks.disable();
hooks.sanityCheck('CONNECTION'); hooks.sanityCheck('SSLCONNECTION');
checkInvocations(f1, { init: 1, before: 1, after: 1 }, checkInvocations(f1, { init: 1, before: 1, after: 1 },
'first connection, when process exits'); 'first connection, when process exits');