mirror of
https://github.com/Control-D-Inc/ctrld.git
synced 2026-04-07 12:32:04 +02:00
1cd54a48e9
Currently, on routers that require NTP waiting, ctrld makes the cleanup process, and restart dnsmasq for restoring default DNS config, so ntpd can query the NTP servers. It did work, but the code will depends on router platforms. Instead, we can spawn a plain DNS listener before PreRun on routers, this listener will serve NTP dns queries and once ntp is configured, the listener is terminated and ctrld will start serving using its configured upstreams. While at it, also fix the userHomeDir function on freshtomato, which must return the binary directory for routers that requires JFFS.
83 lines
1.8 KiB
Go
83 lines
1.8 KiB
Go
package router
|
|
|
|
import (
|
|
"fmt"
|
|
"os/exec"
|
|
)
|
|
|
|
const (
|
|
tomatoDnsCryptProxySvcName = "dnscrypt-proxy"
|
|
tomatoStubbySvcName = "stubby"
|
|
tomatoDNSMasqSvcName = "dnsmasq"
|
|
)
|
|
|
|
func setupTomato() error {
|
|
// Already setup.
|
|
if val, _ := nvram("get", nvramCtrldSetupKey); val == "1" {
|
|
return nil
|
|
}
|
|
|
|
data, err := dnsMasqConf()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
nvramKvMap := nvramSetupKV()
|
|
nvramKvMap["dnsmasq_custom"] = data
|
|
if err := nvramSetKV(nvramKvMap, nvramCtrldSetupKey); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Restart dnscrypt-proxy service.
|
|
if err := tomatoRestartServiceWithKill(tomatoDnsCryptProxySvcName, true); err != nil {
|
|
return err
|
|
}
|
|
// Restart stubby service.
|
|
if err := tomatoRestartService(tomatoStubbySvcName); err != nil {
|
|
return err
|
|
}
|
|
// Restart dnsmasq service.
|
|
if err := restartDNSMasq(); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func postInstallTomato() error {
|
|
return nil
|
|
}
|
|
|
|
func cleanupTomato() error {
|
|
// Restore old configs.
|
|
if err := nvramRestore(nvramSetupKV(), nvramCtrldSetupKey); err != nil {
|
|
return err
|
|
}
|
|
// Restart dnscrypt-proxy service.
|
|
if err := tomatoRestartServiceWithKill(tomatoDnsCryptProxySvcName, true); err != nil {
|
|
return err
|
|
}
|
|
// Restart stubby service.
|
|
if err := tomatoRestartService(tomatoStubbySvcName); err != nil {
|
|
return err
|
|
}
|
|
// Restart dnsmasq service.
|
|
if err := restartDNSMasq(); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func tomatoRestartService(name string) error {
|
|
return tomatoRestartServiceWithKill(name, false)
|
|
}
|
|
|
|
func tomatoRestartServiceWithKill(name string, killBeforeRestart bool) error {
|
|
if killBeforeRestart {
|
|
_, _ = exec.Command("killall", name).CombinedOutput()
|
|
}
|
|
if out, err := exec.Command("service", name, "restart").CombinedOutput(); err != nil {
|
|
return fmt.Errorf("service restart %s: %s, %w", name, string(out), err)
|
|
}
|
|
return nil
|
|
}
|