mirror of
https://github.com/Control-D-Inc/ctrld.git
synced 2026-07-04 01:07:49 +02:00
internal/router/openwrt: ensure dnsmasq cache is disabled
Users may have their own dnsmasq cache set via LUCI web, thus ctrld needs to delete the cache-size setting to ensure its dnsmasq config works.
This commit is contained in:
committed by
Cuong Manh Le
parent
c3b4ae9c79
commit
294a90a807
@@ -1,9 +1,12 @@
|
|||||||
package openwrt
|
package openwrt
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/kardianos/service"
|
"github.com/kardianos/service"
|
||||||
|
|
||||||
@@ -17,7 +20,8 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Openwrt struct {
|
type Openwrt struct {
|
||||||
cfg *ctrld.Config
|
cfg *ctrld.Config
|
||||||
|
dnsmasqCacheSize string
|
||||||
}
|
}
|
||||||
|
|
||||||
// New returns a router.Router for configuring/setup/run ctrld on Openwrt routers.
|
// New returns a router.Router for configuring/setup/run ctrld on Openwrt routers.
|
||||||
@@ -46,6 +50,19 @@ func (o *Openwrt) Setup() error {
|
|||||||
if o.cfg.FirstListener().IsDirectDnsListener() {
|
if o.cfg.FirstListener().IsDirectDnsListener() {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Save current dnsmasq config cache size if present.
|
||||||
|
if cs, err := uci("get", "dhcp.@dnsmasq[0].cachesize"); err == nil {
|
||||||
|
o.dnsmasqCacheSize = cs
|
||||||
|
if _, err := uci("delete", "dhcp.@dnsmasq[0].cachesize"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Commit.
|
||||||
|
if _, err := uci("commit", "dhcp"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
data, err := dnsmasq.ConfTmpl(dnsmasq.ConfigContentTmpl, o.cfg)
|
data, err := dnsmasq.ConfTmpl(dnsmasq.ConfigContentTmpl, o.cfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -68,6 +85,18 @@ func (o *Openwrt) Cleanup() error {
|
|||||||
if err := os.Remove(openwrtDNSMasqConfigPath); err != nil {
|
if err := os.Remove(openwrtDNSMasqConfigPath); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Restore original value if present.
|
||||||
|
if o.dnsmasqCacheSize != "" {
|
||||||
|
if _, err := uci("set", fmt.Sprintf("dhcp.@dnsmasq[0].cachesize=%s", o.dnsmasqCacheSize)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Commit.
|
||||||
|
if _, err := uci("commit", "dhcp"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Restart dnsmasq service.
|
// Restart dnsmasq service.
|
||||||
if err := restartDNSMasq(); err != nil {
|
if err := restartDNSMasq(); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -81,3 +110,19 @@ func restartDNSMasq() error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var errUCIEntryNotFound = errors.New("uci: Entry not found")
|
||||||
|
|
||||||
|
func uci(args ...string) (string, error) {
|
||||||
|
cmd := exec.Command("uci", args...)
|
||||||
|
var stdout, stderr bytes.Buffer
|
||||||
|
cmd.Stdout = &stdout
|
||||||
|
cmd.Stderr = &stderr
|
||||||
|
if err := cmd.Run(); err != nil {
|
||||||
|
if strings.HasPrefix(stderr.String(), errUCIEntryNotFound.Error()) {
|
||||||
|
return "", errUCIEntryNotFound
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("%s:%w", stderr.String(), err)
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(stdout.String()), nil
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user