admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(shadowsocks): bump from v0.4.0 to v0.5.0-rc1

Browse Source
This commit is contained in:
Quentin McGaw
2023-05-31 14:26:31 +00:00
parent 7399c00508
commit 2ab80771d9
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/configuration/settings/shadowsocks.go
View File

@@ -30,7 +30,7 @@ func (s *Shadowsocks) copy() (copied Shadowsocks) {
// unset field of the receiver settings object.
func (s *Shadowsocks) mergeWith(other Shadowsocks) {
s.Enabled = gosettings.MergeWithPointer(s.Enabled, other.Enabled)
s.Settings.MergeWith(other.Settings)
s.Settings = s.Settings.MergeWith(other.Settings)
}
// overrideWith overrides fields of the receiver
@@ -59,7 +59,7 @@ func (s Shadowsocks) toLinesNode() (node *gotree.Node) {
}
// TODO have ToLinesNode in qdm12/ss-server
node.Appendf("Listening address: %s", s.Address)
node.Appendf("Listening address: %s", *s.Address)
node.Appendf("Cipher: %s", s.CipherName)
node.Appendf("Password: %s", gosettings.ObfuscateKey(*s.Password))
node.Appendf("Log addresses: %s", gosettings.BoolToYesNo(s.LogAddresses))