mirrors/netboot
1
0
Fork 0
mirror of https://github.com/danderson/netboot.git synced 2025-10-15 09:31:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

dhcp4: parse transaction ID as a byte slice

Browse Source
This commit is contained in:
Matt Layher 2018-02-03 08:42:56 -05:00 committed by Dave Anderson
parent bc300c7140
commit c41aa79265
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dhcp4/conn_test.go
View File

@ -36,7 +36,7 @@ func testConn(t *testing.T, impl conn, addr string) {
p := &Packet{
Type: MsgDiscover,
TransactionID: "1234",
TransactionID: []byte("1234"),
Broadcast: true,
HardwareAddr: mac,
}

6
dhcp4/packet.go
View File

@ -67,7 +67,7 @@ func (mt MessageType) String() string {
// Packet represents a DHCP packet.
type Packet struct {
Type MessageType
TransactionID string
TransactionID []byte // Always 4 bytes
Broadcast bool
HardwareAddr net.HardwareAddr // Only ethernet supported at the moment
@ -175,7 +175,7 @@ func (p *Packet) Marshal() ([]byte, error) {
// Hops = 0
ret.WriteByte(0)
// Transaction ID
ret.WriteString(p.TransactionID)
ret.Write(p.TransactionID)
// Seconds elapsed
ret.Write([]byte{0, 0})
// Broadcast flag
@ -267,7 +267,7 @@ func Unmarshal(bs []byte) (*Packet, error) {
return nil, fmt.Errorf("packet has unsupported hardware address type/length %d/%d", bs[1], bs[2])
}
ret.HardwareAddr = net.HardwareAddr(bs[28:34])
ret.TransactionID = string(bs[4:8])
ret.TransactionID = bs[4:8]
if binary.BigEndian.Uint16(bs[10:12])&0x8000 != 0 {
ret.Broadcast = true
}

8
dhcp4/testdata/dhcp.parsed vendored
View File

@ -1,5 +1,5 @@
DHCPDISCOVER
"\x9bN\x05W"
[]byte{0x9b, 0x4e, 0x5, 0x57}
Broadcast
MAC: d0:50:99:4e:05:57
ClientIP: 0.0.0.0
@ -19,7 +19,7 @@ DHCPDISCOVER
97: []byte{0x0, 0x0, 0x2, 0x0, 0x3, 0x0, 0x4, 0x0, 0x5, 0x0, 0x6, 0x0, 0x7, 0x0, 0x8, 0x0, 0x9}
======
DHCPOFFER
"\x9bN\x05W"
[]byte{0x9b, 0x4e, 0x5, 0x57}
Broadcast
MAC: d0:50:99:4e:05:57
ClientIP: 0.0.0.0
@ -37,7 +37,7 @@ DHCPOFFER
97: []byte{0x0, 0x0, 0x2, 0x0, 0x3, 0x0, 0x4, 0x0, 0x5, 0x0, 0x6, 0x0, 0x7, 0x0, 0x8, 0x0, 0x9}
======
DHCPOFFER
"\x9bN\x05W"
[]byte{0x9b, 0x4e, 0x5, 0x57}
Broadcast
MAC: d0:50:99:4e:05:57
ClientIP: 0.0.0.0
@ -61,7 +61,7 @@ DHCPOFFER
59: []byte{0x0, 0x0, 0xc, 0x4e}
======
DHCPREQUEST
"R\xcf\xf0\a"
[]byte{0x52, 0xcf, 0xf0, 0x7}
Unicast
MAC: 00:24:d7:ba:0b:20
ClientIP: 0.0.0.0