Merge branch 'master' into macos

insomniacslk · Aug 9, 2021 · d7b9d8b · d7b9d8b
2 parents c89f321 + 1cac67f
commit d7b9d8b
Show file tree

Hide file tree

Showing 54 changed files with 91 additions and 66 deletions.
diff --git a/dhcpv4/bsdp/boot_image.go b/dhcpv4/bsdp/boot_image.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/insomniacslk/dhcp/dhcpv4"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // BootImageType represents the different BSDP boot image types.

diff --git a/dhcpv4/bsdp/boot_image_test.go b/dhcpv4/bsdp/boot_image_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 func TestBootImageIDToBytes(t *testing.T) {

diff --git a/dhcpv4/bsdp/bsdp_option_boot_image_list.go b/dhcpv4/bsdp/bsdp_option_boot_image_list.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/insomniacslk/dhcp/dhcpv4"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // BootImageList contains a list of boot images presented by a netboot server.

diff --git a/dhcpv4/bsdp/bsdp_option_message_type.go b/dhcpv4/bsdp/bsdp_option_message_type.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/insomniacslk/dhcp/dhcpv4"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // MessageType represents the different BSDP message types.

diff --git a/dhcpv4/bsdp/bsdp_option_misc.go b/dhcpv4/bsdp/bsdp_option_misc.go
@@ -5,7 +5,7 @@ import (
 	"net"
 
 	"github.com/insomniacslk/dhcp/dhcpv4"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptReplyPort returns a new BSDP reply port option.

diff --git a/dhcpv4/dhcpv4.go b/dhcpv4/dhcpv4.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/insomniacslk/dhcp/iana"
 	"github.com/insomniacslk/dhcp/rfc1035label"
-	"github.com/u-root/u-root/pkg/rand"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/rand"
+	"github.com/u-root/uio/uio"
 )
 
 const (

diff --git a/dhcpv4/dhcpv4_test.go b/dhcpv4/dhcpv4_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/insomniacslk/dhcp/iana"
 	"github.com/stretchr/testify/require"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 func TestGetExternalIPv4Addrs(t *testing.T) {

diff --git a/dhcpv4/nclient4/conn_linux.go b/dhcpv4/nclient4/conn_linux.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/mdlayher/ethernet"
 	"github.com/mdlayher/raw"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 var (

diff --git a/dhcpv4/nclient4/ipv4.go b/dhcpv4/nclient4/ipv4.go
@@ -22,7 +22,7 @@ import (
 	"encoding/binary"
 	"net"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 const (

diff --git a/dhcpv4/option_ip.go b/dhcpv4/option_ip.go
@@ -3,7 +3,7 @@ package dhcpv4
 import (
 	"net"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // IP implements DHCPv4 IP option marshaling and unmarshaling as described by

diff --git a/dhcpv4/option_ip_address_lease_time.go b/dhcpv4/option_ip_address_lease_time.go
@@ -4,7 +4,7 @@ import (
 	"math"
 	"time"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // MaxLeaseTime is the maximum lease time that can be encoded.

diff --git a/dhcpv4/option_ips.go b/dhcpv4/option_ips.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // IPs are IPv4 addresses from a DHCP packet as used and specified by options

diff --git a/dhcpv4/option_maximum_dhcp_message_size.go b/dhcpv4/option_maximum_dhcp_message_size.go
@@ -3,7 +3,7 @@ package dhcpv4
 import (
 	"fmt"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // Uint16 implements encoding and decoding functions for a uint16 as used in

diff --git a/dhcpv4/option_parameter_request_list.go b/dhcpv4/option_parameter_request_list.go
@@ -4,7 +4,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptionCodeList is a list of DHCP option codes.

diff --git a/dhcpv4/option_routes.go b/dhcpv4/option_routes.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // Route is a classless static route as per RFC 3442.

diff --git a/dhcpv4/option_strings.go b/dhcpv4/option_strings.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // Strings represents an option encapsulating a list of strings in IPv4 DHCP as

diff --git a/dhcpv4/option_subnet_mask.go b/dhcpv4/option_subnet_mask.go
@@ -3,7 +3,7 @@ package dhcpv4
 import (
 	"net"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // IPMask represents an option encapsulating the subnet mask.

diff --git a/dhcpv4/option_vivc.go b/dhcpv4/option_vivc.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // VIVCIdentifier implements the vendor-identifying vendor class option

diff --git a/dhcpv4/options.go b/dhcpv4/options.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/insomniacslk/dhcp/iana"
 	"github.com/insomniacslk/dhcp/rfc1035label"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 var (

diff --git a/dhcpv4/options_test.go b/dhcpv4/options_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 func TestParseOption(t *testing.T) {

diff --git a/dhcpv4/server4/conn.go → dhcpv4/server4/conn_unix.go b/dhcpv4/server4/conn.go → dhcpv4/server4/conn_unix.go
@@ -1,3 +1,5 @@
+// +build !windows
+
 package server4
 
 import (

diff --git a/dhcpv4/server4/conn_windows.go b/dhcpv4/server4/conn_windows.go
@@ -0,0 +1,11 @@
+package server4
+
+import (
+	"errors"
+	"net"
+)
+
+// NewIPv4UDPConn fails on Windows. Use WithConn() to pass the connection.
+func NewIPv4UDPConn(iface string, addr *net.UDPAddr) (*net.UDPConn, error) {
+	return nil, errors.New("not implemented on Windows")
+}
diff --git a/dhcpv4/types.go b/dhcpv4/types.go
@@ -3,7 +3,7 @@ package dhcpv4
 import (
 	"fmt"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // values from http://www.networksorcery.com/enp/protocol/dhcp.htm and

diff --git a/dhcpv6/dhcpv6.go b/dhcpv6/dhcpv6.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/insomniacslk/dhcp/iana"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 type DHCPv6 interface {

diff --git a/dhcpv6/dhcpv6_test.go b/dhcpv6/dhcpv6_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/insomniacslk/dhcp/iana"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"github.com/u-root/u-root/pkg/rand"
+	"github.com/u-root/uio/rand"
 )
 
 func randomReadMock(value []byte, n int, err error) func([]byte) (int, error) {

diff --git a/dhcpv6/dhcpv6message.go b/dhcpv6/dhcpv6message.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/insomniacslk/dhcp/iana"
 	"github.com/insomniacslk/dhcp/rfc1035label"
-	"github.com/u-root/u-root/pkg/rand"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/rand"
+	"github.com/u-root/uio/uio"
 )
 
 const MessageHeaderSize = 4

diff --git a/dhcpv6/dhcpv6relay.go b/dhcpv6/dhcpv6relay.go
@@ -6,7 +6,7 @@ import (
 	"net"
 
 	"github.com/insomniacslk/dhcp/iana"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 const RelayHeaderSize = 34

diff --git a/dhcpv6/option_4rd.go b/dhcpv6/option_4rd.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // Opt4RD represents a 4RD option. It is only a container for 4RD_*_RULE options

diff --git a/dhcpv6/option_bootfileparam.go b/dhcpv6/option_bootfileparam.go
@@ -3,7 +3,7 @@ package dhcpv6
 import (
 	"fmt"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptBootFileParam returns a BootfileParam option as defined in RFC 5970

diff --git a/dhcpv6/option_clientlinklayeraddress.go b/dhcpv6/option_clientlinklayeraddress.go
@@ -5,7 +5,7 @@ import (
 	"net"
 
 	"github.com/insomniacslk/dhcp/iana"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptClientLinkLayerAddress implements OptionClientLinkLayerAddr option.

diff --git a/dhcpv6/option_dhcpv4_o_dhcpv6_server.go b/dhcpv6/option_dhcpv4_o_dhcpv6_server.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptDHCP4oDHCP6Server represents a OptionDHCP4oDHCP6Server option

diff --git a/dhcpv6/option_dns.go b/dhcpv6/option_dns.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptDNS returns a DNS Recursive Name Server option as defined by RFC 3646.

diff --git a/dhcpv6/option_elapsedtime.go b/dhcpv6/option_elapsedtime.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptElapsedTime returns an Elapsed Time option as defined by RFC 3315 Section

diff --git a/dhcpv6/option_fqdn.go b/dhcpv6/option_fqdn.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/insomniacslk/dhcp/rfc1035label"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptFQDN implements OptionFQDN option.

diff --git a/dhcpv6/option_iaaddress.go b/dhcpv6/option_iaaddress.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // AddressOptions are options valid for the IAAddress option field.

diff --git a/dhcpv6/option_iapd.go b/dhcpv6/option_iapd.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // PDOptions are options used with the IAPD (prefix delegation) option.

diff --git a/dhcpv6/option_iaprefix.go b/dhcpv6/option_iaprefix.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // PrefixOptions are the options valid for use with IAPrefix option field.

diff --git a/dhcpv6/option_informationrefreshtime.go b/dhcpv6/option_informationrefreshtime.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptInformationRefreshTime implements OptionInformationRefreshTime option.

diff --git a/dhcpv6/option_nii.go b/dhcpv6/option_nii.go
@@ -3,7 +3,7 @@ package dhcpv6
 import (
 	"fmt"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // NetworkInterfaceType is the NIC type as defined by RFC 4578 Section 2.2

diff --git a/dhcpv6/option_nontemporaryaddress.go b/dhcpv6/option_nontemporaryaddress.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // Duration is a duration as embedded in IA messages (IAPD, IANA, IATA).

diff --git a/dhcpv6/option_remoteid.go b/dhcpv6/option_remoteid.go
@@ -3,7 +3,7 @@ package dhcpv6
 import (
 	"fmt"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptRemoteID implemens the Remote ID option as defined by RFC 4649.

diff --git a/dhcpv6/option_requestedoption.go b/dhcpv6/option_requestedoption.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptionCodes are a collection of option codes.

diff --git a/dhcpv6/option_statuscode.go b/dhcpv6/option_statuscode.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/insomniacslk/dhcp/iana"
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptStatusCode represents a DHCPv6 Status Code option

diff --git a/dhcpv6/option_temporaryaddress.go b/dhcpv6/option_temporaryaddress.go
@@ -3,7 +3,7 @@ package dhcpv6
 import (
 	"fmt"
 
-	"github.com/u-root/u-root/pkg/uio"
+	"github.com/u-root/uio/uio"
 )
 
 // OptIATA implements the identity association for non-temporary addresses
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ import ( @@
     	"encoding/binary"
     	"net"
-    	"github.com/u-root/u-root/pkg/uio"
+    	"github.com/u-root/uio/uio"
     )
     const (
@@ Expand Down @@