check for nil cm again

TrilliumIT · Mar 30, 2018 · 28c9a15 · 28c9a15
1 parent 690c2f0
commit 28c9a15
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cmd/ping/ping.go b/cmd/ping/ping.go
@@ -68,14 +68,14 @@ func main() {
 		if err == ping.ErrTimedOut {
 			atomic.AddInt64(&dropped, 1)
 			if !*quiet {
-				fmt.Printf("Packet timed out from %v seq: %v id: %v count: %v\n", pkt.Dst.String(), pkt.Seq, pkt.ID, pkt.Count)
+				fmt.Printf("Packet timed out from %v seq: %v id: %v count: %v sent: %v\n", pkt.Dst.String(), pkt.Seq, pkt.ID, pkt.Count, pkt.Sent)
 			}
 			return
 		}
 
 		atomic.AddInt64(&errored, 1)
 		if !*quiet {
-			fmt.Printf("Packet errored from %v seq: %v id: %v count: %v err: %v\n", pkt.Dst.String(), pkt.Seq, pkt.ID, pkt.Count, err)
+			fmt.Printf("Packet errored from %v seq: %v id: %v count: %v sent: %v err: %v\n", pkt.Dst.String(), pkt.Seq, pkt.ID, pkt.Count, pkt.Sent, err)
 		}
 	}
 

diff --git a/ping/internal/conn/conn_unix.go b/ping/internal/conn/conn_unix.go
@@ -47,7 +47,9 @@ func readV4(c *ipv4.PacketConn, len int) (
 	var cm *ipv4.ControlMessage
 	rlen, cm, srcAddr, err = c.ReadFrom(payload)
 	received = time.Now()
-	src, dst, ttl = cm.Src, cm.Dst, cm.TTL
+	if cm != nil {
+		src, dst, ttl = cm.Src, cm.Dst, cm.TTL
+	}
 	return
 }
 
@@ -63,6 +65,8 @@ func readV6(c *ipv6.PacketConn, len int) (
 	var cm *ipv6.ControlMessage
 	rlen, cm, srcAddr, err = c.ReadFrom(payload)
 	received = time.Now()
-	src, dst, ttl = cm.Src, cm.Dst, cm.HopLimit
+	if cm != nil {
+		src, dst, ttl = cm.Src, cm.Dst, cm.HopLimit
+	}
 	return
 }