vanja/gluetun
1
0
Fork 0
mirror of https://github.com/qdm12/gluetun.git synced 2026-05-07 04:20:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

hotfix(amnezia): fix settings reading (nil pointer panic)

Browse Source
This commit is contained in:
Quentin McGaw
2026-03-11 16:23:50 +00:00
parent 97ccadfd33
commit ba9fcb5b89
1 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/configuration/settings/amneziawg.go
+21 -26
View File
@@ -30,41 +30,36 @@ type AmneziaWg struct {
InitPacketI5 *string `json:"init_packet_i5"` InitPacketI5 *string `json:"init_packet_i5"`
} }
func (s *AmneziaWg) read(r *reader.Reader) error { func (s *AmneziaWg) read(r *reader.Reader) (err error) {
uint16Fields := map[string]*uint16{ uint16Fields := map[string]**uint16{
"AMNEZIAWG_JC": s.JunkPacketCount, "AMNEZIAWG_JC": &s.JunkPacketCount,
"AMNEZIAWG_JMIN": s.JunkPacketMin, "AMNEZIAWG_JMIN": &s.JunkPacketMin,
"AMNEZIAWG_JMAX": s.JunkPacketMax, "AMNEZIAWG_JMAX": &s.JunkPacketMax,
"AMNEZIAWG_S1": s.PaddingS1, "AMNEZIAWG_S1": &s.PaddingS1,
"AMNEZIAWG_S2": s.PaddingS2, "AMNEZIAWG_S2": &s.PaddingS2,
"AMNEZIAWG_S3": s.PaddingS3, "AMNEZIAWG_S3": &s.PaddingS3,
"AMNEZIAWG_S4": s.PaddingS4, "AMNEZIAWG_S4": &s.PaddingS4,
} }
for key, dst := range uint16Fields { for key, dst := range uint16Fields {
v, err := r.Uint16Ptr(key) *dst, err = r.Uint16Ptr(key)
if err != nil { if err != nil {
return err return err
} else if v != nil {
*dst = *v
} }
} }
stringFields := map[string]*string{ stringFields := map[string]**string{
"AMNEZIAWG_H1": s.HeaderH1, "AMNEZIAWG_H1": &s.HeaderH1,
"AMNEZIAWG_H2": s.HeaderH2, "AMNEZIAWG_H2": &s.HeaderH2,
"AMNEZIAWG_H3": s.HeaderH3, "AMNEZIAWG_H3": &s.HeaderH3,
"AMNEZIAWG_H4": s.HeaderH4, "AMNEZIAWG_H4": &s.HeaderH4,
"AMNEZIAWG_I1": s.InitPacketI1, "AMNEZIAWG_I1": &s.InitPacketI1,
"AMNEZIAWG_I2": s.InitPacketI2, "AMNEZIAWG_I2": &s.InitPacketI2,
"AMNEZIAWG_I3": s.InitPacketI3, "AMNEZIAWG_I3": &s.InitPacketI3,
"AMNEZIAWG_I4": s.InitPacketI4, "AMNEZIAWG_I4": &s.InitPacketI4,
"AMNEZIAWG_I5": s.InitPacketI5, "AMNEZIAWG_I5": &s.InitPacketI5,
} }
opt := reader.ForceLowercase(false) opt := reader.ForceLowercase(false)
for key, dst := range stringFields { for key, dst := range stringFields {
v := r.Get(key, opt) *dst = r.Get(key, opt)
if v != nil {
*dst = *v
}
} }
return nil return nil
} }