fix OptClientArchType

2 files changed, 10 insertions, 41 deletions

diff --git a/dhcpv4/option_archtype.go b/dhcpv4/option_archtype.go
index 16ca98d..8eafc55 100644
--- a/dhcpv4/option_archtype.go
+++ b/dhcpv4/option_archtype.go
@@ -6,43 +6,14 @@ package dhcpv4
 import (
 	"encoding/binary"
 	"fmt"
-)
-
-//ArchType encodes an architecture type in an uint16
-type ArchType uint16
 
-// see rfc4578
-const (
-	INTEL_X86PC       ArchType = 0
-	NEC_PC98          ArchType = 1
-	EFI_ITANIUM       ArchType = 2
-	DEC_ALPHA         ArchType = 3
-	ARC_X86           ArchType = 4
-	INTEL_LEAN_CLIENT ArchType = 5
-	EFI_IA32          ArchType = 6
-	EFI_BC            ArchType = 7
-	EFI_XSCALE        ArchType = 8
-	EFI_X86_64        ArchType = 9
+	"github.com/insomniacslk/dhcp/iana"
 )
 
-// ArchTypeToStringMap maps an ArchType to a mnemonic name
-var ArchTypeToStringMap = map[ArchType]string{
-	INTEL_X86PC:       "Intel x86PC",
-	NEC_PC98:          "NEC/PC98",
-	EFI_ITANIUM:       "EFI Itanium",
-	DEC_ALPHA:         "DEC Alpha",
-	ARC_X86:           "Arc x86",
-	INTEL_LEAN_CLIENT: "Intel Lean Client",
-	EFI_IA32:          "EFI IA32",
-	EFI_BC:            "EFI BC",
-	EFI_XSCALE:        "EFI Xscale",
-	EFI_X86_64:        "EFI x86-64",
-}
-
 // OptClientArchType represents an option encapsulating the Client System
 // Architecture Type option Definition.
 type OptClientArchType struct {
-	ArchTypes []ArchType
+	ArchTypes []iana.ArchType
 }
 
 // Code returns the option code.
@@ -71,10 +42,7 @@ func (o *OptClientArchType) Length() int {
 func (o *OptClientArchType) String() string {
 	var archTypes string
 	for idx, at := range o.ArchTypes {
-		name, ok := ArchTypeToStringMap[at]
-		if !ok {
-			name = "Unknown"
-		}
+		name := iana.ArchTypeToString(at)
 		archTypes += name
 		if idx < len(o.ArchTypes)-1 {
 			archTypes += ", "
@@ -100,10 +68,10 @@ func ParseOptClientArchType(data []byte) (*OptClientArchType, error) {
 	if len(data) < 2+length {
 		return nil, ErrShortByteStream
 	}
-	archTypes := make([]ArchType, 0, length%2)
+	archTypes := make([]iana.ArchType, 0, length%2)
 	for idx := 0; idx < length; idx += 2 {
 		b := data[2+idx : 2+idx+2]
-		archTypes = append(archTypes, ArchType(binary.BigEndian.Uint16(b)))
+		archTypes = append(archTypes, iana.ArchType(binary.BigEndian.Uint16(b)))
 	}
 	return &OptClientArchType{ArchTypes: archTypes}, nil
 }
diff --git a/dhcpv4/option_archtype_test.go b/dhcpv4/option_archtype_test.go
index cb9bc3f..d803328 100644
--- a/dhcpv4/option_archtype_test.go
+++ b/dhcpv4/option_archtype_test.go
@@ -3,6 +3,7 @@ package dhcpv4
 import (
 	"testing"
 
+	"github.com/insomniacslk/dhcp/iana"
 	"github.com/stretchr/testify/require"
 )
 
@@ -14,7 +15,7 @@ func TestParseOptClientArchType(t *testing.T) {
 	}
 	opt, err := ParseOptClientArchType(data)
 	require.NoError(t, err)
-	require.Equal(t, opt.ArchTypes[0], EFI_IA32)
+	require.Equal(t, opt.ArchTypes[0], iana.EFI_IA32)
 }
 
 func TestParseOptClientArchTypeMultiple(t *testing.T) {
@@ -26,8 +27,8 @@ func TestParseOptClientArchTypeMultiple(t *testing.T) {
 	}
 	opt, err := ParseOptClientArchType(data)
 	require.NoError(t, err)
-	require.Equal(t, opt.ArchTypes[0], EFI_IA32)
-	require.Equal(t, opt.ArchTypes[1], EFI_ITANIUM)
+	require.Equal(t, opt.ArchTypes[0], iana.EFI_IA32)
+	require.Equal(t, opt.ArchTypes[1], iana.EFI_ITANIUM)
 }
 
 func TestParseOptClientArchTypeInvalid(t *testing.T) {
@@ -61,7 +62,7 @@ func TestOptClientArchTypeParseAndToBytesMultiple(t *testing.T) {
 
 func TestOptClientArchType(t *testing.T) {
 	opt := OptClientArchType{
-		ArchTypes: []ArchType{EFI_ITANIUM},
+		ArchTypes: []iana.ArchType{iana.EFI_ITANIUM},
 	}
 	require.Equal(t, opt.Length(), 2)
 	require.Equal(t, opt.Code(), OptionClientSystemArchitectureType)