Skip to content

Commit d5f46f5

Browse files
committed
- dhcp: fix build on macos AdguardTeam#704
1 parent a860c8e commit d5f46f5

File tree

3 files changed

+48
-5
lines changed

3 files changed

+48
-5
lines changed

dhcpd/os_linux.go

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package dhcpd
2+
3+
import (
4+
"net"
5+
"os"
6+
"syscall"
7+
8+
"golang.org/x/net/ipv4"
9+
)
10+
11+
// Create a socket for receiving broadcast packets
12+
func newBroadcastPacketConn(bindAddr net.IP, port int, ifname string) (*ipv4.PacketConn, error) {
13+
s, err := syscall.Socket(syscall.AF_INET, syscall.SOCK_DGRAM, syscall.IPPROTO_UDP)
14+
if err != nil {
15+
return nil, err
16+
}
17+
18+
if err := syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_BROADCAST, 1); err != nil {
19+
return nil, err
20+
}
21+
if err := syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1); err != nil {
22+
return nil, err
23+
}
24+
if err := syscall.SetsockoptString(s, syscall.SOL_SOCKET, syscall.SO_BINDTODEVICE, ifname); err != nil {
25+
return nil, err
26+
}
27+
28+
addr := syscall.SockaddrInet4{Port: port}
29+
copy(addr.Addr[:], bindAddr.To4())
30+
err = syscall.Bind(s, &addr)
31+
if err != nil {
32+
syscall.Close(s)
33+
return nil, err
34+
}
35+
36+
f := os.NewFile(uintptr(s), "")
37+
c, err := net.FilePacketConn(f)
38+
f.Close()
39+
if err != nil {
40+
return nil, err
41+
}
42+
43+
p := ipv4.NewPacketConn(c)
44+
return p, nil
45+
}

dhcpd/os_unix.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
1+
// +build aix darwin dragonfly freebsd netbsd openbsd solaris
22

33
package dhcpd
44

@@ -23,9 +23,6 @@ func newBroadcastPacketConn(bindAddr net.IP, port int, ifname string) (*ipv4.Pac
2323
if err := syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1); err != nil {
2424
return nil, err
2525
}
26-
if err := syscall.SetsockoptString(s, syscall.SOL_SOCKET, syscall.SO_BINDTODEVICE, ifname); err != nil {
27-
return nil, err
28-
}
2926

3027
addr := syscall.SockaddrInet4{Port: port}
3128
copy(addr.Addr[:], bindAddr.To4())

dhcpd/os_windows.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package dhcpd
22

33
import (
4+
"errors"
45
"net"
56

67
"golang.org/x/net/ipv4"
78
)
89

910
// Create a socket for receiving broadcast packets
1011
func newBroadcastPacketConn(bindAddr net.IP, port int, ifname string) (*ipv4.PacketConn, error) {
11-
return nil, nil
12+
return nil, errors.New("newBroadcastPacketConn(): not supported on Windows")
1213
}

0 commit comments

Comments
 (0)