logos-messaging/go-multiaddr
1
0
Fork 0
mirror of https://github.com/logos-messaging/go-multiaddr.git synced 2026-01-07 07:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from backkem/p2p-webrtc-direct

Browse Source 
Add p2p-webrtc-direct protocol
This commit is contained in:
Steven Allen 2018-12-27 14:37:46 -08:00 committed by GitHub
commit 152990b98b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multiaddr_test.go
View File

@ -68,6 +68,7 @@ func TestConstructFails(t *testing.T) {
"/ip4/127.0.0.1/p2p/tcp", "/ip4/127.0.0.1/p2p/tcp",
"/unix", "/unix",
"/ip4/1.2.3.4/tcp/80/unix", "/ip4/1.2.3.4/tcp/80/unix",
"/ip4/127.0.0.1/tcp/9090/http/p2p-webcrt-direct",
} }
for _, a := range cases { for _, a := range cases {
@ -127,6 +128,7 @@ func TestConstructSucceeds(t *testing.T) {
"/ip4/1.2.3.4/tcp/80/unix/a/b/c/d/e/f", "/ip4/1.2.3.4/tcp/80/unix/a/b/c/d/e/f",
"/ip4/127.0.0.1/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC/tcp/1234/unix/stdio", "/ip4/127.0.0.1/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC/tcp/1234/unix/stdio",
"/ip4/127.0.0.1/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC/tcp/1234/unix/stdio", "/ip4/127.0.0.1/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC/tcp/1234/unix/stdio",
"/ip4/127.0.0.1/tcp/9090/http/p2p-webrtc-direct",
} }
for _, a := range cases { for _, a := range cases {

43
protocols.go
View File

@ -6,24 +6,25 @@ package multiaddr
// TODO: Use a single source of truth for all multicodecs instead of // TODO: Use a single source of truth for all multicodecs instead of
// distributing them like this... // distributing them like this...
const ( const (
P_IP4 = 0x0004 P_IP4 = 0x0004
P_TCP = 0x0006 P_TCP = 0x0006
P_UDP = 0x0111 P_UDP = 0x0111
P_DCCP = 0x0021 P_DCCP = 0x0021
P_IP6 = 0x0029 P_IP6 = 0x0029
P_IP6ZONE = 0x002A P_IP6ZONE = 0x002A
P_QUIC = 0x01CC P_QUIC = 0x01CC
P_SCTP = 0x0084 P_SCTP = 0x0084
P_UDT = 0x012D P_UDT = 0x012D
P_UTP = 0x012E P_UTP = 0x012E
P_UNIX = 0x0190 P_UNIX = 0x0190
P_P2P = 0x01A5 P_P2P = 0x01A5
P_IPFS = 0x01A5 // alias for backwards compatability P_IPFS = 0x01A5 // alias for backwards compatability
P_HTTP = 0x01E0 P_HTTP = 0x01E0
P_HTTPS = 0x01BB P_HTTPS = 0x01BB
P_ONION = 0x01BC // also for backwards compatibility P_ONION = 0x01BC // also for backwards compatibility
P_ONION3 = 0x01BD P_ONION3 = 0x01BD
P_GARLIC64 = 0x01CA P_GARLIC64 = 0x01CA
P_P2P_WEBRTC_DIRECT = 0x0114
) )
var ( var (
@ -143,6 +144,11 @@ var (
Path: true, Path: true,
Transcoder: TranscoderUnix, Transcoder: TranscoderUnix,
} }
protoP2P_WEBRTC_DIRECT = Protocol{
Name: "p2p-webrtc-direct",
Code: P_P2P_WEBRTC_DIRECT,
VCode: CodeToVarint(P_P2P_WEBRTC_DIRECT),
}
) )
func init() { func init() {
@ -164,6 +170,7 @@ func init() {
protoHTTPS, protoHTTPS,
protoP2P, protoP2P,
protoUNIX, protoUNIX,
protoP2P_WEBRTC_DIRECT,
} { } {
if err := AddProtocol(p); err != nil { if err := AddProtocol(p); err != nil {
panic(err) panic(err)

2
transcoders.go
View File

@ -231,7 +231,7 @@ func garlic64StB(s string) ([]byte, error) {
} }
func garlic64BtS(b []byte) (string, error) { func garlic64BtS(b []byte) (string, error) {
if len(b) < 386 { if len(b) < 386 {
return "", fmt.Errorf("failed to validate garlic addr: %s not an i2p base64 address. len: %d\n", b, len(b)) return "", fmt.Errorf("failed to validate garlic addr: %s not an i2p base64 address. len: %d\n", b, len(b))
} }
addr := garlicBase64Encoding.EncodeToString(b) addr := garlicBase64Encoding.EncodeToString(b)