Merge pull request #5 from insomniacslk/fix_types

Fixed types in dhcpv4 and dhcpv6

5 files changed, 110 insertions, 112 deletions

diff --git a/dhcpv6/duid.go b/dhcpv6/duid.go
index e3da8ff..112412d 100644
--- a/dhcpv6/duid.go
+++ b/dhcpv6/duid.go
@@ -3,16 +3,16 @@ package dhcpv6
 import (
 	"encoding/binary"
 	"fmt"
+
 	"github.com/insomniacslk/dhcp/iana"
 )
 
 type DuidType uint16
 
 const (
-	_ DuidType = iota
-	DUID_LLT
-	DUID_EN
-	DUID_LL
+	DUID_LLT DuidType = 1
+	DUID_EN  DuidType = 2
+	DUID_LL  DuidType = 3
 )
 
 var DuidTypeToString = map[DuidType]string{
diff --git a/dhcpv6/option_archtype.go b/dhcpv6/option_archtype.go
index 71f67ff..734d89e 100644
--- a/dhcpv6/option_archtype.go
+++ b/dhcpv6/option_archtype.go
@@ -12,16 +12,16 @@ type ArchType uint16
 
 // see rfc4578
 const (
-	INTEL_X86PC ArchType = iota
-	NEC_PC98
-	EFI_ITANIUM
-	DEC_ALPHA
-	ARC_X86
-	INTEL_LEAN_CLIENT
-	EFI_IA32
-	EFI_BC
-	EFI_XSCALE
-	EFI_X86_64
+	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
 )
 
 var ArchTypeToStringMap = map[ArchType]string{
diff --git a/dhcpv6/option_nii.go b/dhcpv6/option_nii.go
index 85c9d4b..3a838ee 100644
--- a/dhcpv6/option_nii.go
+++ b/dhcpv6/option_nii.go
@@ -10,12 +10,12 @@ import (
 
 // see rfc4578
 const (
-	NII_LANDESK_NOPXE = iota
-	NII_PXE_GEN_I
-	NII_PXE_GEN_II
-	NII_UNDI_NOEFI
-	NII_UNDI_EFI_GEN_I
-	NII_UNDI_EFI_GEN_II
+	NII_LANDESK_NOPXE   = 0
+	NII_PXE_GEN_I       = 1
+	NII_PXE_GEN_II      = 2
+	NII_UNDI_NOEFI      = 3
+	NII_UNDI_EFI_GEN_I  = 4
+	NII_UNDI_EFI_GEN_II = 5
 )
 
 var NIIToStringMap = map[uint8]string{
diff --git a/dhcpv6/option_types.go b/dhcpv6/option_types.go
index 0229b86..946dcd0 100644
--- a/dhcpv6/option_types.go
+++ b/dhcpv6/option_types.go
@@ -2,80 +2,79 @@ package dhcpv6
 
 // FIXME: rename all the options to have a consistent name, e.g. OPT_<NAME>
 const (
-	_ OptionCode = iota // skip 0
-	OPTION_CLIENTID
-	OPTION_SERVERID
-	OPTION_IA_NA
-	OPTION_IA_TA
-	OPTION_IAADDR
-	OPTION_ORO
-	OPTION_PREFERENCE
-	OPTION_ELAPSED_TIME
-	OPTION_RELAY_MSG
-	_ // skip 10
-	OPTION_AUTH
-	OPTION_UNICAST
-	OPTION_STATUS_CODE
-	OPTION_RAPID_COMMIT
-	OPTION_USER_CLASS
-	OPTION_VENDOR_CLASS
-	OPTION_VENDOR_OPTS
-	OPTION_INTERFACE_ID
-	OPTION_RECONF_MSG
-	OPTION_RECONF_ACCEPT
-	SIP_SERVERS_DOMAIN_NAME_LIST
-	SIP_SERVERS_IPV6_ADDRESS_LIST
-	DNS_RECURSIVE_NAME_SERVER
-	DOMAIN_SEARCH_LIST
-	OPTION_IA_PD
-	OPTION_IAPREFIX
-	OPTION_NIS_SERVERS
-	OPTION_NISP_SERVERS
-	OPTION_NIS_DOMAIN_NAME
-	OPTION_NISP_DOMAIN_NAME
-	SNTP_SERVER_LIST
-	INFORMATION_REFRESH_TIME
-	BCMCS_CONTROLLER_DOMAIN_NAME_LIST
-	BCMCS_CONTROLLER_IPV6_ADDRESS_LIST
-	_ // skip 35
-	OPTION_GEOCONF_CIVIC
-	OPTION_REMOTE_ID
-	RELAY_AGENT_SUBSCRIBER_ID
-	FQDN
-	PANA_AUTHENTICATION_AGENT
-	OPTION_NEW_POSIX_TIMEZONE
-	OPTION_NEW_TZDB_TIMEZONE
-	ECHO_REQUEST
-	OPTION_LQ_QUERY
-	OPTION_CLIENT_DATA
-	OPTION_CLT_TIME
-	OPTION_LQ_RELAY_DATA
-	OPTION_LQ_CLIENT_LINK
-	MIPV6_HOME_NETWORK_ID_FQDN
-	MIPV6_VISITED_HOME_NETWORK_INFORMATION
-	LOST_SERVER
-	CAPWAP_ACCESS_CONTROLLER_ADDRESSES
-	RELAY_ID
-	OPTION_IPV6_ADDRESS_MOS
-	OPTION_IPV6_FQDN_MOS
-	OPTION_NTP_SERVER
-	OPTION_V6_ACCESS_DOMAIN
-	OPTION_SIP_UA_CS_LIST
-	OPT_BOOTFILE_URL
-	OPT_BOOTFILE_PARAM
-	OPTION_CLIENT_ARCH_TYPE
-	OPTION_NII
-	OPTION_GEOLOCATION
-	OPTION_AFTR_NAME
-	OPTION_ERP_LOCAL_DOMAIN_NAME
-	OPTION_RSOO
-	OPTION_PD_EXCLUDE
-	VIRTUAL_SUBNET_SELECTION
-	MIPV6_IDENTIFIED_HOME_NETWORK_INFORMATION
-	MIPV6_UNRESTRICTED_HOME_NETWORK_INFORMATION
-	MIPV6_HOME_NETWORK_PREFIX
-	MIPV6_HOME_AGENT_ADDRESS
-	MIPV6_HOME_AGENT_FQDN
+	OPTION_CLIENTID     OptionCode = 1
+	OPTION_SERVERID     OptionCode = 2
+	OPTION_IA_NA        OptionCode = 3
+	OPTION_IA_TA        OptionCode = 4
+	OPTION_IAADDR       OptionCode = 5
+	OPTION_ORO          OptionCode = 6
+	OPTION_PREFERENCE   OptionCode = 7
+	OPTION_ELAPSED_TIME OptionCode = 8
+	OPTION_RELAY_MSG    OptionCode = 9
+	// skip 10
+	OPTION_AUTH                        OptionCode = 11
+	OPTION_UNICAST                     OptionCode = 12
+	OPTION_STATUS_CODE                 OptionCode = 13
+	OPTION_RAPID_COMMIT                OptionCode = 14
+	OPTION_USER_CLASS                  OptionCode = 15
+	OPTION_VENDOR_CLASS                OptionCode = 16
+	OPTION_VENDOR_OPTS                 OptionCode = 17
+	OPTION_INTERFACE_ID                OptionCode = 18
+	OPTION_RECONF_MSG                  OptionCode = 19
+	OPTION_RECONF_ACCEPT               OptionCode = 20
+	SIP_SERVERS_DOMAIN_NAME_LIST       OptionCode = 21
+	SIP_SERVERS_IPV6_ADDRESS_LIST      OptionCode = 22
+	DNS_RECURSIVE_NAME_SERVER          OptionCode = 23
+	DOMAIN_SEARCH_LIST                 OptionCode = 24
+	OPTION_IA_PD                       OptionCode = 25
+	OPTION_IAPREFIX                    OptionCode = 26
+	OPTION_NIS_SERVERS                 OptionCode = 27
+	OPTION_NISP_SERVERS                OptionCode = 28
+	OPTION_NIS_DOMAIN_NAME             OptionCode = 29
+	OPTION_NISP_DOMAIN_NAME            OptionCode = 30
+	SNTP_SERVER_LIST                   OptionCode = 31
+	INFORMATION_REFRESH_TIME           OptionCode = 32
+	BCMCS_CONTROLLER_DOMAIN_NAME_LIST  OptionCode = 33
+	BCMCS_CONTROLLER_IPV6_ADDRESS_LIST OptionCode = 34
+	// skip 35
+	OPTION_GEOCONF_CIVIC                        OptionCode = 36
+	OPTION_REMOTE_ID                            OptionCode = 37
+	RELAY_AGENT_SUBSCRIBER_ID                   OptionCode = 38
+	FQDN                                        OptionCode = 39
+	PANA_AUTHENTICATION_AGENT                   OptionCode = 40
+	OPTION_NEW_POSIX_TIMEZONE                   OptionCode = 41
+	OPTION_NEW_TZDB_TIMEZONE                    OptionCode = 42
+	ECHO_REQUEST                                OptionCode = 43
+	OPTION_LQ_QUERY                             OptionCode = 44
+	OPTION_CLIENT_DATA                          OptionCode = 45
+	OPTION_CLT_TIME                             OptionCode = 46
+	OPTION_LQ_RELAY_DATA                        OptionCode = 47
+	OPTION_LQ_CLIENT_LINK                       OptionCode = 48
+	MIPV6_HOME_NETWORK_ID_FQDN                  OptionCode = 49
+	MIPV6_VISITED_HOME_NETWORK_INFORMATION      OptionCode = 50
+	LOST_SERVER                                 OptionCode = 51
+	CAPWAP_ACCESS_CONTROLLER_ADDRESSES          OptionCode = 52
+	RELAY_ID                                    OptionCode = 53
+	OPTION_IPV6_ADDRESS_MOS                     OptionCode = 54
+	OPTION_IPV6_FQDN_MOS                        OptionCode = 55
+	OPTION_NTP_SERVER                           OptionCode = 56
+	OPTION_V6_ACCESS_DOMAIN                     OptionCode = 57
+	OPTION_SIP_UA_CS_LIST                       OptionCode = 58
+	OPT_BOOTFILE_URL                            OptionCode = 59
+	OPT_BOOTFILE_PARAM                          OptionCode = 60
+	OPTION_CLIENT_ARCH_TYPE                     OptionCode = 61
+	OPTION_NII                                  OptionCode = 62
+	OPTION_GEOLOCATION                          OptionCode = 63
+	OPTION_AFTR_NAME                            OptionCode = 64
+	OPTION_ERP_LOCAL_DOMAIN_NAME                OptionCode = 65
+	OPTION_RSOO                                 OptionCode = 66
+	OPTION_PD_EXCLUDE                           OptionCode = 67
+	VIRTUAL_SUBNET_SELECTION                    OptionCode = 68
+	MIPV6_IDENTIFIED_HOME_NETWORK_INFORMATION   OptionCode = 69
+	MIPV6_UNRESTRICTED_HOME_NETWORK_INFORMATION OptionCode = 70
+	MIPV6_HOME_NETWORK_PREFIX                   OptionCode = 71
+	MIPV6_HOME_AGENT_ADDRESS                    OptionCode = 72
+	MIPV6_HOME_AGENT_FQDN                       OptionCode = 73
 )
 
 var OptionCodeToString = map[OptionCode]string{
diff --git a/dhcpv6/types.go b/dhcpv6/types.go
index e0ea6f0..bbe4c5b 100644
--- a/dhcpv6/types.go
+++ b/dhcpv6/types.go
@@ -5,24 +5,23 @@ package dhcpv6
 type MessageType uint8
 
 const (
-	_ MessageType = iota // skip 0
-	SOLICIT
-	ADVERTISE
-	REQUEST
-	CONFIRM
-	RENEW
-	REBIND
-	REPLY
-	RELEASE
-	DECLINE
-	RECONFIGURE
-	INFORMATION_REQUEST
-	RELAY_FORW
-	RELAY_REPL
-	LEASEQUERY
-	LEASEQUERY_REPLY
-	LEASEQUERY_DONE
-	LEASEQUERY_DATA
+	SOLICIT             MessageType = 1
+	ADVERTISE           MessageType = 2
+	REQUEST             MessageType = 3
+	CONFIRM             MessageType = 4
+	RENEW               MessageType = 5
+	REBIND              MessageType = 6
+	REPLY               MessageType = 7
+	RELEASE             MessageType = 8
+	DECLINE             MessageType = 9
+	RECONFIGURE         MessageType = 10
+	INFORMATION_REQUEST MessageType = 11
+	RELAY_FORW          MessageType = 12
+	RELAY_REPL          MessageType = 13
+	LEASEQUERY          MessageType = 14
+	LEASEQUERY_REPLY    MessageType = 15
+	LEASEQUERY_DONE     MessageType = 16
+	LEASEQUERY_DATA     MessageType = 17
 )
 
 func MessageTypeToString(t MessageType) string {