Skip to content

Conversation

@dergoegge
Copy link
Member

This PR moves the proxy info globals into their own component ProxyManager which CConnman is made to hold an instance of.

The alternative here would be to move the proxy info data directly into CConnman but it seems a little nicer for testing to have this be a self contained component.

@DrahtBot
Copy link
Contributor

DrahtBot commented Nov 28, 2022

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.
A summary of reviews will appear here.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #26609 (refactor: Move txmempool_entry.h --> kernel/mempool_entry.h by hebasto)
  • #26441 (rpc, p2p: add addpermissionflags RPC by brunoerg)
  • #26261 (p2p: cleanup LookupIntern, Lookup and LookupHost by brunoerg)
  • #26114 (net: Make AddrFetch connections to fixed seeds by mzumsande)
  • #25619 (net: avoid overriding non-virtual ToString() in CService and use better naming by vasild)
  • #25572 (refactor: Introduce EvictionManager and use it for the inbound eviction logic by dergoegge)
  • #25515 (net, test: Virtualise CConnman and add initial PeerManager unit tests by dergoegge)
  • #25390 (sync: introduce a thread-safe generic container and use it to remove a bunch of "GlobalMutex"es by vasild)
  • #25268 (refactor: Introduce EvictionManager by dergoegge)
  • #25136 (Torcontrol opt check by amadeuszpawlik)
  • #20018 (p2p: ProcessAddrFetch(-seednode) is unnecessary if -connect is specified by dhruv)
  • #19461 (multiprocess: Add bitcoin-gui -ipcconnect option by ryanofsky)
  • #19460 (multiprocess: Add bitcoin-wallet -ipcconnect option by ryanofsky)
  • #10102 (Multiprocess bitcoin by ryanofsky)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@dergoegge dergoegge force-pushed the 2022-11-socks5-refactor branch from ad3a745 to 8df0c4c Compare November 28, 2022 16:10
script/sign.cpp \
script/signingprovider.cpp \
script/standard.cpp \
socks5.cpp \
Copy link
Member

Choose a reason for hiding this comment

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

Same ;)

@DrahtBot
Copy link
Contributor

DrahtBot commented Dec 6, 2022

🐙 This pull request conflicts with the target branch and needs rebase.

@dergoegge dergoegge closed this Dec 7, 2022
@maflcko
Copy link
Member

maflcko commented Dec 7, 2022

I guess it could still make sense to do a move-only build system change to move proxy/socks out of the bins that don't need it (wallet, util, cli, ...)?

@hebasto
Copy link
Member

hebasto commented Dec 7, 2022

I guess it could still make sense to do a move-only build system change to move proxy/socks out of the bins that don't need it (wallet, util, cli, ...)?

+1

@maflcko
Copy link
Member

maflcko commented Dec 9, 2022

I did that in fa02d16, but I am not sure how useful it is.

Maybe it would make more sense to create a separate net_utils library?

@bitcoin bitcoin locked and limited conversation to collaborators Dec 9, 2023
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.

4 participants