CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-08-10 13:20:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

all: rework fetching/generating config in cd mode

Browse Source 
Config fetching/generating in cd mode is currently weird, error prone,
and easy for user to break ctrld when using custom config.

This commit reworks the flow:

 - Fetching config from Control D API.
 - No custom config, use the current default config.
 - If custom config presents, but there's no listener, use 0.0.0.0:53.
 - Try listening on current ip+port config, if ok, ctrld could be a
   direct listener with current setup, moving on.
 - If failed, trying 127.0.0.1:53.
 - If failed, trying current ip + port 5354
 - If still failed, pick a random ip:port pair, retry until listening ok.

With this flow, thing is more predictable/stable, and help removing the
Config interface for router.
This commit is contained in:
Cuong Manh Le
2023-08-09 23:54:23 +07:00
committed by Cuong Manh Le
parent 3f3c1d6d78
commit 7af59ee589
23 changed files with 442 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/router/openwrt/openwrt.go
-6
View File
@@ -48,12 +48,6 @@ func (o *Openwrt) PreRun() error {
return nil
}
func (o *Openwrt) Configure() error {
o.cfg.Listener["0"].IP = "127.0.0.1"
o.cfg.Listener["0"].Port = 5354
return nil
}
func (o *Openwrt) Setup() error {
// Delete dnsmasq port if set.
if _, err := uci("delete", "dhcp.@dnsmasq[0].port"); err != nil && !errors.Is(err, errUCIEntryNotFound) {