Skip to content

Banlist updates #7350

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
Merged
merged 5 commits into from
Jan 20, 2016
Merged

Banlist updates #7350

merged 5 commits into from
Jan 20, 2016

Conversation

luke-jr
Copy link
Member

@luke-jr luke-jr commented Jan 15, 2016

Recovering #6371 which was basically ready to merge when @Diapolo decided to leave

Philip Kaufmann and others added 5 commits October 2, 2015 11:38
banlist: update set dirty to be more fine grained
57c77fe 
- move the SetBannedSetDirty(false) call from DumpData() into DumpBanlist()
- ensure we only set false, if the write succeeded
banlist: better handling of banlist in StartNode()
ce479aa 
- only start working on/with banlist data, if reading in the banlist from
  disk didn't fail
- as CNode::setBannedIsDirty is false (default) when reading fails, we
  don't need to explicitly set it to false to prevent writing
  banlist.dat in that case either
banlist: add more banlist infos to log / add GUI signal
2977c24 
- to match the peers.dat handling also supply a debug.log entry for how
  many entries were loaded from banlist.dat and how long it took
- add a GUI init message for loading the banlist (same as with peers.dat)

- move the same message for peers.dat upwards in the code, to be able to
  reuse the timing variable nStart and also just log, if our read from
  peers.dat didn't fail
banlist (bugfix): allow CNode::SweepBanned() to run on interval
e8600c9 
- allows CNode::SweepBanned() to run, even if !CNode::BannedSetIsDirty(),
  because if nBanUntil is over we want the ban to be disabled for these
  nodes
@luke-jr
Merge branch 'master' into 20150703_banlist_updates
5bc4fb7
@dcousens
Copy link
Contributor

@luke-jr why 5bc4fb7? Rebase?

@luke-jr
Copy link
Member Author

luke-jr commented Jan 15, 2016

@dcousens Rebasing is bad.

@maflcko
Copy link
Member

maflcko commented Jan 15, 2016

This looks like consistency cleanup/refactor. Any new feature to test here?

@jonasschnelli
Copy link
Contributor

Thanks.
utACK.

@dcousens
Copy link
Contributor

utACK 5bc4fb7

1 similar comment
@maflcko
Copy link
Member

maflcko commented Jan 15, 2016

utACK 5bc4fb7

@laanwj laanwj merged commit 5bc4fb7 into bitcoin:master Jan 20, 2016
laanwj added a commit that referenced this pull request Jan 20, 2016
@laanwj
Merge #7350: Banlist updates
5578144 
e8600c9 banlist (bugfix): allow CNode::SweepBanned() to run on interval (Philip Kaufmann)
2977c24 banlist: add more banlist infos to log / add GUI signal (Philip Kaufmann)
ce479aa banlist: better handling of banlist in StartNode() (Philip Kaufmann)
57c77fe banlist: update set dirty to be more fine grained (Philip Kaufmann)
luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 26, 2016
@luke-jr
Merge bitcoin#7350 20150703_banlist_updates^
591aa08
@kyuupichan kyuupichan mentioned this pull request May 7, 2017
Merged
@OlegGirko OlegGirko mentioned this pull request Jul 4, 2017
Merged
@str4d str4d mentioned this pull request Apr 5, 2018
Merged
@Fuzzbawls Fuzzbawls mentioned this pull request Feb 29, 2020
Merged
Fuzzbawls added a commit to PIVX-Project/PIVX that referenced this pull request Mar 4, 2020
@Fuzzbawls
Merge #1363: [Net] Banlist updates
7c78ece 
594e027 banlist (bugfix): allow CNode::SweepBanned() to run on interval (Philip Kaufmann)
215fcf7 banlist: add more banlist infos to log / add GUI signal (Philip Kaufmann)
4655134 banlist: better handling of banlist in StartNode() (Philip Kaufmann)
f6ec277 banlist: update set dirty to be more fine grained (Philip Kaufmann)

Pull request description:

  Minor updates to how the banlist is handled. ported from bitcoin#7350

ACKs for top commit:
  random-zebra:
    utACK 594e027
  furszy:
    utACK 594e027

Tree-SHA512: a81675ddd48fe30f4978dfd09a7739176ed8dd351eba9d423e04693c5e81b8f266b6343a84b945e341e9235e110b04fe87e4b2a5f304f00689df983d952bd93e
@Fuzzbawls Fuzzbawls mentioned this pull request Mar 4, 2020
Closed
21 tasks
zkbot added a commit to zcash/zcash that referenced this pull request Mar 6, 2020
@zkbot
Auto merge of #2812 - str4d:2074-store-banlist, r=<try>
bf0f1cb 
banlist.dat: store banlist on disk

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6310
- bitcoin/bitcoin#6315
  - Only the new signal and net changes, no QT
- bitcoin/bitcoin#7350
- bitcoin/bitcoin#7458

Part of #2074.
wqking pushed a commit to wqking-temp/Vitae that referenced this pull request Aug 5, 2020
@Fuzzbawls @wqking
Merge #1363: [Net] Banlist updates
cf21b99 
594e027a424308129ce95aa0c5fd91a030885c68 banlist (bugfix): allow CNode::SweepBanned() to run on interval (Philip Kaufmann)
215fcf7c21cc953e43d47a3ab1e9c204d80d4102 banlist: add more banlist infos to log / add GUI signal (Philip Kaufmann)
4655134f3dde3c188c7429329ab21942bffe036a banlist: better handling of banlist in StartNode() (Philip Kaufmann)
f6ec277aaa3f36f02604d2cdd2b681de5efe95b7 banlist: update set dirty to be more fine grained (Philip Kaufmann)

Pull request description:

  Minor updates to how the banlist is handled. ported from bitcoin/bitcoin#7350

ACKs for top commit:
  random-zebra:
    utACK 594e027a424308129ce95aa0c5fd91a030885c68
  furszy:
    utACK 594e027

Tree-SHA512: a81675ddd48fe30f4978dfd09a7739176ed8dd351eba9d423e04693c5e81b8f266b6343a84b945e341e9235e110b04fe87e4b2a5f304f00689df983d952bd93e
zkbot added a commit to zcash/zcash that referenced this pull request Nov 12, 2020
@zkbot
Auto merge of #2812 - str4d:2074-store-banlist, r=<try>
f401214 
banlist.dat: store banlist on disk

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6310
- bitcoin/bitcoin#6315
  - Only the new signal and net changes, no QT.
- bitcoin/bitcoin#7350
- bitcoin/bitcoin#7458
- bitcoin/bitcoin#7696
- bitcoin/bitcoin#7959
- bitcoin/bitcoin#7906
  - Only the ban-related commits.
- bitcoin/bitcoin#8392
  - Only the second commit.
- bitcoin/bitcoin#8085
  - Only the second commit.
- bitcoin/bitcoin#10564

Part of #2074.
@PRCYDev PRCYDev mentioned this pull request Jan 25, 2021
Open
21 tasks
zkbot added a commit to zcash/zcash that referenced this pull request Feb 11, 2021
@zkbot
Auto merge of #2812 - str4d:2074-store-banlist, r=<try>
049951d 
banlist.dat: store banlist on disk

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6310
- bitcoin/bitcoin#6315
  - Only the new signal and net changes, no QT.
- bitcoin/bitcoin#7350
- bitcoin/bitcoin#7458
- bitcoin/bitcoin#7696
- bitcoin/bitcoin#7959
- bitcoin/bitcoin#7906
  - Only the ban-related commits.
- bitcoin/bitcoin#8392
  - Only the second commit.
- bitcoin/bitcoin#8085
  - Only the second commit.
- bitcoin/bitcoin#10564

Part of #2074.
zkbot added a commit to zcash/zcash that referenced this pull request Feb 17, 2021
@zkbot
Auto merge of #2812 - str4d:2074-store-banlist, r=<try>
e85265f 
banlist.dat: store banlist on disk

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6310
- bitcoin/bitcoin#6315
  - Only the new signal and net changes, no QT.
- bitcoin/bitcoin#7350
- bitcoin/bitcoin#7458
- bitcoin/bitcoin#7696
- bitcoin/bitcoin#7959
- bitcoin/bitcoin#7906
  - Only the ban-related commits.
- bitcoin/bitcoin#8392
  - Only the second commit.
- bitcoin/bitcoin#8085
  - Only the second commit.
- bitcoin/bitcoin#10564
- bitcoin/bitcoin#13061
  - Wasn't needed when I first made this backport in 2017, but it is now!

Part of #2074.
zkbot added a commit to zcash/zcash that referenced this pull request Feb 17, 2021
@zkbot
Auto merge of #2812 - str4d:2074-store-banlist, r=nuttycom
b4b07a1 
banlist.dat: store banlist on disk

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6310
- bitcoin/bitcoin#6315
  - Only the new signal and net changes, no QT.
- bitcoin/bitcoin#7350
- bitcoin/bitcoin#7458
- bitcoin/bitcoin#7696
- bitcoin/bitcoin#7959
- bitcoin/bitcoin#7906
  - Only the ban-related commits.
- bitcoin/bitcoin#8392
  - Only the second commit.
- bitcoin/bitcoin#8085
  - Only the second commit.
- bitcoin/bitcoin#10564
- bitcoin/bitcoin#13061
  - Wasn't needed when I first made this backport in 2017, but it is now!

Part of #2074.
@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.
Reviewers
No reviews
Assignees
No one assigned
Labels
Refactoring
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@luke-jr @dcousens @maflcko @jonasschnelli @laanwj