Code maintenance: Unix abstraction interface

- Used for creating the tun device if it does not exist
- Mocks generated for testing
This commit is contained in:
Quentin McGaw
2020-12-29 01:02:47 +00:00
parent 8dd38fd182
commit 7058373916
7 changed files with 108 additions and 11 deletions

View File

@@ -5,9 +5,9 @@ import (
"io"
"github.com/qdm12/gluetun/internal/os"
"github.com/qdm12/gluetun/internal/unix"
"github.com/qdm12/golibs/command"
"github.com/qdm12/golibs/logging"
"golang.org/x/sys/unix"
)
type Configurator interface {
@@ -22,16 +22,14 @@ type configurator struct {
logger logging.Logger
commander command.Commander
os os.OS
mkDev func(major uint32, minor uint32) uint64
mkNod func(path string, mode uint32, dev int) error
unix unix.Unix
}
func NewConfigurator(logger logging.Logger, os os.OS) Configurator {
func NewConfigurator(logger logging.Logger, os os.OS, unix unix.Unix) Configurator {
return &configurator{
logger: logger.WithPrefix("openvpn configurator: "),
commander: command.NewCommander(),
os: os,
mkDev: unix.Mkdev,
mkNod: unix.Mknod,
unix: unix,
}
}

View File

@@ -5,7 +5,7 @@ import (
"os"
"github.com/qdm12/gluetun/internal/constants"
"golang.org/x/sys/unix"
"github.com/qdm12/gluetun/internal/unix"
)
// CheckTUN checks the tunnel device is present and accessible.
@@ -31,8 +31,8 @@ func (c *configurator) CreateTUN() error {
major = 10
minor = 200
)
dev := c.mkDev(major, minor)
if err := c.mkNod(string(constants.TunnelDevice), unix.S_IFCHR, int(dev)); err != nil {
dev := c.unix.Mkdev(major, minor)
if err := c.unix.Mknod(string(constants.TunnelDevice), unix.S_IFCHR, int(dev)); err != nil {
return err
}