Use Config Manager

This commit is contained in:
Samuel Lorch 2023-04-01 18:17:48 +02:00
parent 081aeec142
commit 70d69f04cf
11 changed files with 55 additions and 104 deletions

View file

@ -12,6 +12,6 @@ type GetDestinationNATRulesResult struct {
func (f *Firewall) GetDestinationNATRules(ctx context.Context, params struct{}) (GetDestinationNATRulesResult, error) {
return GetDestinationNATRulesResult{
DestinationNATRules: f.Conf.Firewall.DestinationNATRules,
DestinationNATRules: f.ConfigManager.GetPendingConfig().Firewall.DestinationNATRules,
}, nil
}

View file

@ -1,9 +1,9 @@
package firewall
import (
"nfsense.net/nfsense/internal/definitions"
"nfsense.net/nfsense/internal/config"
)
type Firewall struct {
Conf *definitions.Config
ConfigManager *config.ConfigManager
}

View file

@ -12,6 +12,6 @@ type GetForwardRulesResult struct {
func (f *Firewall) GetForwardRules(ctx context.Context, params struct{}) (GetForwardRulesResult, error) {
return GetForwardRulesResult{
ForwardRules: f.Conf.Firewall.ForwardRules,
ForwardRules: f.ConfigManager.GetPendingConfig().Firewall.ForwardRules,
}, nil
}

View file

@ -12,6 +12,6 @@ type GetSourceNATRulesResult struct {
func (f *Firewall) GetSourceNATRules(ctx context.Context, params struct{}) (GetSourceNATRulesResult, error) {
return GetSourceNATRulesResult{
SourceNATRules: f.Conf.Firewall.SourceNATRules,
SourceNATRules: f.ConfigManager.GetPendingConfig().Firewall.SourceNATRules,
}, nil
}