-
Notifications
You must be signed in to change notification settings - Fork 38.7k
net: Improve and document SOCKS code #11397
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.
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
Conversation
eccca31 to
0f92fb2
Compare
src/netbase.cpp
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Funny, in windows 2nd arg is char*, that's why the build failed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, thought it would be void, added the wrong cast. Should be ok now.
0f92fb2 to
46544c6
Compare
|
utACK 46544c60d67d8a7095e7243795d2b570ab8391e3. InterruptibleRecv goes away soon as part of the async connection work, but having the SOCKS constants defined will make those changes much easier to review. Thanks for saving me a step :) |
|
utACK 46544c6. |
src/netbase.cpp
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit, align this and above comments with below.
gmaxwell
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK
Make the SOCKS code more consistent, and document the constants used.
46544c6 to
22f816e
Compare
gmaxwell
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
reACK
|
utACK 22f816e |
|
Tested ACK (macOS 10.12) 22f816e. |
22f816e net: Improve and document SOCKS code (Wladimir J. van der Laan) Pull request description: Make the SOCKS code more consistent, and document the constants used. Tree-SHA512: 1bb04fcd6aacb6bfd2c54989d8298c892036466a895efb88be36fbace041af67c964ae0f5fb76c96f813f20a040109de4e0aac49a20844640e4d7633fcb22f25
Make the SOCKS code more consistent, and document the constants used. Github-Pull: bitcoin#11397 Rebased-From: 22f816e
22f816e net: Improve and document SOCKS code (Wladimir J. van der Laan) Pull request description: Make the SOCKS code more consistent, and document the constants used. Tree-SHA512: 1bb04fcd6aacb6bfd2c54989d8298c892036466a895efb88be36fbace041af67c964ae0f5fb76c96f813f20a040109de4e0aac49a20844640e4d7633fcb22f25
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]>
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]>
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]>
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]>
22f816e net: Improve and document SOCKS code (Wladimir J. van der Laan) Pull request description: Make the SOCKS code more consistent, and document the constants used. Tree-SHA512: 1bb04fcd6aacb6bfd2c54989d8298c892036466a895efb88be36fbace041af67c964ae0f5fb76c96f813f20a040109de4e0aac49a20844640e4d7633fcb22f25
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]>
* commit '8b14adb206d76fbc6307385999a1c512052e93fa': (21 commits) [v0.14.0.x] Update release notes with change log (dashpay#3213) [v0.14.0.x] Bump version to 0.14.0.4 and draft release notes (dashpay#3203) Circumvent BIP69 sorting in fundrawtransaction.py test (dashpay#3100) Fix compile issues Merge bitcoin#11397: net: Improve and document SOCKS code Slightly optimize ApproximateBestSubset and its usage for PS txes (dashpay#3184) Update activemn if protx info changed (dashpay#3176) Actually update spent index on DisconnectBlock (dashpay#3167) Only track last seen time instead of first and last seen time (dashpay#3165) Merge bitcoin#17118: build: depends macOS: point --sysroot to SDK (dashpay#3161) Simulate BlockConnected/BlockDisconnected for PS caches Few fixes related to SelectCoinsGroupedByAddresses (dashpay#3144) Various fixes for mixing queues (dashpay#3138) Also consider txindex for transactions in AlreadyHave() (dashpay#3126) Ignore recent rejects filter for locked txes (dashpay#3124) Make orphan TX map limiting dependent on total TX size instead of TX count (dashpay#3121) Update/modernize macOS plist (dashpay#3074) Fix bip69 vs change position issue (dashpay#3063) Partially revert 3061 (dashpay#3150) Fix SelectCoinsMinConf to allow instant respends (dashpay#3061) ... # Conflicts: # configure.ac # doc/man/biblepay-cli.1 # doc/man/biblepay-qt.1 # doc/man/biblepay-tx.1 # doc/man/biblepayd.1 # doc/release-notes.md # src/clientversion.h # src/wallet/wallet.cpp
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]>
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]>
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]>
* Disable -shrinkdebugfile command * Fix of CVE-2017-18350 Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]> * Versioning changes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated manpages for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated release notes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]>
* Disable -shrinkdebugfile command * Fix of CVE-2017-18350 Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]> * Versioning changes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated manpages for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated release notes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]>
* Disable -shrinkdebugfile command * Fix of CVE-2017-18350 Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]> * Versioning changes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated manpages for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated release notes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]>
* Disable -shrinkdebugfile command * Fix of CVE-2017-18350 Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]> * Versioning changes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated manpages for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated release notes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]>
* Disable -shrinkdebugfile command * Fix of CVE-2017-18350 Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]> * Versioning changes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated manpages for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated release notes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]>
* Disable -shrinkdebugfile command * Fix of CVE-2017-18350 Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]> * Versioning changes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated manpages for 2.0.6 Signed-off-by: cryptobubbles <[email protected]> * Updated release notes for 2.0.6 Signed-off-by: cryptobubbles <[email protected]>
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan. Co-Authored-By: Jack Grigg <[email protected]> Co-Authored-By: Daira Hopwood <[email protected]>
31b0fbd net: Improve and document SOCKS code (Wladimir J. van der Laan) Pull request description: cherry-picked from bitcoin#11397. > Make the SOCKS code more consistent, and document the constants used. ACKs for top commit: furszy: ACK 31b0fbd Fuzzbawls: ACK 31b0fbd Tree-SHA512: 5b899667f103568bd48728789d5d3b688f10c13466e45e34ecaf6ca0651f27d7be880ddae80bd206af1fd3b01ca963c016260ec1a26cb89107c52870b8dd3fda
Make the SOCKS code more consistent, and document the constants used.