Fix BPFConntrack timeout defaults.

Config was using old names for the fields so they didn't line up.

Author: fasaxc

felix/bpf/conntrack/timeouts_test.go

@@ -0,0 +1,25 @@
+package conntrack
+
+import (
+	"github.com/projectcalico/calico/felix/config"
+	"reflect"
+	"testing"
+)
+
+func TestConfigNames(t *testing.T) {
+	c := config.New()
+	to := DefaultTimeouts()
+	v := reflect.ValueOf(&to)
+	v = v.Elem()
+
+	for key, _ := range c.BPFConntrackTimeouts {
+		field := v.FieldByName(key)
+		if !field.IsValid() {
+			t.Errorf("Config contains invalid BPF conntrack timeout: %s", key)
+			continue
+		}
+	}
+	if v.NumField() != len(c.BPFConntrackTimeouts) {
+		t.Errorf("Config is missing some timeouts")
+	}
+}

felix/config/config_params.go

@@ -188,7 +188,7 @@ type Config struct {
 	BPFLogLevel                        string            `config:"oneof(off,info,debug);off;non-zero"`
 	BPFConntrackLogLevel               string            `config:"oneof(off,debug);off;non-zero"`
 	BPFConntrackCleanupMode            string            `config:"oneof(Auto,Userspace,BPFProgram);Auto"`
-	BPFConntrackTimeouts               map[string]string `config:"keyvaluelist;CreationGracePeriod=10s,TCPPreEstablished=20s,TCPEstablished=1h,TCPFinsSeen=Auto,TCPResetSeen=40s,UDPLastSeen=60s,GenericIPLastSeen=10m,ICMPLastSeen=5s"`
+	BPFConntrackTimeouts               map[string]string `config:"keyvaluelist;CreationGracePeriod=10s,TCPSynSent=20s,TCPEstablished=1h,TCPFinsSeen=Auto,TCPResetSeen=40s,UDPTimeout=60s,GenericTimeout=10m,ICMPTimeout=5s"`
 	BPFLogFilters                      map[string]string `config:"keyvaluelist;;"`
 	BPFCTLBLogFilter                   string            `config:"oneof(all);;"`
 	BPFDataIfacePattern                *regexp.Regexp    `config:"regexp;^((en|wl|ww|sl|ib)[Popsx].*|(eth|wlan|wwan|bond).*)"`