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

feat(openvpn): add support for openvpn 2.6

Browse Source
This commit is contained in:
Quentin McGaw
2023-05-21 13:23:51 +00:00
parent e8f2296a0d
commit 3b807e2ca9
8 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/openvpn/start.go
View File

@@ -15,6 +15,7 @@ var ErrVersionUnknown = errors.New("OpenVPN version is unknown")
const (
binOpenvpn25 = "openvpn2.5"
binOpenvpn26 = "openvpn2.6"
)
func start(ctx context.Context, starter command.Starter, version string, flags []string) (
@@ -23,6 +24,8 @@ func start(ctx context.Context, starter command.Starter, version string, flags [
switch version {
case openvpn.Openvpn25:
bin = binOpenvpn25
case openvpn.Openvpn26:
bin = binOpenvpn26
default:
return nil, nil, nil, fmt.Errorf("%w: %s", ErrVersionUnknown, version)
}

4
internal/openvpn/version.go
View File

@@ -12,6 +12,10 @@ func (c *Configurator) Version25(ctx context.Context) (version string, err error
return c.version(ctx, binOpenvpn25)
}
func (c *Configurator) Version26(ctx context.Context) (version string, err error) {
return c.version(ctx, binOpenvpn26)
}
var ErrVersionTooShort = errors.New("version output is too short")
func (c *Configurator) version(ctx context.Context, binName string) (version string, err error) {