Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

src: use BaseObjectPtr to store SNI context #30548

Closed
wants to merge 3 commits into from
Closed

src: use BaseObjectPtr to store SNI context #30548

wants to merge 3 commits into from

Conversation

addaleax
Copy link
Member

Rather than relying on a link to the JS object, store a pointer to
the C++ object directly.

(Also, add memory tracking that was previously missing.)

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. labels Nov 19, 2019
@addaleax addaleax added tls Issues and PRs related to the tls subsystem. and removed lib / src Issues and PRs related to general changes in the lib or src directory. labels Nov 19, 2019
@addaleax
src: use BaseObjectPtr to store SNI context
fe5784a 
Rather than relying on a link to the JS object, store a pointer to
the C++ object directly.
@addaleax addaleax force-pushed the sni-context-baseobjectptr branch from f20b8b6 to fe5784a Compare November 19, 2019 19:30
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/26759/

bnoordhuis
bnoordhuis approved these changes Nov 19, 2019
View reviewed changes
Copy link
Member

@bnoordhuis bnoordhuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM at a quick glance.

src/node_crypto.cc Show resolved Hide resolved
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/26766/

@addaleax addaleax added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Nov 20, 2019
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/26778/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27116/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27122/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27140/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27169/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27174/

addaleax added a commit that referenced this pull request Nov 30, 2019
@addaleax
tls: add memory tracking support to SSLWrap
ef0b65f 
PR-URL: #30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
addaleax added a commit that referenced this pull request Nov 30, 2019
@addaleax
src: use BaseObjectPtr to store SNI context
c5a3199 
Rather than relying on a link to the JS object, store a pointer to
the C++ object directly.

PR-URL: #30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
addaleax added a commit that referenced this pull request Nov 30, 2019
@addaleax
src: inline SetSNICallback
f0181d9 
Refs: #30548 (comment)

PR-URL: #30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@addaleax
Copy link
Member Author

Landed in 84a25eb...f0181d9

@addaleax addaleax closed this Nov 30, 2019
@addaleax addaleax deleted the sni-context-baseobjectptr branch November 30, 2019 00:15
addaleax added a commit that referenced this pull request Nov 30, 2019
@addaleax
tls: add memory tracking support to SSLWrap
0b0f023 
PR-URL: #30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
addaleax added a commit that referenced this pull request Nov 30, 2019
@addaleax
src: use BaseObjectPtr to store SNI context
7bd587e 
Rather than relying on a link to the JS object, store a pointer to
the C++ object directly.

PR-URL: #30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
addaleax added a commit that referenced this pull request Nov 30, 2019
@addaleax
src: inline SetSNICallback
fc11db1 
Refs: #30548 (comment)

PR-URL: #30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@BridgeAR BridgeAR mentioned this pull request Dec 3, 2019
Merged
@targos
Copy link
Member

targos commented Jan 13, 2020

depends on #30374 to land on v12.x

targos pushed a commit to targos/node that referenced this pull request Apr 25, 2020
@addaleax @targos
tls: add memory tracking support to SSLWrap
06dec2a 
PR-URL: nodejs#30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
targos pushed a commit to targos/node that referenced this pull request Apr 25, 2020
@addaleax @targos
src: use BaseObjectPtr to store SNI context
ba789d1 
Rather than relying on a link to the JS object, store a pointer to
the C++ object directly.

PR-URL: nodejs#30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
targos pushed a commit to targos/node that referenced this pull request Apr 25, 2020
@addaleax @targos
src: inline SetSNICallback
ef3654a 
Refs: nodejs#30548 (comment)

PR-URL: nodejs#30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
targos pushed a commit that referenced this pull request Apr 28, 2020
@addaleax @targos
tls: add memory tracking support to SSLWrap
8961d33 
PR-URL: #30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
targos pushed a commit that referenced this pull request Apr 28, 2020
@addaleax @targos
src: use BaseObjectPtr to store SNI context
ce8d8c0 
Rather than relying on a link to the JS object, store a pointer to
the C++ object directly.

PR-URL: #30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
targos pushed a commit that referenced this pull request Apr 28, 2020
@addaleax @targos
src: inline SetSNICallback
98297b9 
Refs: #30548 (comment)

PR-URL: #30548
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@targos targos mentioned this pull request May 2, 2020
Merged
@snyk-bot snyk-bot mentioned this pull request Jun 1, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@devnexen devnexen devnexen approved these changes

@tniessen tniessen tniessen approved these changes

@jasnell jasnell jasnell approved these changes

@bnoordhuis bnoordhuis bnoordhuis approved these changes

Assignees
No one assigned
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. c++ Issues and PRs that require attention from people who are familiar with C++. tls Issues and PRs related to the tls subsystem.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@addaleax @nodejs-github-bot @targos @bnoordhuis @jasnell @tniessen @devnexen