add dns support inipfs p2p forward and refactor code
#5533
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kjzz
changed the title
ipfs p2p forward should accept full multiaddresses as target
kjzz
changed the title
ipfs p2p forward should accept full multiaddresses as targetipfs p2p forward and refactor code
kjzz
force-pushed
the
zkj/forward
branch
6 times, most recently
from
b3ee63f
to
7db2efe
Compare
|
Hey @Stebalien , i have finished about this pr.If you have any time,please help me review it.Thx a lot. |
magik6k
reviewed
Oct 1, 2018
core/commands/p2p.go
Outdated
| @@ -19,6 +19,8 @@ import ( | |||
| ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr" | |||
| "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol" | |||
| pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore" | |||
| madns "gx/ipfs/QmfXU2MhWoegxHoeMd3A2ytL2P6CY4FfqGWc23LTNWBwZt/go-multiaddr-dns" | |||
| "time" | |||
core/commands/p2p.go
Outdated
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if strings.Contains(mutiladdr.String(), "/ipfs/Qm") { |
There was a problem hiding this comment.
I wouldn't check for the Qm prefix as that won't work with Ed keys. Also, we want to migrate form /ipfs/ to /p2p/ in near future so for compatibility this should just be if _, err := multiaddr.ValueForProtocol(ma.P_IPFS); err == nil {
core/commands/p2p.go
Outdated
| targetAddressOptionName = "target-address" | ||
| ) | ||
|
|
||
| var connectionTimeout = 10 * time.Second |
There was a problem hiding this comment.
This doesn't appear to be used anywhere but parseIpfsAddr, so maybe call it resolveTimeout?
kjzz
force-pushed
the
zkj/forward
branch
2 times, most recently
from
1ce96f0
to
480d833
Compare
|
Thx a lot for your great advice @magik6k . I have update my pr please help me review again.And maybe there are something wrong with |
kjzz
force-pushed
the
zkj/forward
branch
9 times, most recently
from
1ea140c
to
f8d955c
Compare
magik6k
approved these changes
Oct 2, 2018
License: MIT Signed-off-by: Kejie Zhang <601172892@qq.com>
License: MIT Signed-off-by: Kejie Zhang <601172892@qq.com>
ghost
assigned
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #5524
License: MIT
Signed-off-by: Kejie Zhang 601172892@qq.com