Merge branch 'master' into dhcpv4-moar-tests

1 files changed, 26 insertions, 12 deletions

diff --git a/dhcpv4/options.go b/dhcpv4/options.go
index 5e6da80..d869b7d 100644
--- a/dhcpv4/options.go
+++ b/dhcpv4/options.go
@@ -40,32 +40,46 @@ func ParseOption(data []byte) (Option, error) {
 		err error
 	)
 	switch OptionCode(data[0]) {
-	case OptionDHCPMessageType:
-		opt, err = ParseOptMessageType(data)
-	case OptionParameterRequestList:
-		opt, err = ParseOptParameterRequestList(data)
+	case OptionSubnetMask:
+		opt, err = ParseOptSubnetMask(data)
+	case OptionRouter:
+		opt, err = ParseOptRouter(data)
+	case OptionDomainNameServer:
+		opt, err = ParseOptDomainNameServer(data)
+	case OptionHostName:
+		opt, err = ParseOptHostName(data)
+	case OptionDomainName:
+		opt, err = ParseOptDomainName(data)
+	case OptionBroadcastAddress:
+		opt, err = ParseOptBroadcastAddress(data)
+	case OptionNTPServers:
+		opt, err = ParseOptNTPServers(data)
 	case OptionRequestedIPAddress:
 		opt, err = ParseOptRequestedIPAddress(data)
+	case OptionIPAddressLeaseTime:
+		opt, err = ParseOptIPAddressLeaseTime(data)
+	case OptionDHCPMessageType:
+		opt, err = ParseOptMessageType(data)
 	case OptionServerIdentifier:
 		opt, err = ParseOptServerIdentifier(data)
-	case OptionBroadcastAddress:
-		opt, err = ParseOptBroadcastAddress(data)
+	case OptionParameterRequestList:
+		opt, err = ParseOptParameterRequestList(data)
 	case OptionMaximumDHCPMessageSize:
 		opt, err = ParseOptMaximumDHCPMessageSize(data)
 	case OptionClassIdentifier:
 		opt, err = ParseOptClassIdentifier(data)
-	case OptionDomainName:
-		opt, err = ParseOptDomainName(data)
-	case OptionDomainNameServer:
-		opt, err = ParseOptDomainNameServer(data)
-	case OptionVendorIdentifyingVendorClass:
-		opt, err = ParseOptVIVC(data)
 	case OptionTFTPServerName:
 		opt, err = ParseOptTFTPServerName(data)
 	case OptionBootfileName:
 		opt, err = ParseOptBootfileName(data)
 	case OptionUserClassInformation:
 		opt, err = ParseOptUserClass(data)
+	case OptionClientSystemArchitectureType:
+		opt, err = ParseOptClientArchType(data)
+	case OptionVendorIdentifyingVendorClass:
+		opt, err = ParseOptVIVC(data)
+	case OptionDNSDomainSearchList:
+		opt, err = ParseOptDomainSearch(data)
 	default:
 		opt, err = ParseOptionGeneric(data)
 	}