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(amneziawg): fix errors (#3240)

Browse Source
This commit is contained in:
Zhurik
2026-03-22 01:24:03 +03:00
committed by GitHub
parent 5e6c11b045
commit 8a2e8bda0f
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/configuration/settings/serverselection.go
+2 -1
View File
@@ -518,7 +518,8 @@ func (ss *ServerSelection) read(r *reader.Reader,
return err return err
} }
err = ss.Wireguard.read(r) amneziawg := ss.VPN == vpn.AmneziaWg
err = ss.Wireguard.read(r, amneziawg)
if err != nil { if err != nil {
return err return err
} }
internal/configuration/settings/wireguardselection.go
+8 -4
View File
@@ -152,18 +152,22 @@ func (w WireguardSelection) toLinesNode() (node *gotree.Node) {
return node return node
} }
func (w *WireguardSelection) read(r *reader.Reader) (err error) { func (w *WireguardSelection) read(r *reader.Reader, amneziaWG bool) (err error) {
w.EndpointIP, err = r.NetipAddr("WIREGUARD_ENDPOINT_IP", reader.RetroKeys("VPN_ENDPOINT_IP")) prefix := "WIREGUARD"
if amneziaWG {
prefix = "AMNEZIAWG"
}
w.EndpointIP, err = r.NetipAddr(prefix+"_ENDPOINT_IP", reader.RetroKeys("VPN_ENDPOINT_IP"))
if err != nil { if err != nil {
return fmt.Errorf("%w - note this MUST be an IP address, "+ return fmt.Errorf("%w - note this MUST be an IP address, "+
"see https://github.com/qdm12/gluetun/issues/788", err) "see https://github.com/qdm12/gluetun/issues/788", err)
} }
w.EndpointPort, err = r.Uint16Ptr("WIREGUARD_ENDPOINT_PORT", reader.RetroKeys("VPN_ENDPOINT_PORT")) w.EndpointPort, err = r.Uint16Ptr(prefix+"_ENDPOINT_PORT", reader.RetroKeys("VPN_ENDPOINT_PORT"))
if err != nil { if err != nil {
return err return err
} }
w.PublicKey = r.String("WIREGUARD_PUBLIC_KEY", reader.ForceLowercase(false)) w.PublicKey = r.String(prefix+"_PUBLIC_KEY", reader.ForceLowercase(false))
return nil return nil
} }
internal/pmtud/vpn.go
+1 -1
View File
@@ -29,7 +29,7 @@ func MaxTheoreticalVPNMTU(vpnType, network string, vpnGateway netip.Addr) uint32
panic("unknown network protocol: " + network) panic("unknown network protocol: " + network)
} }
switch vpnType { switch vpnType {
case vpn.Wireguard: case vpn.Wireguard, vpn.AmneziaWg:
vpnLinkMTU -= pconstants.WireguardHeaderLength vpnLinkMTU -= pconstants.WireguardHeaderLength
case vpn.OpenVPN: case vpn.OpenVPN:
vpnLinkMTU -= pconstants.OpenVPNHeaderMaxLength vpnLinkMTU -= pconstants.OpenVPNHeaderMaxLength
internal/provider/custom/connection.go
+1 -1
View File
@@ -19,7 +19,7 @@ func (p *Provider) GetConnection(selection settings.ServerSelection, _ bool) (
switch selection.VPN { switch selection.VPN {
case vpn.OpenVPN: case vpn.OpenVPN:
return getOpenVPNConnection(p.extractor, selection) return getOpenVPNConnection(p.extractor, selection)
case vpn.Wireguard: case vpn.Wireguard, vpn.AmneziaWg:
return getWireguardConnection(selection), nil return getWireguardConnection(selection), nil
default: default:
return connection, fmt.Errorf("%w: %s", ErrVPNTypeNotSupported, selection.VPN) return connection, fmt.Errorf("%w: %s", ErrVPNTypeNotSupported, selection.VPN)
internal/provider/utils/pick.go
+1 -1
View File
@@ -30,7 +30,7 @@ func pickConnection(connections []models.Connection,
switch selection.VPN { switch selection.VPN {
case vpn.OpenVPN: case vpn.OpenVPN:
targetIP = selection.OpenVPN.EndpointIP targetIP = selection.OpenVPN.EndpointIP
case vpn.Wireguard: case vpn.Wireguard, vpn.AmneziaWg:
targetIP = selection.Wireguard.EndpointIP targetIP = selection.Wireguard.EndpointIP
default: default:
panic("unknown VPN type: " + selection.VPN) panic("unknown VPN type: " + selection.VPN)