Skip to content

don't enforce maxuploadtarget's disconnect for whitelisted peers#6984

Merged
gmaxwell merged 3 commits intobitcoin:masterfrom
jonasschnelli:2015/11/maxupload_whitebind
Nov 14, 2015
Merged

don't enforce maxuploadtarget's disconnect for whitelisted peers#6984
gmaxwell merged 3 commits intobitcoin:masterfrom
jonasschnelli:2015/11/maxupload_whitebind

Conversation

@jonasschnelli
Copy link
Contributor

@jonasschnelli jonasschnelli commented Nov 11, 2015

No description provided.

@jonasschnelli jonasschnelli force-pushed the 2015/11/maxupload_whitebind branch 2 times, most recently from bba177b to 3fbe493 Compare November 11, 2015 09:15
sipa
sipa reviewed Nov 11, 2015
View reviewed changes
src/main.cpp Outdated
Copy link
Member

@sipa sipa Nov 11, 2015

Choose a reason for hiding this comment

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

Unnecessary space before )

Copy link
Contributor Author

@jonasschnelli jonasschnelli Nov 11, 2015

Choose a reason for hiding this comment

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

True. Force-push removed.

@sipa
Copy link
Member

sipa commented Nov 11, 2015

utACK

@jonasschnelli jonasschnelli force-pushed the 2015/11/maxupload_whitebind branch from 3fbe493 to 4566e5b Compare November 11, 2015 09:43
@gmaxwell
Copy link
Contributor

gmaxwell commented Nov 11, 2015

utACK

@fanquake
Copy link
Member

fanquake commented Nov 11, 2015

utACK @jonasschnelli has documentation written, it just needs to be included here.

@laanwj laanwj added the P2P label Nov 11, 2015
@laanwj
Copy link
Member

laanwj commented Nov 11, 2015

Concept ACK

@instagibbs
Copy link
Member

instagibbs commented Nov 12, 2015

utACK

sipa
sipa reviewed Nov 12, 2015
View reviewed changes
qa/rpc-tests/maxuploadtarget.py Outdated
Copy link
Member

@sipa sipa Nov 12, 2015

Choose a reason for hiding this comment

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

nit: enough

Copy link
Contributor Author

@jonasschnelli jonasschnelli Nov 12, 2015

Choose a reason for hiding this comment

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

Thanks. Fixed.

@sipa
Copy link
Member

sipa commented Nov 12, 2015

utACK

@jonasschnelli jonasschnelli force-pushed the 2015/11/maxupload_whitebind branch from 4566e5b to 5a2984f Compare November 12, 2015 13:40
@instagibbs instagibbs mentioned this pull request Nov 12, 2015
Merged
maflcko
maflcko reviewed Nov 13, 2015
View reviewed changes
src/main.cpp
Copy link
Member

@maflcko maflcko Nov 13, 2015

Choose a reason for hiding this comment

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

Is this already mentioned in the release notes and/or documentation?

Copy link
Contributor

@gmaxwell gmaxwell Nov 13, 2015

Choose a reason for hiding this comment

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

I think it's more or less adequately explained by the documentation for whitelist.

Though the release note for maxupload target could mention it too.

@gmaxwell
Copy link
Contributor

gmaxwell commented Nov 13, 2015

Also tested, works good. (I gave a utACK above). Please update docs/release notes as you see fit.

@jonasschnelli jonasschnelli force-pushed the 2015/11/maxupload_whitebind branch from 5a2984f to 1aa57ac Compare November 13, 2015 20:12
@jonasschnelli
Copy link
Contributor Author

jonasschnelli commented Nov 13, 2015

I have added a short documentation in the release-notes.md and in the reduce-traffic.md doc (feel free to overhaul). Also i smuggled in a rename from reducetraffic.md to reduce-traffic.md (which would be silly to do in a separated PR). All other doc filename use the same pattern.

@jonasschnelli jonasschnelli force-pushed the 2015/11/maxupload_whitebind branch from 1aa57ac to e495ed5 Compare November 14, 2015 07:43
@jonasschnelli
Copy link
Contributor Author

jonasschnelli commented Nov 14, 2015

Thanks. Fixed.

@gmaxwell gmaxwell merged commit e495ed5 into bitcoin:master Nov 14, 2015
gmaxwell added a commit that referenced this pull request Nov 14, 2015
@gmaxwell
Merge pull request #6984
9ffc687 
e495ed5 add documentation for exluding whitelistes peer from maxuploadtarget (Jonas Schnelli)
5760749 [docs] rename reducetraffic.md to reduce-traffic.md (Jonas Schnelli)
d61fcff don't enforce maxuploadtargets disconnect for whitelisted peers (Jonas Schnelli)
@rebroad rebroad mentioned this pull request Aug 26, 2016
Closed
@str4d str4d mentioned this pull request Jul 14, 2017
Draft
@str4d str4d mentioned this pull request Dec 19, 2017
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Feb 18, 2021
@zkbot
Auto merge of #2816 - str4d:2074-maxuploadtarget, r=str4d
1d378b1 
Introduce -maxuploadtarget

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6622
- bitcoin/bitcoin#6987
- bitcoin/bitcoin#6958
- bitcoin/bitcoin#6984
- bitcoin/bitcoin#6999

Part of #2074.
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

P2P

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@jonasschnelli @sipa @gmaxwell @fanquake @laanwj @instagibbs @maflcko