Commit aa0e1e6e authored by Jeromy Johnson's avatar Jeromy Johnson Committed by GitHub

Merge pull request #53 from libp2p/feat/exp-ws-support

add in experimental websocket support
parents b2799f89 ed8b46d4
...@@ -7,6 +7,8 @@ import ( ...@@ -7,6 +7,8 @@ import (
ma "github.com/jbenet/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
manet "github.com/jbenet/go-multiaddr-net" manet "github.com/jbenet/go-multiaddr-net"
context "golang.org/x/net/context" context "golang.org/x/net/context"
_ "github.com/whyrusleeping/ws-transport"
) )
var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/net/swarm/addr") var log = logging.Logger("github.com/libp2p/go-libp2p/p2p/net/swarm/addr")
...@@ -19,6 +21,8 @@ var SupportedTransportStrings = []string{ ...@@ -19,6 +21,8 @@ var SupportedTransportStrings = []string{
"/ip6/tcp", "/ip6/tcp",
"/ip4/udp/utp", "/ip4/udp/utp",
"/ip6/udp/utp", "/ip6/udp/utp",
"/ip4/tcp/ws",
"/ip6/tcp/ws",
// "/ip4/udp/udt", disabled because the lib doesnt work on arm // "/ip4/udp/udt", disabled because the lib doesnt work on arm
// "/ip6/udp/udt", disabled because the lib doesnt work on arm // "/ip6/udp/udt", disabled because the lib doesnt work on arm
} }
......
...@@ -29,6 +29,7 @@ func TestFilterAddrs(t *testing.T) { ...@@ -29,6 +29,7 @@ func TestFilterAddrs(t *testing.T) {
newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234"), newMultiaddr(t, "/ip4/127.0.0.1/tcp/1234"),
newMultiaddr(t, "/ip6/::1/tcp/1234"), newMultiaddr(t, "/ip6/::1/tcp/1234"),
newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/utp"), newMultiaddr(t, "/ip4/1.2.3.4/udp/1234/utp"),
newMultiaddr(t, "/ip4/1.2.3.4/tcp/1234/ws"),
} }
goodAndBad := append(good, bad...) goodAndBad := append(good, bad...)
......
...@@ -29,6 +29,7 @@ import ( ...@@ -29,6 +29,7 @@ import (
spdy "github.com/whyrusleeping/go-smux-spdystream" spdy "github.com/whyrusleeping/go-smux-spdystream"
yamux "github.com/whyrusleeping/go-smux-yamux" yamux "github.com/whyrusleeping/go-smux-yamux"
mafilter "github.com/whyrusleeping/multiaddr-filter" mafilter "github.com/whyrusleeping/multiaddr-filter"
ws "github.com/whyrusleeping/ws-transport"
context "golang.org/x/net/context" context "golang.org/x/net/context"
) )
...@@ -120,6 +121,7 @@ func NewSwarm(ctx context.Context, listenAddrs []ma.Multiaddr, ...@@ -120,6 +121,7 @@ func NewSwarm(ctx context.Context, listenAddrs []ma.Multiaddr,
transports: []transport.Transport{ transports: []transport.Transport{
transport.NewTCPTransport(), transport.NewTCPTransport(),
transport.NewUtpTransport(), transport.NewUtpTransport(),
new(ws.WebsocketTransport),
}, },
bwc: bwc, bwc: bwc,
fdRateLimit: make(chan struct{}, concurrentFdDials), fdRateLimit: make(chan struct{}, concurrentFdDials),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment