Skip to content

Conversation

@laanwj
Copy link
Member

@laanwj laanwj commented Sep 25, 2017

Make the SOCKS code more consistent, and document the constants used.

src/netbase.cpp Outdated
Copy link
Contributor

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.

Copy link
Member Author

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.

@laanwj laanwj force-pushed the 2017_09_socks_refactor branch from 0f92fb2 to 46544c6 Compare September 25, 2017 15:10
@theuni
Copy link
Member

theuni commented Sep 25, 2017

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 :)

@promag
Copy link
Contributor

promag commented Sep 25, 2017

utACK 46544c6.

src/netbase.cpp Outdated
Copy link
Contributor

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.

Copy link
Contributor

@gmaxwell gmaxwell left a 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.
@laanwj
Copy link
Member Author

laanwj commented Sep 26, 2017

Re-aligned comment @promag nit 46544c6 → 22f816e

@laanwj laanwj force-pushed the 2017_09_socks_refactor branch from 46544c6 to 22f816e Compare September 26, 2017 14:00
Copy link
Contributor

@gmaxwell gmaxwell left a comment

Choose a reason for hiding this comment

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

reACK

@sipa
Copy link
Member

sipa commented Sep 27, 2017

utACK 22f816e

2 similar comments
@TheBlueMatt
Copy link
Contributor

utACK 22f816e

@jonasschnelli
Copy link
Contributor

utACK 22f816e

@jonasschnelli
Copy link
Contributor

Tested ACK (macOS 10.12) 22f816e.

@jonasschnelli jonasschnelli merged commit 22f816e into bitcoin:master Sep 28, 2017
jonasschnelli added a commit that referenced this pull request Sep 28, 2017
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
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Oct 9, 2017
Make the SOCKS code more consistent, and document the constants used.

Github-Pull: bitcoin#11397
Rebased-From: 22f816e
codablock pushed a commit to codablock/dash that referenced this pull request Sep 25, 2019
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
ebfull added a commit to ebfull/zcash that referenced this pull request Nov 8, 2019
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]>
cronicc pushed a commit to HorizenOfficial/zen that referenced this pull request Nov 8, 2019
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]>
milesmanley pushed a commit to milesmanley/zel that referenced this pull request Nov 8, 2019
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]>
ca333 added a commit to GLEECBTC/komodo-daemon that referenced this pull request Nov 9, 2019
denverbdr pushed a commit to ycashfoundation/ycash that referenced this pull request Nov 9, 2019
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]>
codablock pushed a commit to codablock/dash that referenced this pull request Nov 19, 2019
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
milesmanley pushed a commit to milesmanley/zel that referenced this pull request Nov 23, 2019
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]>
MIPPL pushed a commit to biblepay/biblepay that referenced this pull request Nov 24, 2019
* 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
Asherda pushed a commit to Asherda/VerusCoin that referenced this pull request Nov 30, 2019
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]>
CryptoForge pushed a commit to CryptoForge/Zero that referenced this pull request Dec 3, 2019
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]>
cryptobubbles pushed a commit to cryptoprofutonium/zclassic-1 that referenced this pull request Dec 7, 2019
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]>
hTrap pushed a commit to ZclassicCommunity/zclassic that referenced this pull request Dec 8, 2019
* 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]>
cryptobubbles pushed a commit to cryptoprofutonium/zclassic-patched-for-explorer that referenced this pull request Dec 8, 2019
* 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]>
cryptoprofutonium added a commit to ZclassicCommunity/zclassic-patched-for-explorer that referenced this pull request Dec 8, 2019
* 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]>
cryptoprofutonium added a commit to ZclassicCommunity/zclassic-patched-for-explorer that referenced this pull request Dec 8, 2019
* 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]>
cryptobubbles pushed a commit to cryptoprofutonium/zclassic-patched-for-explorer that referenced this pull request Dec 8, 2019
* 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]>
hTrap pushed a commit to ZclassicCommunity/zclassic-patched-for-explorer that referenced this pull request Dec 8, 2019
* 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]>
cronicc pushed a commit to HorizenOfficial/zen that referenced this pull request Feb 10, 2020
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]>
random-zebra added a commit to PIVX-Project/PIVX that referenced this pull request Feb 1, 2021
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
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants