Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
p2p
go-p2p-swarm
Commits
780c661f
Commit
780c661f
authored
Mar 07, 2016
by
Jeromy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
switch to new version of go-stream-muxer
parent
ac3b3a3a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
10 deletions
+27
-10
swarm.go
swarm.go
+21
-4
swarm_conn.go
swarm_conn.go
+1
-1
swarm_listen.go
swarm_listen.go
+3
-3
swarm_stream.go
swarm_stream.go
+1
-1
swarm_test.go
swarm_test.go
+1
-1
No files found.
swarm.go
View file @
780c661f
...
...
@@ -4,6 +4,7 @@ package swarm
import
(
"fmt"
"io/ioutil"
"sync"
"time"
...
...
@@ -16,11 +17,13 @@ import (
transport
"github.com/ipfs/go-libp2p/p2p/net/transport"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
ps
"gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
goprocessctx
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
pst
"gx/ipfs/QmTYr6RrJs8b63LTVwahmtytnuqzsLfNPBJp6EvmFWHbGh/go-stream-muxer"
psmss
"gx/ipfs/QmTYr6RrJs8b63LTVwahmtytnuqzsLfNPBJp6EvmFWHbGh/go-stream-muxer/multistream"
pst
"gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer"
psmss
"gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/multistream"
spdy
"gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/spdystream"
yamux
"gx/ipfs/QmWSJzRkCMJFHYUQZxKwPX8WA7XipaPtfiwMPARP51ymfn/go-stream-muxer/yamux"
ps
"gx/ipfs/QmZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8/go-peerstream"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
logging
"gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
mafilter
"gx/ipfs/QmcR6dLYF8Eozaae3wGd5wjq76bofzmmbvQmtwobxvfhEt/multiaddr-filter"
...
...
@@ -32,7 +35,21 @@ var log = logging.Logger("swarm2")
var
PSTransport
pst
.
Transport
func
init
()
{
PSTransport
=
psmss
.
NewTransport
()
msstpt
:=
psmss
.
NewBlankTransport
()
ymxtpt
:=
&
yamux
.
Transport
{
AcceptBacklog
:
2048
,
ConnectionWriteTimeout
:
time
.
Second
*
10
,
KeepAliveInterval
:
time
.
Second
*
30
,
EnableKeepAlive
:
true
,
MaxStreamWindowSize
:
uint32
(
1024
*
256
),
LogOutput
:
ioutil
.
Discard
,
}
msstpt
.
AddTransport
(
"/yamux"
,
ymxtpt
)
msstpt
.
AddTransport
(
"/spdystream"
,
spdy
.
Transport
)
PSTransport
=
msstpt
}
// Swarm is a connection muxer, allowing connections to other peers to
...
...
swarm_conn.go
View file @
780c661f
...
...
@@ -8,7 +8,7 @@ import (
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
ps
"gx/ipfs/Qm
QDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK
/go-peerstream"
ps
"gx/ipfs/Qm
ZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8
/go-peerstream"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
...
...
swarm_listen.go
View file @
780c661f
...
...
@@ -9,7 +9,7 @@ import (
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
transport
"github.com/ipfs/go-libp2p/p2p/net/transport"
ps
"gx/ipfs/Qm
QDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK
/go-peerstream"
ps
"gx/ipfs/Qm
ZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8
/go-peerstream"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma
"gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
)
// Open listeners and reuse-dialers for the given addresses
...
...
swarm_stream.go
View file @
780c661f
...
...
@@ -3,7 +3,7 @@ package swarm
import
(
inet
"github.com/ipfs/go-libp2p/p2p/net"
ps
"gx/ipfs/Qm
QDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK
/go-peerstream"
ps
"gx/ipfs/Qm
ZK81vcgMhpb2t7GNbozk7qzt6Rj4zFqitpvsWT9mduW8
/go-peerstream"
)
// a Stream is a wrapper around a ps.Stream that exposes a way to get
...
...
swarm_test.go
View file @
780c661f
...
...
@@ -24,7 +24,7 @@ func EchoStreamHandler(stream inet.Stream) {
// pull out the ipfs conn
c
:=
stream
.
Conn
()
log
.
Error
f
(
"%s ponging to %s"
,
c
.
LocalPeer
(),
c
.
RemotePeer
())
log
.
Info
f
(
"%s ponging to %s"
,
c
.
LocalPeer
(),
c
.
RemotePeer
())
buf
:=
make
([]
byte
,
4
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment