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

Change to use icmp.ListenPacket instead of net.ListenIP

Browse Source
This commit is contained in:
Tatsushi Demachi 2015-01-10 18:17:52 +09:00
parent 8f74a61288
commit 805934dbbf
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fastping.go
View File

@ -298,8 +298,8 @@ func (p *Pinger) Err() error {
return p.ctx.err return p.ctx.err
} }
func (p *Pinger) listen(netProto string) *net.IPConn { func (p *Pinger) listen(netProto string) *icmp.PacketConn {
conn, err := net.ListenIP(netProto, nil) conn, err := icmp.ListenPacket(netProto, "")
if err != nil { if err != nil {
p.mu.Lock() p.mu.Lock()
p.ctx.err = err p.ctx.err = err
@ -313,7 +313,7 @@ func (p *Pinger) listen(netProto string) *net.IPConn {
func (p *Pinger) run(once bool) { func (p *Pinger) run(once bool) {
p.debugln("Run(): Start") p.debugln("Run(): Start")
var conn, conn6 *net.IPConn var conn, conn6 *icmp.PacketConn
if p.hasIPv4 { if p.hasIPv4 {
if conn = p.listen("ip4:icmp"); conn == nil { if conn = p.listen("ip4:icmp"); conn == nil {
return return
@ -393,7 +393,7 @@ mainloop:
p.debugln("Run(): End") p.debugln("Run(): End")
} }
func (p *Pinger) sendICMP(conn, conn6 *net.IPConn) (map[string]*net.IPAddr, error) { func (p *Pinger) sendICMP(conn, conn6 *icmp.PacketConn) (map[string]*net.IPAddr, error) {
p.debugln("sendICMP(): Start") p.debugln("sendICMP(): Start")
p.mu.Lock() p.mu.Lock()
p.id = rand.Intn(0xffff) p.id = rand.Intn(0xffff)
@ -403,7 +403,7 @@ func (p *Pinger) sendICMP(conn, conn6 *net.IPConn) (map[string]*net.IPAddr, erro
wg := new(sync.WaitGroup) wg := new(sync.WaitGroup)
for key, addr := range p.addrs { for key, addr := range p.addrs {
var typ icmp.Type var typ icmp.Type
var cn *net.IPConn var cn *icmp.PacketConn
if isIPv4(addr.IP) { if isIPv4(addr.IP) {
typ = ipv4.ICMPTypeEcho typ = ipv4.ICMPTypeEcho
cn = conn cn = conn
@ -441,9 +441,9 @@ func (p *Pinger) sendICMP(conn, conn6 *net.IPConn) (map[string]*net.IPAddr, erro
p.debugln("sendICMP(): Invoke goroutine") p.debugln("sendICMP(): Invoke goroutine")
wg.Add(1) wg.Add(1)
go func(conn *net.IPConn, ra *net.IPAddr, b []byte) { go func(conn *icmp.PacketConn, ra *net.IPAddr, b []byte) {
for { for {
if _, _, err := conn.WriteMsgIP(bytes, nil, ra); err != nil { if _, err := conn.WriteTo(bytes, ra); err != nil {
if neterr, ok := err.(*net.OpError); ok { if neterr, ok := err.(*net.OpError); ok {
if neterr.Err == syscall.ENOBUFS { if neterr.Err == syscall.ENOBUFS {
continue continue
@ -452,7 +452,7 @@ func (p *Pinger) sendICMP(conn, conn6 *net.IPConn) (map[string]*net.IPAddr, erro
} }
break break
} }
p.debugln("sendICMP(): WriteMsgIP End") p.debugln("sendICMP(): WriteTo End")
wg.Done() wg.Done()
}(cn, addr, bytes) }(cn, addr, bytes)
} }
@ -461,7 +461,7 @@ func (p *Pinger) sendICMP(conn, conn6 *net.IPConn) (map[string]*net.IPAddr, erro
return queue, nil return queue, nil
} }
func (p *Pinger) recvICMP(conn *net.IPConn, recv chan<- *packet, ctx *context, wg *sync.WaitGroup) { func (p *Pinger) recvICMP(conn *icmp.PacketConn, recv chan<- *packet, ctx *context, wg *sync.WaitGroup) {
p.debugln("recvICMP(): Start") p.debugln("recvICMP(): Start")
for { for {
select { select {
@ -475,9 +475,9 @@ func (p *Pinger) recvICMP(conn *net.IPConn, recv chan<- *packet, ctx *context, w
bytes := make([]byte, 512) bytes := make([]byte, 512)
conn.SetReadDeadline(time.Now().Add(time.Millisecond * 100)) conn.SetReadDeadline(time.Now().Add(time.Millisecond * 100))
p.debugln("recvICMP(): ReadMsgIP Start") p.debugln("recvICMP(): ReadFrom Start")
_, _, _, ra, err := conn.ReadMsgIP(bytes, nil) _, ra, err := conn.ReadFrom(bytes)
p.debugln("recvICMP(): ReadMsgIP End") p.debugln("recvICMP(): ReadFrom End")
if err != nil { if err != nil {
if neterr, ok := err.(*net.OpError); ok { if neterr, ok := err.(*net.OpError); ok {
if neterr.Timeout() { if neterr.Timeout() {
@ -498,8 +498,13 @@ func (p *Pinger) recvICMP(conn *net.IPConn, recv chan<- *packet, ctx *context, w
} }
p.debugln("recvICMP(): p.recv <- packet") p.debugln("recvICMP(): p.recv <- packet")
addr, ok := ra.(*net.IPAddr)
if !ok {
continue
}
select { select {
case recv <- &packet{bytes: bytes, addr: ra}: case recv <- &packet{bytes: bytes, addr: addr}:
case <-ctx.stop: case <-ctx.stop:
p.debugln("recvICMP(): <-ctx.stop") p.debugln("recvICMP(): <-ctx.stop")
wg.Done() wg.Done()