src: extract common DoBind and DoConnect methods#22315
src: extract common DoBind and DoConnect methods#22315maclover7 wants to merge 2 commits intonodejs:masterfrom maclover7:jm-extract-tcp
Conversation
|
The change looks fine but can you include a quick description of the rationale in the commit log and PR description? |
|
This PR needs a rebase against master to avoid the git failure in the CI. |
|
@maclover7 Can you rebase? |
|
Ping @maclover7 |
`TCPWrap::Bind` and `TCPWrap::Bind6` share a large amount of functionality, so a common `Bind` was extracted to remove duplication.
|
Passing Resume Build: https://ci.nodejs.org/job/node-test-pull-request/19153/ |
|
Could use another review or two @nodejs/collaborators |
src/tcp_wrap.cc
Outdated
| sockaddr_in addr; | ||
| int err = uv_ip4_addr(*ip_address, port, &addr); | ||
| if (family == AF_INET6 && | ||
| !args[2]->Uint32Value(env->context()).To(&flags)) return; |
There was a problem hiding this comment.
Does this pass lint? I'd rather put return on a next line and add braces on this line and the line after return.
|
I have to share a somewhat amusing observation that while the intention of this PR is to reduce code (redundancy), GitHub measures it to remove as many lines as it adds (+23 −23). While I can appreciate the sentiment, I see this as increasing complexity in order to remove code duplication, shrinking the code base by 0 lines. -0 on this one. |
|
Fixed @indutny's comment New CI: https://ci.nodejs.org/job/node-test-pull-request/19590/ ✔️ |
|
Landed in 4b96a2a |
`TCPWrap::Bind` and `TCPWrap::Bind6` share a large amount of functionality, so a common `Bind` was extracted to remove duplication. PR-URL: #22315 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com>
`TCPWrap::Bind` and `TCPWrap::Bind6` share a large amount of functionality, so a common `Bind` was extracted to remove duplication. PR-URL: #22315 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com>
`TCPWrap::Bind` and `TCPWrap::Bind6` share a large amount of functionality, so a common `Bind` was extracted to remove duplication. PR-URL: nodejs#22315 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com>
`TCPWrap::Bind` and `TCPWrap::Bind6` share a large amount of functionality, so a common `Bind` was extracted to remove duplication. Backport-PR-URL: nodejs#28222 PR-URL: nodejs#22315 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com>
`TCPWrap::Bind` and `TCPWrap::Bind6` share a large amount of functionality, so a common `Bind` was extracted to remove duplication. Backport-PR-URL: #28222 PR-URL: #22315 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com>
`TCPWrap::Bind` and `TCPWrap::Bind6` share a large amount of functionality, so a common `Bind` was extracted to remove duplication. Backport-PR-URL: #28222 PR-URL: #22315 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com>
TCPWrap::BindandTCPWrap::Bind6share a large amount of functionality, so a commonDoBindwas extracted to remove duplication.TCPWrap::Connect/TCPWrap::Connect6follow this same pattern, soDoConnectwas extracted from those two methods to also remove duplication.Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes