/bitcoin

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Banlist updates #7350

Merged
merged 5 commits into from Jan 20, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
Refactoring
Projects
None yet
Milestone
No milestone
5 participants
@luke-jr @dcousens @MarcoFalke @jonasschnelli @laanwj
@luke-jr
Member

luke-jr commented Jan 15, 2016

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

Philip Kaufmann and others added some commits Jul 3, 2015

banlist: update set dirty to be more fine grained 
- move the SetBannedSetDirty(false) call from DumpData() into DumpBanlist()
- ensure we only set false, if the write succeeded
57c77fe
banlist: better handling of banlist in StartNode() 
- 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
ce479aa
banlist: add more banlist infos to log / add GUI signal 
- 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
2977c24
banlist (bugfix): allow CNode::SweepBanned() to run on interval 
- allows CNode::SweepBanned() to run, even if !CNode::BannedSetIsDirty(),
  because if nBanUntil is over we want the ban to be disabled for these
  nodes
e8600c9
@luke-jr
Merge branch 'master' into 20150703_banlist_updates
5bc4fb7
@dcousens
Contributor

dcousens commented Jan 15, 2016

@luke-jr why 5bc4fb7? Rebase?
@luke-jr
Member

luke-jr commented Jan 15, 2016

@dcousens Rebasing is bad.
@MarcoFalke
Member

MarcoFalke commented Jan 15, 2016

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

jonasschnelli commented Jan 15, 2016

Thanks.
utACK.

@jonasschnelli jonasschnelli added the Refactoring label Jan 15, 2016

@dcousens
Contributor

dcousens commented Jan 15, 2016

utACK 5bc4fb7
@MarcoFalke
Member

MarcoFalke commented Jan 15, 2016

utACK 5bc4fb7

@laanwj laanwj merged commit 5bc4fb7 into bitcoin:master Jan 20, 2016
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jan 20, 2016

@laanwj
Merge #7350: Banlist updates 
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)
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
5578144

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 9, 2016

@luke-jr
Merge #7350 20150703_banlist_updates^
d86297e

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jun 26, 2016

@luke-jr
Merge #7350 20150703_banlist_updates^
591aa08

This was referenced May 7, 2017

Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment