Skip to content

Commit

Permalink
auto-genereated rc.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@migara
migara committed Jan 22, 2025
1 parent a636e84 commit 6c5f32c
Show file tree
Hide file tree
Showing 30 changed files with 17,229 additions and 17,229 deletions.
204 changes: 102 additions & 102 deletions crypto/ike/gateway/entry.go
View file

Large diffs are not rendered by default.

7,558 changes: 3,779 additions & 3,779 deletions device/adminrole/entry.go
View file

Large diffs are not rendered by default.

1,454 changes: 727 additions & 727 deletions device/dynamicupdates/config.go
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions device/services/dns/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ func specifyConfig(o *Config) (any, error) {
if _, ok := o.Misc["DnsSettingServers"]; ok {
nestedDnsSetting.Servers.Misc = o.Misc["DnsSettingServers"]
}
if o.DnsSetting.Servers.Primary != nil {
nestedDnsSetting.Servers.Primary = o.DnsSetting.Servers.Primary
}
if o.DnsSetting.Servers.Secondary != nil {
nestedDnsSetting.Servers.Secondary = o.DnsSetting.Servers.Secondary
}
if o.DnsSetting.Servers.Primary != nil {
nestedDnsSetting.Servers.Primary = o.DnsSetting.Servers.Primary
}
}
}
config.DnsSetting = nestedDnsSetting
Expand Down
52 changes: 26 additions & 26 deletions device/services/ntp/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,18 +251,6 @@ func specifyConfig(o *Config) (any, error) {
if _, ok := o.Misc["NtpServersSecondaryNtpServerAuthenticationType"]; ok {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.Misc = o.Misc["NtpServersSecondaryNtpServerAuthenticationType"]
}
if o.NtpServers.SecondaryNtpServer.AuthenticationType.Autokey != nil {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.Autokey = &NtpServersSecondaryNtpServerAuthenticationTypeAutokeyXml{}
if _, ok := o.Misc["NtpServersSecondaryNtpServerAuthenticationTypeAutokey"]; ok {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.Autokey.Misc = o.Misc["NtpServersSecondaryNtpServerAuthenticationTypeAutokey"]
}
}
if o.NtpServers.SecondaryNtpServer.AuthenticationType.None != nil {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.None = &NtpServersSecondaryNtpServerAuthenticationTypeNoneXml{}
if _, ok := o.Misc["NtpServersSecondaryNtpServerAuthenticationTypeNone"]; ok {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.None.Misc = o.Misc["NtpServersSecondaryNtpServerAuthenticationTypeNone"]
}
}
if o.NtpServers.SecondaryNtpServer.AuthenticationType.SymmetricKey != nil {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.SymmetricKey = &NtpServersSecondaryNtpServerAuthenticationTypeSymmetricKeyXml{}
if _, ok := o.Misc["NtpServersSecondaryNtpServerAuthenticationTypeSymmetricKey"]; ok {
Expand Down Expand Up @@ -296,6 +284,18 @@ func specifyConfig(o *Config) (any, error) {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.SymmetricKey.KeyId = o.NtpServers.SecondaryNtpServer.AuthenticationType.SymmetricKey.KeyId
}
}
if o.NtpServers.SecondaryNtpServer.AuthenticationType.Autokey != nil {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.Autokey = &NtpServersSecondaryNtpServerAuthenticationTypeAutokeyXml{}
if _, ok := o.Misc["NtpServersSecondaryNtpServerAuthenticationTypeAutokey"]; ok {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.Autokey.Misc = o.Misc["NtpServersSecondaryNtpServerAuthenticationTypeAutokey"]
}
}
if o.NtpServers.SecondaryNtpServer.AuthenticationType.None != nil {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.None = &NtpServersSecondaryNtpServerAuthenticationTypeNoneXml{}
if _, ok := o.Misc["NtpServersSecondaryNtpServerAuthenticationTypeNone"]; ok {
nestedNtpServers.SecondaryNtpServer.AuthenticationType.None.Misc = o.Misc["NtpServersSecondaryNtpServerAuthenticationTypeNone"]
}
}
}
if o.NtpServers.SecondaryNtpServer.NtpServerAddress != nil {
nestedNtpServers.SecondaryNtpServer.NtpServerAddress = o.NtpServers.SecondaryNtpServer.NtpServerAddress
Expand Down Expand Up @@ -330,12 +330,6 @@ func (c *configXmlContainer) Normalize() ([]*Config, error) {
if o.NtpServers.PrimaryNtpServer.AuthenticationType.Misc != nil {
config.Misc["NtpServersPrimaryNtpServerAuthenticationType"] = o.NtpServers.PrimaryNtpServer.AuthenticationType.Misc
}
if o.NtpServers.PrimaryNtpServer.AuthenticationType.Autokey != nil {
nestedNtpServers.PrimaryNtpServer.AuthenticationType.Autokey = &NtpServersPrimaryNtpServerAuthenticationTypeAutokey{}
if o.NtpServers.PrimaryNtpServer.AuthenticationType.Autokey.Misc != nil {
config.Misc["NtpServersPrimaryNtpServerAuthenticationTypeAutokey"] = o.NtpServers.PrimaryNtpServer.AuthenticationType.Autokey.Misc
}
}
if o.NtpServers.PrimaryNtpServer.AuthenticationType.None != nil {
nestedNtpServers.PrimaryNtpServer.AuthenticationType.None = &NtpServersPrimaryNtpServerAuthenticationTypeNone{}
if o.NtpServers.PrimaryNtpServer.AuthenticationType.None.Misc != nil {
Expand Down Expand Up @@ -375,6 +369,12 @@ func (c *configXmlContainer) Normalize() ([]*Config, error) {
nestedNtpServers.PrimaryNtpServer.AuthenticationType.SymmetricKey.KeyId = o.NtpServers.PrimaryNtpServer.AuthenticationType.SymmetricKey.KeyId
}
}
if o.NtpServers.PrimaryNtpServer.AuthenticationType.Autokey != nil {
nestedNtpServers.PrimaryNtpServer.AuthenticationType.Autokey = &NtpServersPrimaryNtpServerAuthenticationTypeAutokey{}
if o.NtpServers.PrimaryNtpServer.AuthenticationType.Autokey.Misc != nil {
config.Misc["NtpServersPrimaryNtpServerAuthenticationTypeAutokey"] = o.NtpServers.PrimaryNtpServer.AuthenticationType.Autokey.Misc
}
}
}
if o.NtpServers.PrimaryNtpServer.NtpServerAddress != nil {
nestedNtpServers.PrimaryNtpServer.NtpServerAddress = o.NtpServers.PrimaryNtpServer.NtpServerAddress
Expand Down Expand Up @@ -555,10 +555,10 @@ func matchNtpServersPrimaryNtpServer(a *NtpServersPrimaryNtpServer, b *NtpServer
} else if a == nil && b == nil {
return true
}
if !util.StringsMatch(a.NtpServerAddress, b.NtpServerAddress) {
if !matchNtpServersPrimaryNtpServerAuthenticationType(a.AuthenticationType, b.AuthenticationType) {
return false
}
if !matchNtpServersPrimaryNtpServerAuthenticationType(a.AuthenticationType, b.AuthenticationType) {
if !util.StringsMatch(a.NtpServerAddress, b.NtpServerAddress) {
return false
}
return true
Expand Down Expand Up @@ -621,10 +621,10 @@ func matchNtpServersSecondaryNtpServerAuthenticationTypeSymmetricKey(a *NtpServe
} else if a == nil && b == nil {
return true
}
if !matchNtpServersSecondaryNtpServerAuthenticationTypeSymmetricKeyAlgorithm(a.Algorithm, b.Algorithm) {
if !util.Ints64Match(a.KeyId, b.KeyId) {
return false
}
if !util.Ints64Match(a.KeyId, b.KeyId) {
if !matchNtpServersSecondaryNtpServerAuthenticationTypeSymmetricKeyAlgorithm(a.Algorithm, b.Algorithm) {
return false
}
return true
Expand Down Expand Up @@ -652,10 +652,10 @@ func matchNtpServersSecondaryNtpServer(a *NtpServersSecondaryNtpServer, b *NtpSe
} else if a == nil && b == nil {
return true
}
if !matchNtpServersSecondaryNtpServerAuthenticationType(a.AuthenticationType, b.AuthenticationType) {
if !util.StringsMatch(a.NtpServerAddress, b.NtpServerAddress) {
return false
}
if !util.StringsMatch(a.NtpServerAddress, b.NtpServerAddress) {
if !matchNtpServersSecondaryNtpServerAuthenticationType(a.AuthenticationType, b.AuthenticationType) {
return false
}
return true
Expand All @@ -666,10 +666,10 @@ func matchNtpServers(a *NtpServers, b *NtpServers) bool {
} else if a == nil && b == nil {
return true
}
if !matchNtpServersPrimaryNtpServer(a.PrimaryNtpServer, b.PrimaryNtpServer) {
if !matchNtpServersSecondaryNtpServer(a.SecondaryNtpServer, b.SecondaryNtpServer) {
return false
}
if !matchNtpServersSecondaryNtpServer(a.SecondaryNtpServer, b.SecondaryNtpServer) {
if !matchNtpServersPrimaryNtpServer(a.PrimaryNtpServer, b.PrimaryNtpServer) {
return false
}
return true
Expand Down
Loading

0 comments on commit 6c5f32c

Please sign in to comment.