dhcp: simplify Utsname conversion (#36)
Utsname from golang.org/x/sys/unix contains byte array members instead of int8/uint8. This allows to simplify the NULL byte indexing in addHostname.
This commit is contained in:
parent
5760e0f265
commit
50b9390a43
@ -8,6 +8,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
@ -41,14 +42,7 @@ func addHostname(p *dhcp4.Packet) {
|
|||||||
if err := unix.Uname(&utsname); err != nil {
|
if err := unix.Uname(&utsname); err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
nnb := make([]byte, 0, len(utsname.Nodename))
|
nnb := utsname.Nodename[:bytes.IndexByte(utsname.Nodename[:], 0)]
|
||||||
for _, i := range utsname.Nodename {
|
|
||||||
if i == 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
nnb = append(nnb, byte(i))
|
|
||||||
}
|
|
||||||
|
|
||||||
p.AddOption(dhcp4.OptionHostName, nnb)
|
p.AddOption(dhcp4.OptionHostName, nnb)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user