Skip to content

Commit c253dad

Browse files
authored
Merge pull request #473 from AkihiroSuda/fix-472-regression
fix regression in "vmnet: remove dhcp pcap" (#472)
2 parents e727ef4 + ac84c7f commit c253dad

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

go/pkg/vmnet/vmnet.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,16 @@ func (v *Vif) dhcp() (net.IP, error) {
561561

562562
ethernet := NewEthernetFrame(broadcastMAC, v.ClientMAC, 0x800)
563563
ethernet.setData(ipv4.Bytes())
564+
finished := false
565+
go func() {
566+
for !finished {
567+
if err := v.Write(ethernet.Bytes()); err != nil {
568+
panic(err)
569+
}
570+
time.Sleep(time.Second)
571+
}
572+
}()
573+
564574
for {
565575
response, err := v.Read()
566576
if err != nil {
@@ -600,6 +610,7 @@ func (v *Vif) dhcp() (net.IP, error) {
600610
}
601611
var ip net.IP
602612
ip = udpv4.Data[16:20]
613+
finished = true // will terminate sending goroutine
603614
return ip, nil
604615
}
605616

0 commit comments

Comments
 (0)