github/ping
1
0
Fork 0
mirror of https://github.com/go-ping/ping.git synced 2025-04-28 02:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report whether or not the TTL value was read (#205)

Browse Source 
In IPv6 a hop limit of 0 is valid, so the TTL the code is reporting is
actually a valid value in that case.

Initialize ttl to -1, so that in the case of not getting a TTL value
from the control message, we can let the rest of the code whether the
reported value was actually 0 or whether it couldn't be read.

Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
This commit is contained in:
Marcelo Magallon 2022-05-23 08:54:11 -06:00 committed by GitHub
parent 6d40342032
commit b89bb75386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packetconn.go
View File

@ -65,7 +65,7 @@ func (c *icmpv4Conn) SetFlagTTL() error {
} }
func (c *icmpv4Conn) ReadFrom(b []byte) (int, int, net.Addr, error) { func (c *icmpv4Conn) ReadFrom(b []byte) (int, int, net.Addr, error) {
var ttl int ttl := -1
n, cm, src, err := c.c.IPv4PacketConn().ReadFrom(b) n, cm, src, err := c.c.IPv4PacketConn().ReadFrom(b)
if cm != nil { if cm != nil {
ttl = cm.TTL ttl = cm.TTL
@ -90,7 +90,7 @@ func (c *icmpV6Conn) SetFlagTTL() error {
} }
func (c *icmpV6Conn) ReadFrom(b []byte) (int, int, net.Addr, error) { func (c *icmpV6Conn) ReadFrom(b []byte) (int, int, net.Addr, error) {
var ttl int ttl := -1
n, cm, src, err := c.c.IPv6PacketConn().ReadFrom(b) n, cm, src, err := c.c.IPv6PacketConn().ReadFrom(b)
if cm != nil { if cm != nil {
ttl = cm.HopLimit ttl = cm.HopLimit