forked from berty/berty
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request berty#2948 from moul/dev/moul/bump-deps589
- Loading branch information
Showing
4 changed files
with
51 additions
and
29 deletions.
There are no files selected for viewing
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ type LocalRecord struct { | |
| } | ||
|
|
||
| // OptionLocalRecord is given to CoreAPIOption.Options when the ipfs node setup | ||
| func OptionLocalRecord(ctx context.Context, node *ipfs_core.IpfsNode, api ipfs_interface.CoreAPI) error { | ||
| func OptionLocalRecord(node *ipfs_core.IpfsNode, api ipfs_interface.CoreAPI) error { | ||
| lr := &LocalRecord{ | ||
| host: node.PeerHost, | ||
| } | ||
|
|
@@ -41,9 +41,10 @@ func (lr *LocalRecord) ListenClose(network.Network, ma.Multiaddr) {} | |
|
|
||
| // called when a connection opened | ||
| func (lr *LocalRecord) Connected(net network.Network, c network.Conn) { | ||
| ctx := context.Background() // FIXME: since [email protected] adds support for passed context on new call, we should think if we have a better context to pass here | ||
| go func() { | ||
| if manet.IsPrivateAddr(c.RemoteMultiaddr()) || mafmt.Base(mc.ProtocolCode).Matches(c.RemoteMultiaddr()) { | ||
| if err := lr.sendLocalRecord(c); err != nil { | ||
| if err := lr.sendLocalRecord(ctx, c); err != nil { | ||
| return | ||
| } | ||
| } | ||
|
|
@@ -59,8 +60,8 @@ func (lr *LocalRecord) OpenedStream(network.Network, network.Stream) {} | |
| // called when a stream closed | ||
| func (lr *LocalRecord) ClosedStream(network.Network, network.Stream) {} | ||
|
|
||
| func (lr *LocalRecord) sendLocalRecord(c network.Conn) error { | ||
| s, err := c.NewStream() | ||
| func (lr *LocalRecord) sendLocalRecord(ctx context.Context, c network.Conn) error { | ||
| s, err := c.NewStream(ctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
Oops, something went wrong.