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

moved net stuff into subpkg

Browse Source
This commit is contained in:
Juan Batiz-Benet 2014-10-10 23:56:35 -07:00
parent 2a572df05c
commit 01c7b7934d
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net.go → net/convert.go
View File

@ -1,15 +1,17 @@
package multiaddr package net
import ( import (
"fmt" "fmt"
"net" "net"
"strings" "strings"
ma "github.com/jbenet/go-multiaddr"
) )
var errIncorrectNetAddr = fmt.Errorf("incorrect network addr conversion") var errIncorrectNetAddr = fmt.Errorf("incorrect network addr conversion")
// FromNetAddr converts a net.Addr type to a Multiaddr. // FromNetAddr converts a net.Addr type to a Multiaddr.
func FromNetAddr(a net.Addr) (Multiaddr, error) { func FromNetAddr(a net.Addr) (ma.Multiaddr, error) {
switch a.Network() { switch a.Network() {
case "tcp", "tcp4", "tcp6": case "tcp", "tcp4", "tcp6":
ac, ok := a.(*net.TCPAddr) ac, ok := a.(*net.TCPAddr)
@ -24,7 +26,7 @@ func FromNetAddr(a net.Addr) (Multiaddr, error) {
} }
// Get TCP Addr // Get TCP Addr
tcpm, err := NewMultiaddr(fmt.Sprintf("/tcp/%d", ac.Port)) tcpm, err := ma.NewMultiaddr(fmt.Sprintf("/tcp/%d", ac.Port))
if err != nil { if err != nil {
return nil, errIncorrectNetAddr return nil, errIncorrectNetAddr
} }
@ -45,7 +47,7 @@ func FromNetAddr(a net.Addr) (Multiaddr, error) {
} }
// Get UDP Addr // Get UDP Addr
udpm, err := NewMultiaddr(fmt.Sprintf("/udp/%d", ac.Port)) udpm, err := ma.NewMultiaddr(fmt.Sprintf("/udp/%d", ac.Port))
if err != nil { if err != nil {
return nil, errIncorrectNetAddr return nil, errIncorrectNetAddr
} }
@ -68,8 +70,8 @@ func FromNetAddr(a net.Addr) (Multiaddr, error) {
// ToNetAddr converts a Multiaddr to a net.Addr // ToNetAddr converts a Multiaddr to a net.Addr
// Must be ThinWaist. acceptable protocol stacks are: // Must be ThinWaist. acceptable protocol stacks are:
// /ip{4,6}/{tcp, udp} // /ip{4,6}/{tcp, udp}
func ToNetAddr(ma Multiaddr) (net.Addr, error) { func ToNetAddr(maddr ma.Multiaddr) (net.Addr, error) {
network, host, err := DialArgs(ma) network, host, err := DialArgs(maddr)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -87,19 +89,19 @@ func ToNetAddr(ma Multiaddr) (net.Addr, error) {
} }
// FromIP converts a net.IP type to a Multiaddr. // FromIP converts a net.IP type to a Multiaddr.
func FromIP(ip net.IP) (Multiaddr, error) { func FromIP(ip net.IP) (ma.Multiaddr, error) {
switch { switch {
case ip.To4() != nil: case ip.To4() != nil:
return NewMultiaddr("/ip4/" + ip.String()) return ma.NewMultiaddr("/ip4/" + ip.String())
case ip.To16() != nil: case ip.To16() != nil:
return NewMultiaddr("/ip6/" + ip.String()) return ma.NewMultiaddr("/ip6/" + ip.String())
default: default:
return nil, errIncorrectNetAddr return nil, errIncorrectNetAddr
} }
} }
// DialArgs is a convenience function returning arguments for use in net.Dial // DialArgs is a convenience function returning arguments for use in net.Dial
func DialArgs(m Multiaddr) (string, string, error) { func DialArgs(m ma.Multiaddr) (string, string, error) {
if !IsThinWaist(m) { if !IsThinWaist(m) {
return "", "", fmt.Errorf("%s is not a 'thin waist' address", m) return "", "", fmt.Errorf("%s is not a 'thin waist' address", m)
} }
@ -124,7 +126,7 @@ func DialArgs(m Multiaddr) (string, string, error) {
// IsThinWaist returns whether a Multiaddr starts with "Thin Waist" Protocols. // IsThinWaist returns whether a Multiaddr starts with "Thin Waist" Protocols.
// This means: /{IP4, IP6}[/{TCP, UDP}] // This means: /{IP4, IP6}[/{TCP, UDP}]
func IsThinWaist(m Multiaddr) bool { func IsThinWaist(m ma.Multiaddr) bool {
p := m.Protocols() p := m.Protocols()
// nothing? not even a waist. // nothing? not even a waist.
@ -132,7 +134,7 @@ func IsThinWaist(m Multiaddr) bool {
return false return false
} }
if p[0].Code != P_IP4 && p[0].Code != P_IP6 { if p[0].Code != ma.P_IP4 && p[0].Code != ma.P_IP6 {
return false return false
} }
@ -142,7 +144,7 @@ func IsThinWaist(m Multiaddr) bool {
} }
switch p[1].Code { switch p[1].Code {
case P_TCP, P_UDP, P_IP4, P_IP6: case ma.P_TCP, ma.P_UDP, ma.P_IP4, ma.P_IP6:
return true return true
default: default:
return false return false

22
net_test.go → net/convert_test.go
View File

@ -1,11 +1,13 @@
package multiaddr package net
import ( import (
"net" "net"
"testing" "testing"
ma "github.com/jbenet/go-multiaddr"
) )
type GenFunc func() (Multiaddr, error) type GenFunc func() (ma.Multiaddr, error)
func testConvert(t *testing.T, s string, gen GenFunc) { func testConvert(t *testing.T, s string, gen GenFunc) {
m, err := gen() m, err := gen()
@ -19,7 +21,7 @@ func testConvert(t *testing.T, s string, gen GenFunc) {
} }
func testToNetAddr(t *testing.T, maddr, ntwk, addr string) { func testToNetAddr(t *testing.T, maddr, ntwk, addr string) {
m, err := NewMultiaddr(maddr) m, err := ma.NewMultiaddr(maddr)
if err != nil { if err != nil {
t.Fatal("failed to generate.") t.Fatal("failed to generate.")
} }
@ -57,19 +59,19 @@ func testToNetAddr(t *testing.T, maddr, ntwk, addr string) {
} }
func TestFromIP4(t *testing.T) { func TestFromIP4(t *testing.T) {
testConvert(t, "/ip4/10.20.30.40", func() (Multiaddr, error) { testConvert(t, "/ip4/10.20.30.40", func() (ma.Multiaddr, error) {
return FromIP(net.ParseIP("10.20.30.40")) return FromIP(net.ParseIP("10.20.30.40"))
}) })
} }
func TestFromIP6(t *testing.T) { func TestFromIP6(t *testing.T) {
testConvert(t, "/ip6/2001:4860:0:2001::68", func() (Multiaddr, error) { testConvert(t, "/ip6/2001:4860:0:2001::68", func() (ma.Multiaddr, error) {
return FromIP(net.ParseIP("2001:4860:0:2001::68")) return FromIP(net.ParseIP("2001:4860:0:2001::68"))
}) })
} }
func TestFromTCP(t *testing.T) { func TestFromTCP(t *testing.T) {
testConvert(t, "/ip4/10.20.30.40/tcp/1234", func() (Multiaddr, error) { testConvert(t, "/ip4/10.20.30.40/tcp/1234", func() (ma.Multiaddr, error) {
return FromNetAddr(&net.TCPAddr{ return FromNetAddr(&net.TCPAddr{
IP: net.ParseIP("10.20.30.40"), IP: net.ParseIP("10.20.30.40"),
Port: 1234, Port: 1234,
@ -78,7 +80,7 @@ func TestFromTCP(t *testing.T) {
} }
func TestFromUDP(t *testing.T) { func TestFromUDP(t *testing.T) {
testConvert(t, "/ip4/10.20.30.40/udp/1234", func() (Multiaddr, error) { testConvert(t, "/ip4/10.20.30.40/udp/1234", func() (ma.Multiaddr, error) {
return FromNetAddr(&net.UDPAddr{ return FromNetAddr(&net.UDPAddr{
IP: net.ParseIP("10.20.30.40"), IP: net.ParseIP("10.20.30.40"),
Port: 1234, Port: 1234,
@ -103,19 +105,19 @@ func TestThinWaist(t *testing.T) {
} }
for a, res := range addrs { for a, res := range addrs {
ma, err := NewMultiaddr(a) m, err := ma.NewMultiaddr(a)
if err != nil { if err != nil {
t.Fatalf("failed to construct Multiaddr: %s", a) t.Fatalf("failed to construct Multiaddr: %s", a)
} }
if IsThinWaist(ma) != res { if IsThinWaist(m) != res {
t.Fatalf("IsThinWaist(%s) != %v", a, res) t.Fatalf("IsThinWaist(%s) != %v", a, res)
} }
} }
} }
func TestDialArgs(t *testing.T) { func TestDialArgs(t *testing.T) {
m, err := NewMultiaddr("/ip4/127.0.0.1/udp/1234") m, err := ma.NewMultiaddr("/ip4/127.0.0.1/udp/1234")
if err != nil { if err != nil {
t.Fatal("failed to construct", "/ip4/127.0.0.1/udp/1234") t.Fatal("failed to construct", "/ip4/127.0.0.1/udp/1234")
} }