taigrr/go-fastping
1
0
Fork 0
mirror of https://github.com/taigrr/go-fastping synced 2025-01-18 05:03:15 -08:00
Code Issues Projects Releases Wiki Activity

Add recvICMP4 error handling

Browse Source
This commit is contained in:
Tatsushi Demachi 2014-08-03 09:50:33 +09:00
parent 69db984e45
commit af91e84187
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fastping.go
View File

@ -67,6 +67,19 @@ type packet struct {
addr *net.IPAddr addr *net.IPAddr
} }
type context struct {
stop chan bool
done chan bool
err error
}
func newContext() *context {
return &context {
stop: make(chan bool),
done: make(chan bool),
}
}
// Pinger represents ICMP packet sender/receiver // Pinger represents ICMP packet sender/receiver
type Pinger struct { type Pinger struct {
id int id int
@ -209,10 +222,11 @@ func (p *Pinger) run(once bool) error {
defer conn.Close() defer conn.Close()
var join chan<- bool var join chan<- bool
recv, stoprecv, waitjoin := make(chan *packet), make(chan chan<- bool), make(chan bool) recv := make(chan *packet)
recvCtx := newContext()
p.debugln("Run(): call recvICMP4()") p.debugln("Run(): call recvICMP4()")
go p.recvICMP4(conn, recv, stoprecv) go p.recvICMP4(conn, recv, recvCtx)
p.debugln("Run(): call sendICMP4()") p.debugln("Run(): call sendICMP4()")
queue, err := p.sendICMP4(conn) queue, err := p.sendICMP4(conn)
@ -226,6 +240,10 @@ mainloop:
case join = <-p.quit: case join = <-p.quit:
p.debugln("Run(): <-p.quit") p.debugln("Run(): <-p.quit")
break mainloop break mainloop
case <-recvCtx.done:
p.debugln("Run(): <-recvCtx.done")
err = recvCtx.err
break mainloop
case <-ticker.C: case <-ticker.C:
if handler, ok := p.handlers["idle"]; ok && handler != nil { if handler, ok := p.handlers["idle"]; ok && handler != nil {
if hdl, ok := handler.(func()); ok { if hdl, ok := handler.(func()); ok {
@ -246,10 +264,10 @@ mainloop:
p.running = false p.running = false
ticker.Stop() ticker.Stop()
p.debugln("Run(): stoprecv <- waitjoin") p.debugln("Run(): close(recvCtx.stop)")
stoprecv <- waitjoin close(recvCtx.stop)
p.debugln("Run(): <-waitjoin") p.debugln("Run(): <-recvCtx.done")
<-waitjoin <-recvCtx.done
if !once { if !once {
p.debugln("Run(): join <- true") p.debugln("Run(): join <- true")
join <- true join <- true
@ -301,14 +319,14 @@ func (p *Pinger) sendICMP4(conn *net.IPConn) (map[string]*net.IPAddr, error) {
return queue, nil return queue, nil
} }
func (p *Pinger) recvICMP4(conn *net.IPConn, recv chan<- *packet, stoprecv <-chan chan<- bool) { func (p *Pinger) recvICMP4(conn *net.IPConn, recv chan<- *packet, ctx *context) {
p.debugln("recvICMP4(): Start") p.debugln("recvICMP4(): Start")
for { for {
select { select {
case join := <-stoprecv: case <-ctx.stop:
p.debugln("recvICMP4(): <-stoprecv") p.debugln("recvICMP4(): <-ctx.stop")
p.debugln("recvICMP4(): join <- true") close(ctx.done)
join <- true p.debugln("recvICMP4(): close(ctx.done)")
return return
default: default:
} }
@ -325,6 +343,8 @@ func (p *Pinger) recvICMP4(conn *net.IPConn, recv chan<- *packet, stoprecv <-cha
continue continue
} else { } else {
p.debugln("recvICMP4(): OpError happen", err) p.debugln("recvICMP4(): OpError happen", err)
ctx.err = err
close(ctx.done)
return return
} }
} }