Skip to content
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

add filters from config to addr filter in swarm #1433

Merged
merged 5 commits into from
Jul 3, 2015
Merged

add filters from config to addr filter in swarm #1433

merged 5 commits into from
Jul 3, 2015
+438 −13

Conversation

whyrusleeping
Copy link
Member

License: MIT
Signed-off-by: Jeromy jeromyj@gmail.com

@whyrusleeping
add filters from config to addr filter in swarm
e7fd57f 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@whyrusleeping whyrusleeping added the status/in-progress In progress label Jun 30, 2015
@jbenet
Copy link
Member

jbenet commented Jun 30, 2015

@whyrusleeping know what would've caught this? a sharness test :D

@jbenet
Copy link
Member

jbenet commented Jun 30, 2015

@whyrusleeping yeah, let's add a sharness test before merging this

@whyrusleeping
Copy link
Member Author

@jbenet lets add a sharness test before merging this

@whyrusleeping
Copy link
Member Author

more seriously, how do you propose we write a test for this?

@jbenet
Copy link
Member

jbenet commented Jun 30, 2015

@whyrusleeping:

  1. start two daemons without mdns + bootstrap addrs
  2. get their addrs. for each addr you see, try filters with different cidrs (/8, /12, /16, /24, /32)
  3. add filter to one based on addr of the other
  4. check they cannot connect to each other.
  5. remove the filter
  6. check they can connect to each other.

@whyrusleeping
add command to manipulate address filters and a sharness test for them
7cc73f7 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@whyrusleeping
Copy link
Member Author

@jbenet RFCR

@whyrusleeping whyrusleeping added codereview and removed status/in-progress In progress labels Jul 2, 2015
@jbenet
Copy link
Member

jbenet commented Jul 2, 2015

still need to test that the filters get loaded from the config

@whyrusleeping
test dialblocklist loading from config
57d7a44 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
@whyrusleeping
Copy link
Member Author

@jbenet tests pushed

jbenet added 2 commits July 2, 2015 16:10
@jbenet
t0141-addfilter: check init has no filters
a119b72 
License: MIT
Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
@jbenet
config: DialBlocklist -> Swarm.AddrFilters
c595cf8 
This commit changes the DialBlocklist key to be under the key
Swarm.AddrFilters instead.

License: MIT
Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
@jbenet
Copy link
Member

jbenet commented Jul 3, 2015

I'm going to merge this.

jbenet added a commit that referenced this pull request Jul 3, 2015
@jbenet
Merge pull request #1433 from ipfs/fix/addr-filter
0d42a6a 
add filters from config to addr filter in swarm
@jbenet jbenet merged commit 0d42a6a into master Jul 3, 2015
@jbenet jbenet removed the codereview label Jul 3, 2015
@jbenet jbenet deleted the fix/addr-filter branch July 3, 2015 00:00
@jbenet
Copy link
Member

jbenet commented Jul 3, 2015

Should fix #1226

@jbenet jbenet mentioned this pull request Jul 3, 2015
Closed
@ghost ghost mentioned this pull request Jun 15, 2016
Closed
@alexanderkjeldaas alexanderkjeldaas mentioned this pull request Sep 22, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@whyrusleeping @jbenet