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

Some fixes to bitswap + dht #155

Merged
merged 63 commits into from
Oct 19, 2014
Merged

Some fixes to bitswap + dht #155

merged 63 commits into from
Oct 19, 2014

Conversation

jbenet
Copy link
Member

@jbenet jbenet commented Oct 11, 2014

No description provided.

@jbenet jbenet added the status/in-progress In progress label Oct 11, 2014
@jbenet
Copy link
Member Author

jbenet commented Oct 12, 2014

cc @whyrusleeping lmk thoughts here. prob not fully ready yet-- will check things out with your new cmd

whyrusleeping
whyrusleeping reviewed Oct 13, 2014
View reviewed changes
exchange/bitswap/bitswap.go
@@ -88,8 +84,16 @@ func (bs *bitswap) Block(parent context.Context, k u.Key) (*blocks.Block, error)
for iiiii := range peersToQuery {
Copy link
Member

Choose a reason for hiding this comment

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

uhm.... wat?

Copy link
Member Author

Choose a reason for hiding this comment

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

haha, yeah. I'll fix that

@jbenet jbenet force-pushed the master branch 2 times, most recently from cd43433 to 8f1c12e Compare October 14, 2014 10:19
@jbenet jbenet mentioned this pull request Oct 15, 2014
Closed
jbenet and others added 16 commits October 18, 2014 04:28
@jbenet
add local to net/conn
1b1ef6a
@jbenet
command help spacing
d2671af
@jbenet
bitswap dials peers
1555ce7 
Important bugfix. Otherwise bitswap cannot message peers
the node has not connected to yet :(
@jbenet
dht handleAddProviders adds addr in msg
0117fb1 
Otherwise don't have the peer's target address.
@jbenet
removed DialAddr
a2d55f3
@jbenet
no longer store incoming addrs
d113aa8
@jbenet
commenting out platform specific code
577f8fe
@jbenet
remove old pkg
0e22892
@jbenet
meant to call net.DialPeer
a5a7d99
@jbenet
logging + tweaks
4b5906e
@jbenet
iiii -> peerToQuery
c894b1d 
(that wasn't mine :p)
@whyrusleeping @jbenet
fix up FindProvidersAsync
c77ed6d
@whyrusleeping @jbenet
fix bug in diagnostics, and add more peers to closer peer responses
4189d50
@whyrusleeping @jbenet
add in basic bandwidth tracking to the muxer
afe85ce
@whyrusleeping @jbenet
add methods on net interface to retrieve bandwidth values
a8330f1
@whyrusleeping @jbenet
put bandwidth totals into the diagnostic messages
be5f976
@jbenet
Copy link
Member Author

jbenet commented Oct 19, 2014

jbenet: TestConnectCollision fails for me

So, it was the "which connection picked" problem. So, I implemented MultiConn, and it works now. And i also solved all sorts of ugly connection startup/teardown problems we had. Fixed most things detailed in #187 (at least for now), using my new and shiny ContextCloser.

(tests on travis seem to be very time dependent. particularly things waiting for connection teardowns. seems like we'll need to just bump all timeouts by 2-3 orders of magnitude :/)

@jbenet
Copy link
Member Author

jbenet commented Oct 19, 2014

@whyrusleeping pls see if it fails for you still, and if not, let's merge this.

@jbenet
close conns directly in tests
4c178f8
@jbenet
more lenient time
7c4596a 
need to switch away from timing tests. its very annoying.
Should use proper go sync, as in
https://www.youtube.com/watch?v=ndmB0bj7eyw
@whyrusleeping
Copy link
Member

5/5 runs passed for me! LGTM

jbenet added a commit that referenced this pull request Oct 19, 2014
@jbenet
Merge pull request #155 from jbenet/netfixes
c8ea913 
Some fixes to bitswap + dht
@jbenet jbenet merged commit c8ea913 into master Oct 19, 2014
@jbenet jbenet removed the status/in-progress In progress label Oct 19, 2014
@jbenet jbenet deleted the netfixes branch October 19, 2014 23:52
@jbenet
Copy link
Member Author

jbenet commented Oct 19, 2014

ariescodescream pushed a commit to ariescodescream/go-ipfs that referenced this pull request Oct 23, 2021
@Stebalien
Merge pull request ipfs#155 from libp2p/fix/154
53421fc 
remove redundant error check
@aschmahmann aschmahmann mentioned this pull request Dec 1, 2021
Closed
80 tasks
laurentsenta pushed a commit to laurentsenta/kubo that referenced this pull request Feb 25, 2022
@marten-seemann @lidel
feat: add a flag to enable the hole punching service (ipfs#155)
1503bb2 
* add a flag to enable the hole punching service
* chore: omitempty EnableHolePunching

Co-authored-by: Marcin Rataj <lidel@lidel.org>
laurentsenta pushed a commit to laurentsenta/kubo that referenced this pull request Feb 25, 2022
@marten-seemann @lidel
go-ipfs-config: feat: add a flag to enable the hole punching service (i…
84942f0 
…pfs#155)

* add a flag to enable the hole punching service
* chore: omitempty EnableHolePunching

Co-authored-by: Marcin Rataj <lidel@lidel.org>
laurentsenta pushed a commit to laurentsenta/kubo that referenced this pull request Mar 4, 2022
@marten-seemann @lidel
go-ipfs-config: feat: add a flag to enable the hole punching service (i…
e94434c 
…pfs#155)

* add a flag to enable the hole punching service
* chore: omitempty EnableHolePunching

Co-authored-by: Marcin Rataj <lidel@lidel.org>
laurentsenta pushed a commit to laurentsenta/kubo that referenced this pull request Mar 4, 2022
@marten-seemann @lidel
go-ipfs-config: feat: add a flag to enable the hole punching service (i…
7fe155c 
…pfs#155)

* add a flag to enable the hole punching service
* chore: omitempty EnableHolePunching

Co-authored-by: Marcin Rataj <lidel@lidel.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jbenet jbenet

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jbenet @whyrusleeping @btc