Skip to content

Commit bfb27d4

Browse files
Merge pull request #22 from libp2p/remove-sockaddr-dependency
move some functions from go-sockaddr here, remove go-sockaddr dependency
2 parents 07320f3 + a626e45 commit bfb27d4

File tree

4 files changed

+135
-10
lines changed

4 files changed

+135
-10
lines changed

Diff for: go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.16
44

55
require (
66
github.com/google/gopacket v1.1.19
7-
github.com/libp2p/go-sockaddr v0.1.1
87
golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6
98
golang.org/x/sys v0.0.0-20210426080607-c94f62235c83
109
)

Diff for: go.sum

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
22
github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
3-
github.com/libp2p/go-sockaddr v0.1.1 h1:yD80l2ZOdGksnOyHrhxDdTDFrf7Oy+v3FMVArIRgZxQ=
4-
github.com/libp2p/go-sockaddr v0.1.1/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
53
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
64
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
75
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
@@ -12,7 +10,6 @@ golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6 h1:0PC75Fz/kyMGhL0e1QnypqK2k
1210
golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
1311
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1412
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
15-
golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
1613
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1714
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1815
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

Diff for: netroute_windows.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import (
1515
"unsafe"
1616

1717
"github.com/google/gopacket/routing"
18-
sockaddrconv "github.com/libp2p/go-sockaddr"
19-
sockaddrnet "github.com/libp2p/go-sockaddr/net"
2018
"golang.org/x/sys/windows"
2119
)
2220

@@ -54,8 +52,8 @@ type mib_row2 struct {
5452
}
5553

5654
func callBestRoute(source, dest net.IP) (*mib_row2, net.IP, error) {
57-
sourceAddr, _, _ := sockaddrconv.SockaddrToAny(sockaddrnet.IPAndZoneToSockaddr(source, ""))
58-
destAddr, _, _ := sockaddrconv.SockaddrToAny(sockaddrnet.IPAndZoneToSockaddr(dest, ""))
55+
sourceAddr, _, _ := sockaddrToAny(ipAndZoneToSockaddr(source, ""))
56+
destAddr, _, _ := sockaddrToAny(ipAndZoneToSockaddr(dest, ""))
5957
bestRoute := make([]byte, 512)
6058
bestSource := make([]byte, 116)
6159

@@ -81,7 +79,7 @@ func callBestRoute(source, dest net.IP) (*mib_row2, net.IP, error) {
8179
copyInto(bestSourceRaw.Addr.Data[:], bestSource[2:16])
8280
copyInto(bestSourceRaw.Pad[:], bestSource[16:])
8381
addr, _ := bestSourceRaw.Sockaddr()
84-
bestSrc, _ := sockaddrnet.SockaddrToIPAndZone(addr)
82+
bestSrc, _ := sockaddrToIPAndZone(addr)
8583

8684
return route, bestSrc, nil
8785
}
@@ -228,7 +226,7 @@ func (r *winRouter) RouteWithSrc(input net.HardwareAddr, src, dst net.IP) (iface
228226
if err != nil {
229227
return nil, nil, nil, err
230228
}
231-
nextHop, _ := sockaddrnet.SockaddrToIPAndZone(addr)
229+
nextHop, _ := sockaddrToIPAndZone(addr)
232230

233231
return iface, nextHop, pref, nil
234232
}

Diff for: sockaddr_windows.go

+131
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
//go:build windows
2+
// +build windows
3+
4+
package netroute
5+
6+
import (
7+
"net"
8+
"strconv"
9+
"syscall"
10+
"unsafe"
11+
12+
"golang.org/x/sys/windows"
13+
)
14+
15+
// socklen is a type for the length of a sockaddr.
16+
type socklen uint
17+
18+
// ipAndZoneToSockaddr converts a net.IP (with optional IPv6 Zone) to a Sockaddr
19+
// Returns nil if conversion fails.
20+
func ipAndZoneToSockaddr(ip net.IP, zone string) windows.Sockaddr {
21+
// Unspecified?
22+
if ip == nil {
23+
if zone != "" {
24+
return &windows.SockaddrInet6{ZoneId: uint32(ip6ZoneToInt(zone))}
25+
}
26+
return new(windows.SockaddrInet4)
27+
}
28+
29+
// Valid IPv4?
30+
if ip4 := ip.To4(); ip4 != nil && zone == "" {
31+
var buf [4]byte
32+
copy(buf[:], ip4) // last 4 bytes
33+
return &windows.SockaddrInet4{Addr: buf}
34+
}
35+
36+
// Valid IPv6 address?
37+
if ip6 := ip.To16(); ip6 != nil {
38+
var buf [16]byte
39+
copy(buf[:], ip6)
40+
return &windows.SockaddrInet6{Addr: buf, ZoneId: uint32(ip6ZoneToInt(zone))}
41+
}
42+
43+
return nil
44+
}
45+
46+
// sockaddrToIPAndZone converts a Sockaddr to a net.IP (with optional IPv6 Zone)
47+
// Returns nil if conversion fails.
48+
func sockaddrToIPAndZone(sa windows.Sockaddr) (net.IP, string) {
49+
switch sa := sa.(type) {
50+
case *windows.SockaddrInet4:
51+
ip := make([]byte, 16)
52+
// V4InV6Prefix
53+
ip[10] = 0xff
54+
ip[11] = 0xff
55+
copy(ip[12:16], sa.Addr[:])
56+
return ip, ""
57+
case *windows.SockaddrInet6:
58+
ip := make([]byte, 16)
59+
copy(ip, sa.Addr[:])
60+
return ip, ip6ZoneToString(int(sa.ZoneId))
61+
}
62+
return nil, ""
63+
}
64+
65+
func sockaddrToAny(sa windows.Sockaddr) (*windows.RawSockaddrAny, socklen, error) {
66+
if sa == nil {
67+
return nil, 0, syscall.EINVAL
68+
}
69+
70+
switch sa := sa.(type) {
71+
case *windows.SockaddrInet4:
72+
if sa.Port < 0 || sa.Port > 0xFFFF {
73+
return nil, 0, syscall.EINVAL
74+
}
75+
raw := new(windows.RawSockaddrAny)
76+
raw.Addr.Family = windows.AF_INET
77+
raw4 := (*windows.RawSockaddrInet4)(unsafe.Pointer(raw))
78+
p := (*[2]byte)(unsafe.Pointer(&raw4.Port))
79+
p[0] = byte(sa.Port >> 8)
80+
p[1] = byte(sa.Port)
81+
for i := 0; i < len(sa.Addr); i++ {
82+
raw4.Addr[i] = sa.Addr[i]
83+
}
84+
return raw, socklen(unsafe.Sizeof(*raw4)), nil
85+
case *windows.SockaddrInet6:
86+
if sa.Port < 0 || sa.Port > 0xFFFF {
87+
return nil, 0, syscall.EINVAL
88+
}
89+
raw := new(windows.RawSockaddrAny)
90+
raw.Addr.Family = windows.AF_INET6
91+
raw6 := (*windows.RawSockaddrInet6)(unsafe.Pointer(raw))
92+
p := (*[2]byte)(unsafe.Pointer(&raw6.Port))
93+
p[0] = byte(sa.Port >> 8)
94+
p[1] = byte(sa.Port)
95+
raw6.Scope_id = sa.ZoneId
96+
for i := 0; i < len(sa.Addr); i++ {
97+
raw6.Addr[i] = sa.Addr[i]
98+
}
99+
return raw, socklen(unsafe.Sizeof(*raw6)), nil
100+
case *windows.SockaddrUnix:
101+
return nil, 0, syscall.EWINDOWS
102+
}
103+
return nil, 0, syscall.EAFNOSUPPORT
104+
}
105+
106+
// from: go/src/pkg/net/ipsock.go
107+
108+
// ip6ZoneToString converts an IP6 Zone unix int to a net string
109+
// returns "" if zone is 0
110+
func ip6ZoneToString(zone int) string {
111+
if zone == 0 {
112+
return ""
113+
}
114+
if ifi, err := net.InterfaceByIndex(zone); err == nil {
115+
return ifi.Name
116+
}
117+
return strconv.Itoa(zone)
118+
}
119+
120+
// ip6ZoneToInt converts an IP6 Zone net string to a unix int
121+
// returns 0 if zone is ""
122+
func ip6ZoneToInt(zone string) int {
123+
if zone == "" {
124+
return 0
125+
}
126+
if ifi, err := net.InterfaceByName(zone); err == nil {
127+
return ifi.Index
128+
}
129+
n, _ := strconv.ParseInt(zone, 10, 32)
130+
return int(n)
131+
}

0 commit comments

Comments
 (0)