github/ping
1
0
Fork 0
mirror of https://github.com/go-ping/ping.git synced 2025-08-12 02:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for OnSendError and OnRecvError handlers (#44)

Browse Source 
* Add support for OnSendError and OnRecvError handlers

Signed-off-by: Jeremiah Millay <jmillay@fastly.com>

* do not use handler := pattern for callbacks

Signed-off-by: Jeremiah Millay <jmillay@fastly.com>

---------

Signed-off-by: Jeremiah Millay <jmillay@fastly.com>
This commit is contained in:
Jeremiah Millay 2023-06-08 06:56:38 -04:00 committed by Kaj Niemi
parent 28dee17585
commit 118abe2a50
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ping.go
View File

@ -178,6 +178,12 @@ type Pinger struct {
// OnDuplicateRecv is called when a packet is received that has already been received. // OnDuplicateRecv is called when a packet is received that has already been received.
OnDuplicateRecv func(*Packet) OnDuplicateRecv func(*Packet)
// OnSendError is called when an error occurs while Pinger attempts to send a packet
OnSendError func(*Packet, error)
// OnRecvError is called when an error occurs while Pinger attempts to receive a packet
OnRecvError func(error)
// Size of packet being sent // Size of packet being sent
Size int Size int
@ -657,6 +663,9 @@ func (p *Pinger) recvICMP(
var err error var err error
n, ttl, _, err = conn.ReadFrom(bytes) n, ttl, _, err = conn.ReadFrom(bytes)
if err != nil { if err != nil {
if p.OnRecvError != nil {
p.OnRecvError(err)
}
if neterr, ok := err.(*net.OpError); ok { if neterr, ok := err.(*net.OpError); ok {
if neterr.Timeout() { if neterr.Timeout() {
// Read timeout // Read timeout
@ -804,6 +813,16 @@ func (p *Pinger) sendICMP(conn packetConn) error {
for { for {
if _, err := conn.WriteTo(msgBytes, dst); err != nil { if _, err := conn.WriteTo(msgBytes, dst); err != nil {
if p.OnSendError != nil {
outPkt := &Packet{
Nbytes: len(msgBytes),
IPAddr: p.ipaddr,
Addr: p.addr,
Seq: p.sequence,
ID: p.id,
}
p.OnSendError(outPkt, err)
}
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