[BPF] clean up stale ICMPv6 conntrack entries

projectcalico · Apr 23, 2024 · f4b77b2 · f4b77b2
1 parent dc49320
commit f4b77b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/felix/bpf/conntrack/cleanup.go b/felix/bpf/conntrack/cleanup.go
@@ -175,7 +175,7 @@ func (t *Timeouts) EntryExpired(nowNanos int64, proto uint8, entry ValueInterfac
 			}
 		}
 		return "", false
-	case ProtoICMP:
+	case ProtoICMP, ProtoICMP6:
 		if age > t.ICMPLastSeen {
 			return "no traffic on ICMP flow for too long", true
 		}

diff --git a/felix/bpf/conntrack/map.go b/felix/bpf/conntrack/map.go
@@ -136,9 +136,10 @@ func MapV2() maps.Map {
 }
 
 const (
-	ProtoICMP = 1
-	ProtoTCP  = 6
-	ProtoUDP  = 17
+	ProtoICMP  = 1
+	ProtoTCP   = 6
+	ProtoUDP   = 17
+	ProtoICMP6 = 58
 )
 
 func KeyFromBytes(k []byte) KeyInterface {