Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
go-libp2p
Commits
40a5c58c
Commit
40a5c58c
authored
8 years ago
by
Jeromy Johnson
Committed by
GitHub
8 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #53 from libp2p/feat/exp-ws-support
add in experimental websocket support
parents
f5e4ebfe
b1456b79
master
2018-Q4-OKR
docs-improvements
feat/backoff-listing
feat/p2p-multiaddr
feat/pnet/working3
feat/protobuf
feat/relay-integrate
feat/udp
feat/update/go-reuseport
feature/standardize-readme
fix/473
fix/no-custom-field
fix/reset-ping-stream
fix/revert-correct-external-addr
gx/update-jccl6u
gx/update-nza0mn
jenkinsfile
kevina/fix-go-vet
multistream-ping
punching
revert-276-update-go-detect-race
v6.0.23
v6.0.22
v6.0.21
v6.0.20
v6.0.19
v6.0.18
v6.0.17
v6.0.16
v6.0.15
v6.0.14
v6.0.13
v6.0.12
v6.0.11
v6.0.10
v6.0.9
v6.0.8
v6.0.7
v6.0.6
v6.0.5
v6.0.4
v6.0.3
v6.0.2
v6.0.1
v6.0.0
v5.0.21
v5.0.20
v5.0.19
v5.0.18
v5.0.17
v5.0.16
v5.0.15
v5.0.14
v5.0.13
v5.0.12
v5.0.11
v5.0.10
v5.0.9
v5.0.8
v5.0.7
v5.0.6
v5.0.5
v5.0.4
v5.0.3
v5.0.2
v5.0.1
v5.0.0
v4.5.5
v4.5.4
v4.5.3
v4.5.2
v4.5.1
v4.5.0
v4.4.5
v4.4.4
v4.4.3
v4.4.2
v4.4.1
v4.4.0
v4.3.12
v4.3.11
v4.3.10
v4.3.9
v4.3.8
v4.3.7
v4.3.6
v4.3.5
v4.3.4
v4.3.3
v4.3.2
v4.3.1
v4.3.0
v4.2.0
v4.1.0
v4.0.4
v4.0.3
v4.0.2
v4.0.1
v4.0.0
v3.6.0
v3.5.4
v3.5.3
v3.5.2
v3.5.1
v3.5.0
v3.4.3
v3.4.2
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
p2p/net/swarm/addr/addr.go
+4
-0
p2p/net/swarm/addr/addr.go
p2p/net/swarm/addr/addr_test.go
+1
-0
p2p/net/swarm/addr/addr_test.go
p2p/net/swarm/swarm.go
+2
-0
p2p/net/swarm/swarm.go
package.json
+6
-0
package.json
with
13 additions
and
0 deletions
+13
-0
p2p/net/swarm/addr/addr.go
View file @
40a5c58c
...
...
@@ -7,6 +7,8 @@ import (
ma
"github.com/jbenet/go-multiaddr"
manet
"github.com/jbenet/go-multiaddr-net"
context
"golang.org/x/net/context"
_
"github.com/whyrusleeping/ws-transport"
)
var
log
=
logging
.
Logger
(
"github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
)
...
...
@@ -19,6 +21,8 @@ var SupportedTransportStrings = []string{
"/ip6/tcp"
,
"/ip4/udp/utp"
,
"/ip6/udp/utp"
,
"/ip4/tcp/ws"
,
"/ip6/tcp/ws"
,
// "/ip4/udp/udt", disabled because the lib doesnt work on arm
// "/ip6/udp/udt", disabled because the lib doesnt work on arm
}
...
...
This diff is collapsed.
Click to expand it.
p2p/net/swarm/addr/addr_test.go
View file @
40a5c58c
...
...
@@ -29,6 +29,7 @@ func TestFilterAddrs(t *testing.T) {
newMultiaddr
(
t
,
"/ip4/127.0.0.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/tcp/1234/ws"
),
}
goodAndBad
:=
append
(
good
,
bad
...
)
...
...
This diff is collapsed.
Click to expand it.
p2p/net/swarm/swarm.go
View file @
40a5c58c
...
...
@@ -29,6 +29,7 @@ import (
spdy
"github.com/whyrusleeping/go-smux-spdystream"
yamux
"github.com/whyrusleeping/go-smux-yamux"
mafilter
"github.com/whyrusleeping/multiaddr-filter"
ws
"github.com/whyrusleeping/ws-transport"
context
"golang.org/x/net/context"
)
...
...
@@ -120,6 +121,7 @@ func NewSwarm(ctx context.Context, listenAddrs []ma.Multiaddr,
transports
:
[]
transport
.
Transport
{
transport
.
NewTCPTransport
(),
transport
.
NewUtpTransport
(),
new
(
ws
.
WebsocketTransport
),
},
bwc
:
bwc
,
fdRateLimit
:
make
(
chan
struct
{},
concurrentFdDials
),
...
...
This diff is collapsed.
Click to expand it.
package.json
View file @
40a5c58c
...
...
@@ -186,6 +186,12 @@
"hash"
:
"QmSZi9ygLohBUGyHMqE5N6eToPwqcg7bZQTULeVLFu7Q6d"
,
"name"
:
"go-libp2p-peerstore"
,
"version"
:
"1.2.2"
},
{
"author"
:
"whyrusleeping"
,
"hash"
:
"QmU6T64asAHorS9vUT2LQtCt6mxNpynxL3LXWBtc3tqiB4"
,
"name"
:
"ws-transport"
,
"version"
:
"1.0.5"
}
],
"gxVersion"
:
"0.4.0"
,
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help