github/ping
1
0
Fork 0
mirror of https://github.com/go-ping/ping.git synced 2025-09-04 06:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix not exist interface

Browse Source
This commit is contained in:
ilolicon
2023-04-11 19:37:37 +08:00
parent 25a5dabc81
commit 682d8849a8
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packetconn.go
View File

@@ -18,7 +18,7 @@ type packetConn interface {
SetReadDeadline(t time.Time) error SetReadDeadline(t time.Time) error
WriteTo(b []byte, dst net.Addr) (int, error) WriteTo(b []byte, dst net.Addr) (int, error)
SetTTL(ttl int) SetTTL(ttl int)
SetIfaceIndex(iface string) SetIfaceIndex(ifaceIndex int)
} }
type icmpConn struct { type icmpConn struct {
@@ -35,12 +35,8 @@ func (c *icmpConn) SetTTL(ttl int) {
c.ttl = ttl c.ttl = ttl
} }
func (c *icmpConn) SetIfaceIndex(iface string) { func (c *icmpConn) SetIfaceIndex(ifaceIndex int) {
i, err := net.InterfaceByName(iface) c.ifaceIndex = ifaceIndex
if err != nil {
c.ifaceIndex = 0
}
c.ifaceIndex = i.Index
} }
func (c *icmpConn) SetReadDeadline(t time.Time) error { func (c *icmpConn) SetReadDeadline(t time.Time) error {
@@ -78,7 +74,7 @@ func (c *icmpv4Conn) WriteTo(b []byte, dst net.Addr) (int, error) {
} }
var cm *ipv4.ControlMessage var cm *ipv4.ControlMessage
if 1 <= c.ifaceIndex { if 1 <= c.ifaceIndex {
// set interface // If not set interface c.ifaceIndex == 0
if err := c.c.IPv4PacketConn().SetControlMessage(ipv4.FlagInterface, true); err != nil { if err := c.c.IPv4PacketConn().SetControlMessage(ipv4.FlagInterface, true); err != nil {
return 0, err return 0, err
} }
@@ -119,7 +115,7 @@ func (c *icmpV6Conn) WriteTo(b []byte, dst net.Addr) (int, error) {
} }
var cm *ipv6.ControlMessage var cm *ipv6.ControlMessage
if 1 <= c.ifaceIndex { if 1 <= c.ifaceIndex {
// set interface // If not set interface c.ifaceIndex == 0
if err := c.c.IPv6PacketConn().SetControlMessage(ipv6.FlagInterface, true); err != nil { if err := c.c.IPv6PacketConn().SetControlMessage(ipv6.FlagInterface, true); err != nil {
return 0, err return 0, err
} }

6
ping.go
View File

@@ -422,7 +422,11 @@ func (p *Pinger) Run() error {
conn.SetTTL(p.TTL) conn.SetTTL(p.TTL)
if p.Iface != "" { if p.Iface != "" {
conn.SetIfaceIndex(p.Iface) iface, err := net.InterfaceByName(p.Iface)
if err != nil {
return err
}
conn.SetIfaceIndex(iface.Index)
} }
return p.run(conn) return p.run(conn)
} }

4
ping_test.go
View File

@@ -480,6 +480,8 @@ func TestStatisticsLossy(t *testing.T) {
func TestSetIfaceName(t *testing.T) { func TestSetIfaceName(t *testing.T) {
pinger := New("www.google.com") pinger := New("www.google.com")
pinger.Count = 1 pinger.Count = 1
pinger.Timeout = time.Second
pinger.SetPrivileged(true)
// Set loopback interface // Set loopback interface
pinger.Iface = "lo" pinger.Iface = "lo"
@@ -662,7 +664,7 @@ func (c testPacketConn) ICMPRequestType() icmp.Type { return ipv4.ICMPTyp
func (c testPacketConn) SetFlagTTL() error { return nil } func (c testPacketConn) SetFlagTTL() error { return nil }
func (c testPacketConn) SetReadDeadline(t time.Time) error { return nil } func (c testPacketConn) SetReadDeadline(t time.Time) error { return nil }
func (c testPacketConn) SetTTL(t int) {} func (c testPacketConn) SetTTL(t int) {}
func (c testPacketConn) SetIfaceIndex(iface string) {} func (c testPacketConn) SetIfaceIndex(ifaceIndex int) {}
func (c testPacketConn) ReadFrom(b []byte) (n int, ttl int, src net.Addr, err error) { func (c testPacketConn) ReadFrom(b []byte) (n int, ttl int, src net.Addr, err error) {
return 0, 0, nil, nil return 0, 0, nil, nil