diff --git a/net/iptables.go b/net/iptables.go index 315fac02..cda4655a 100644 --- a/net/iptables.go +++ b/net/iptables.go @@ -130,10 +130,10 @@ const ( iptablesFlushPollTime = 100 * time.Millisecond ) -// Monitor periodically checks for a canary chain in iptables. If this canary chain goes missing it calls the reloadFunc. +// MonitorForIptablesFlush periodically checks for a canary chain in iptables. If this canary chain goes missing it calls the reloadFunc. // This is a more efficient way of detecting whether firewalld or another process has been removing rules that we rely on. // The reloadFunc can then check whether other chains that should exist are still there, fix things and restore the canary. -func Monitor(log *logrus.Logger, canary string, tables []string, reloadFunc func(), interval time.Duration, stopCh <-chan struct{}) { +func MonitorForIptablesFlush(log *logrus.Logger, canary string, tables []string, reloadFunc func(), interval time.Duration, stopCh <-chan struct{}) { ipt, err := iptables.New() if err != nil { log.Errorf("creating iptables object while initializing iptable Monitoring %s", err) diff --git a/prog/weaver/main.go b/prog/weaver/main.go index 36a95246..811fc5d9 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -524,7 +524,7 @@ func main() { weavenet.Reexpose(&bridgeConfig, Log) } stopChan := make(chan struct{}) - go weavenet.Monitor(Log, "WEAVE-CANARY", []string{"mangle", "nat", "filter"}, applyIPTables, 10*time.Second, stopChan) + go weavenet.MonitorForIptablesFlush(Log, "WEAVE-CANARY", []string{"mangle", "nat", "filter"}, applyIPTables, 10*time.Second, stopChan) defer close(stopChan) signals.SignalHandlerLoop(common.Log, router)