Skip to content

Commit

Permalink
iana: rename HwTypeType to HWType, add package comment.
Browse files Browse the repository at this point in the history
  • Loading branch information
@hugelgupf
hugelgupf committed Jan 11, 2019
1 parent 9ff913a commit 747c6eb
Show file tree
Hide file tree
Showing 16 changed files with 115 additions and 111 deletions.
2 changes: 1 addition & 1 deletion dhcpv4/bsdp/bsdp_test.go
View file
Expand Up @@ -106,7 +106,7 @@ func TestNewInformList_ReplyPort(t *testing.T) {
func newAck(hwAddr net.HardwareAddr, transactionID [4]byte) *dhcpv4.DHCPv4 {
ack, _ := dhcpv4.New()
ack.TransactionID = transactionID
ack.HWType = iana.HwTypeEthernet
ack.HWType = iana.HWTypeEthernet
ack.ClientHWAddr = hwAddr
ack.AddOption(&dhcpv4.OptMessageType{MessageType: dhcpv4.MessageTypeAck})
ack.AddOption(&dhcpv4.OptionGeneric{OptionCode: dhcpv4.OptionEnd})
Expand Down
12 changes: 6 additions & 6 deletions dhcpv4/dhcpv4.go
View file
Expand Up @@ -33,7 +33,7 @@ var magicCookie = [4]byte{99, 130, 83, 99}
// to build DHCPv4 packets.
type DHCPv4 struct {
OpCode OpcodeType
HWType iana.HwTypeType
HWType iana.HWType
HopCount uint8
TransactionID TransactionID
NumSeconds uint16
Expand Down Expand Up @@ -113,7 +113,7 @@ func New() (*DHCPv4, error) {
}
d := DHCPv4{
OpCode: OpcodeBootRequest,
HWType: iana.HwTypeEthernet,
HWType: iana.HWTypeEthernet,
HopCount: 0,
TransactionID: xid,
NumSeconds: 0,
Expand Down Expand Up @@ -149,7 +149,7 @@ func NewDiscovery(hwaddr net.HardwareAddr) (*DHCPv4, error) {
}
// get hw addr
d.OpCode = OpcodeBootRequest
d.HWType = iana.HwTypeEthernet
d.HWType = iana.HWTypeEthernet
d.ClientHWAddr = hwaddr
d.SetBroadcast()
d.AddOption(&OptMessageType{MessageType: MessageTypeDiscover})
Expand Down Expand Up @@ -202,7 +202,7 @@ func NewInform(hwaddr net.HardwareAddr, localIP net.IP) (*DHCPv4, error) {
}

d.OpCode = OpcodeBootRequest
d.HWType = iana.HwTypeEthernet
d.HWType = iana.HWTypeEthernet
d.ClientHWAddr = hwaddr
d.ClientIPAddr = localIP
d.AddOption(&OptMessageType{MessageType: MessageTypeInform})
Expand Down Expand Up @@ -269,7 +269,7 @@ func FromBytes(q []byte) (*DHCPv4, error) {
buf := uio.NewBigEndianBuffer(q)

p.OpCode = OpcodeType(buf.Read8())
p.HWType = iana.HwTypeType(buf.Read8())
p.HWType = iana.HWType(buf.Read8())

hwAddrLen := buf.Read8()

Expand Down Expand Up @@ -502,7 +502,7 @@ func (d *DHCPv4) ToBytes() []byte {

// HwAddrLen
hlen := uint8(len(d.ClientHWAddr))
if hlen == 0 && d.HWType == iana.HwTypeEthernet {
if hlen == 0 && d.HWType == iana.HWTypeEthernet {
hlen = 6
}
buf.Write8(hlen)
Expand Down
6 changes: 3 additions & 3 deletions dhcpv4/dhcpv4_test.go
View file
Expand Up @@ -63,7 +63,7 @@ func TestFromBytes(t *testing.T) {
d, err := FromBytes(data)
require.NoError(t, err)
require.Equal(t, d.OpCode, OpcodeBootRequest)
require.Equal(t, d.HWType, iana.HwTypeEthernet)
require.Equal(t, d.HWType, iana.HWTypeEthernet)
require.Equal(t, d.HopCount, byte(3))
require.Equal(t, d.TransactionID, TransactionID{0xaa, 0xbb, 0xcc, 0xdd})
require.Equal(t, d.NumSeconds, uint16(3))
Expand Down Expand Up @@ -302,7 +302,7 @@ func TestNewDiscovery(t *testing.T) {

// Validate fields of DISCOVER packet.
require.Equal(t, OpcodeBootRequest, m.OpCode)
require.Equal(t, iana.HwTypeEthernet, m.HWType)
require.Equal(t, iana.HWTypeEthernet, m.HWType)
require.Equal(t, hwAddr, m.ClientHWAddr)
require.True(t, m.IsBroadcast())
require.True(t, m.Options.Has(OptionParameterRequestList))
Expand All @@ -316,7 +316,7 @@ func TestNewInform(t *testing.T) {

require.NoError(t, err)
require.Equal(t, OpcodeBootRequest, m.OpCode)
require.Equal(t, iana.HwTypeEthernet, m.HWType)
require.Equal(t, iana.HWTypeEthernet, m.HWType)
require.Equal(t, hwAddr, m.ClientHWAddr)
require.Equal(t, MessageTypeInform, m.MessageType())
require.True(t, m.ClientIPAddr.Equal(localIP))
Expand Down
2 changes: 1 addition & 1 deletion dhcpv6/async/client_test.go
View file
Expand Up @@ -21,7 +21,7 @@ func solicit(input string) (dhcpv6.DHCPv6, error) {
}
duid := dhcpv6.Duid{
Type: dhcpv6.DUID_LLT,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
Time: dhcpv6.GetTime(),
LinkLayerAddr: mac,
}
Expand Down
2 changes: 1 addition & 1 deletion dhcpv6/dhcpv6_test.go
View file
Expand Up @@ -265,7 +265,7 @@ func TestNewMessageTypeSolicitWithCID(t *testing.T) {

duid := Duid{
Type: DUID_LL,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
LinkLayerAddr: hwAddr,
}

Expand Down
2 changes: 1 addition & 1 deletion dhcpv6/dhcpv6message.go
View file
Expand Up @@ -107,7 +107,7 @@ func NewSolicitForInterface(ifname string, modifiers ...Modifier) (DHCPv6, error
}
duid := Duid{
Type: DUID_LLT,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
Time: GetTime(),
LinkLayerAddr: iface.HardwareAddr,
}
Expand Down
8 changes: 4 additions & 4 deletions dhcpv6/duid.go
View file
Expand Up @@ -34,7 +34,7 @@ func (d DuidType) String() string {

type Duid struct {
Type DuidType
HwType iana.HwTypeType // for DUID-LLT and DUID-LL. Ignored otherwise. RFC 826
HwType iana.HWType // for DUID-LLT and DUID-LL. Ignored otherwise. RFC 826
Time uint32 // for DUID-LLT. Ignored otherwise
LinkLayerAddr net.HardwareAddr
EnterpriseNumber uint32 // for DUID-EN. Ignored otherwise
Expand Down Expand Up @@ -87,7 +87,7 @@ func (d *Duid) ToBytes() []byte {

func (d *Duid) String() string {
var hwaddr string
if d.HwType == iana.HwTypeEthernet {
if d.HwType == iana.HWTypeEthernet {
for _, b := range d.LinkLayerAddr {
hwaddr += fmt.Sprintf("%02x:", b)
}
Expand All @@ -108,14 +108,14 @@ func DuidFromBytes(data []byte) (*Duid, error) {
if len(data) < 8 {
return nil, fmt.Errorf("Invalid DUID-LLT: shorter than 8 bytes")
}
d.HwType = iana.HwTypeType(binary.BigEndian.Uint16(data[2:4]))
d.HwType = iana.HWType(binary.BigEndian.Uint16(data[2:4]))
d.Time = binary.BigEndian.Uint32(data[4:8])
d.LinkLayerAddr = data[8:]
} else if d.Type == DUID_LL {
if len(data) < 4 {
return nil, fmt.Errorf("Invalid DUID-LL: shorter than 4 bytes")
}
d.HwType = iana.HwTypeType(binary.BigEndian.Uint16(data[2:4]))
d.HwType = iana.HWType(binary.BigEndian.Uint16(data[2:4]))
d.LinkLayerAddr = data[4:]
} else if d.Type == DUID_EN {
if len(data) < 6 {
Expand Down
6 changes: 3 additions & 3 deletions dhcpv6/duid_test.go
View file
Expand Up @@ -43,7 +43,7 @@ func TestDuidLLTFromBytes(t *testing.T) {
require.Equal(t, 14, duid.Length())
require.Equal(t, DUID_LLT, duid.Type)
require.Equal(t, uint32(0x01020304), duid.Time)
require.Equal(t, iana.HwTypeEthernet, duid.HwType)
require.Equal(t, iana.HWTypeEthernet, duid.HwType)
require.Equal(t, net.HardwareAddr{0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}, duid.LinkLayerAddr)
}

Expand All @@ -57,7 +57,7 @@ func TestDuidLLFromBytes(t *testing.T) {
require.NoError(t, err)
require.Equal(t, 10, duid.Length())
require.Equal(t, DUID_LL, duid.Type)
require.Equal(t, iana.HwTypeEthernet, duid.HwType)
require.Equal(t, iana.HWTypeEthernet, duid.HwType)
require.Equal(t, net.HardwareAddr{0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff}, duid.LinkLayerAddr)
}

Expand All @@ -83,7 +83,7 @@ func TestDuidLLTToBytes(t *testing.T) {
}
duid := Duid{
Type: DUID_LLT,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
Time: uint32(0x01020304),
LinkLayerAddr: []byte{0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff},
}
Expand Down
2 changes: 1 addition & 1 deletion dhcpv6/iputils_test.go
View file
Expand Up @@ -134,7 +134,7 @@ func Test_ExtractMAC(t *testing.T) {
// MAC extracted from DUID
duid := Duid{
Type: DUID_LL,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
LinkLayerAddr: []byte{0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa},
}
solicit, err := NewMessage(WithClientID(duid))
Expand Down
4 changes: 2 additions & 2 deletions dhcpv6/modifiers_test.go
View file
Expand Up @@ -12,7 +12,7 @@ import (
func TestWithClientID(t *testing.T) {
duid := Duid{
Type: DUID_LL,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
LinkLayerAddr: net.HardwareAddr([]byte{0xfa, 0xce, 0xb0, 0x00, 0x00, 0x0c}),
}
m, err := NewMessage(WithClientID(duid))
Expand All @@ -26,7 +26,7 @@ func TestWithClientID(t *testing.T) {
func TestWithServerID(t *testing.T) {
duid := Duid{
Type: DUID_LL,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
LinkLayerAddr: net.HardwareAddr([]byte{0xfa, 0xce, 0xb0, 0x00, 0x00, 0x0c}),
}
m, err := NewMessage(WithServerID(duid))
Expand Down
6 changes: 3 additions & 3 deletions dhcpv6/option_clientid_test.go
View file
Expand Up @@ -17,15 +17,15 @@ func TestParseOptClientId(t *testing.T) {
opt, err := ParseOptClientId(data)
require.NoError(t, err)
require.Equal(t, DUID_LL, opt.Cid.Type)
require.Equal(t, iana.HwTypeEthernet, opt.Cid.HwType)
require.Equal(t, iana.HWTypeEthernet, opt.Cid.HwType)
require.Equal(t, net.HardwareAddr([]byte{0, 1, 2, 3, 4, 5}), opt.Cid.LinkLayerAddr)
}

func TestOptClientIdToBytes(t *testing.T) {
opt := OptClientId{
Cid: Duid{
Type: DUID_LL,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
LinkLayerAddr: net.HardwareAddr([]byte{5, 4, 3, 2, 1, 0}),
},
}
Expand Down Expand Up @@ -58,7 +58,7 @@ func TestOptionClientId(t *testing.T) {
opt := OptClientId{
Cid: Duid{
Type: DUID_LL,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
LinkLayerAddr: net.HardwareAddr([]byte{0xde, 0xad, 0, 0, 0xbe, 0xef}),
},
}
Expand Down
6 changes: 3 additions & 3 deletions dhcpv6/option_serverid_test.go
View file
Expand Up @@ -17,15 +17,15 @@ func TestParseOptServerId(t *testing.T) {
opt, err := ParseOptServerId(data)
require.NoError(t, err)
require.Equal(t, DUID_LL, opt.Sid.Type)
require.Equal(t, iana.HwTypeEthernet, opt.Sid.HwType)
require.Equal(t, iana.HWTypeEthernet, opt.Sid.HwType)
require.Equal(t, net.HardwareAddr([]byte{0, 1, 2, 3, 4, 5}), opt.Sid.LinkLayerAddr)
}

func TestOptServerIdToBytes(t *testing.T) {
opt := OptServerId{
Sid: Duid{
Type: DUID_LL,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
LinkLayerAddr: net.HardwareAddr([]byte{5, 4, 3, 2, 1, 0}),
},
}
Expand Down Expand Up @@ -58,7 +58,7 @@ func TestOptionServerId(t *testing.T) {
opt := OptServerId{
Sid: Duid{
Type: DUID_LL,
HwType: iana.HwTypeEthernet,
HwType: iana.HWTypeEthernet,
LinkLayerAddr: net.HardwareAddr([]byte{0xde, 0xad, 0, 0, 0xbe, 0xef}),
},
}
Expand Down

0 comments on commit 747c6eb

Please sign in to comment.