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

use constants, fix ipv6 bug

Browse Source
This commit is contained in:
Juan Batiz-Benet 2014-09-13 04:47:37 -07:00
parent b90678896b
commit a4b7753f74
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
codec.go
View File

@ -66,12 +66,14 @@ func bytesToString(b []byte) (ret string, err error) {
func addressStringToBytes(p *Protocol, s string) []byte { func addressStringToBytes(p *Protocol, s string) []byte {
switch p.Code { switch p.Code {
// ipv4,6 case P_IP4: // ipv4
case 4, 41:
return net.ParseIP(s).To4() return net.ParseIP(s).To4()
case P_IP6: // ipv6
return net.ParseIP(s).To16()
// tcp udp dccp sctp // tcp udp dccp sctp
case 6, 17, 33, 132: case P_TCP, P_UDP, P_DCCP, P_SCTP:
b := make([]byte, 2) b := make([]byte, 2)
i, err := strconv.Atoi(s) i, err := strconv.Atoi(s)
if err == nil { if err == nil {
@ -87,11 +89,11 @@ func addressBytesToString(p *Protocol, b []byte) string {
switch p.Code { switch p.Code {
// ipv4,6 // ipv4,6
case 4, 41: case P_IP4, P_IP6:
return net.IP(b).String() return net.IP(b).String()
// tcp udp dccp sctp // tcp udp dccp sctp
case 6, 17, 33, 132: case P_TCP, P_UDP, P_DCCP, P_SCTP:
i := binary.BigEndian.Uint16(b) i := binary.BigEndian.Uint16(b)
return strconv.Itoa(int(i)) return strconv.Itoa(int(i))
} }