From bfbb1715afbeb1e50ce72970d31f71564ae94c6f Mon Sep 17 00:00:00 2001
From: Tom Thorogood <me+github@tomthorogood.co.uk>
Date: Sun, 9 Sep 2018 02:03:21 +0930
Subject: [PATCH] Use ReadMsgUDP and WriteMsgUDP on windows (#738)

---
 udp.go         |  2 --
 udp_test.go    |  2 --
 udp_windows.go | 37 -------------------------------------
 3 files changed, 41 deletions(-)
 delete mode 100644 udp_windows.go

diff --git a/udp.go b/udp.go
index a4826ee2..82ead693 100644
--- a/udp.go
+++ b/udp.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 package dns
 
 import (
diff --git a/udp_test.go b/udp_test.go
index f27d79df..22480261 100644
--- a/udp_test.go
+++ b/udp_test.go
@@ -1,5 +1,3 @@
-// +build linux,!appengine
-
 package dns
 
 import (
diff --git a/udp_windows.go b/udp_windows.go
deleted file mode 100644
index 6778c3c6..00000000
--- a/udp_windows.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build windows
-
-package dns
-
-import "net"
-
-// SessionUDP holds the remote address
-type SessionUDP struct {
-	raddr *net.UDPAddr
-}
-
-// RemoteAddr returns the remote network address.
-func (s *SessionUDP) RemoteAddr() net.Addr { return s.raddr }
-
-// ReadFromSessionUDP acts just like net.UDPConn.ReadFrom(), but returns a session object instead of a
-// net.UDPAddr.
-// TODO(fastest963): Once go1.10 is released, use ReadMsgUDP.
-func ReadFromSessionUDP(conn *net.UDPConn, b []byte) (int, *SessionUDP, error) {
-	n, raddr, err := conn.ReadFrom(b)
-	if err != nil {
-		return n, nil, err
-	}
-	session := &SessionUDP{raddr.(*net.UDPAddr)}
-	return n, session, err
-}
-
-// WriteToSessionUDP acts just like net.UDPConn.WriteTo(), but uses a *SessionUDP instead of a net.Addr.
-// TODO(fastest963): Once go1.10 is released, use WriteMsgUDP.
-func WriteToSessionUDP(conn *net.UDPConn, b []byte, session *SessionUDP) (int, error) {
-	n, err := conn.WriteTo(b, session.raddr)
-	return n, err
-}
-
-// TODO(fastest963): Once go1.10 is released and we can use *MsgUDP methods
-// use the standard method in udp.go for these.
-func setUDPSocketOptions(*net.UDPConn) error { return nil }
-func parseDstFromOOB([]byte, net.IP) net.IP  { return nil }