claw-daemon/clawd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: kill NetworkManager's dnsmasq before starting our own

Browse Source 
NetworkManager auto-starts its own dnsmasq when creating a hotspot,
which conflicts with our DNS-hijacking dnsmasq on the same interface.
Now kill ALL dnsmasq instances before starting ours.

Made-with: Cursor
This commit is contained in:
stswangzhiping
2026-03-16 11:19:04 +08:00
parent 92906bcd4b
commit 7a80c03028
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.commitmsg
View File

@@ -1,4 +1,5 @@
fix: set AP hotspot password to fixed WPA2 PSK "12345678" fix: kill NetworkManager's dnsmasq before starting our own
Open network was not viable as nmcli generates random password by default. NetworkManager auto-starts its own dnsmasq when creating a hotspot,
Use a simple fixed password since the AP is only for short-lived provisioning. which conflicts with our DNS-hijacking dnsmasq on the same interface.
Now kill ALL dnsmasq instances before starting ours.

8
lib/dns-hijack.js
View File

@@ -61,8 +61,10 @@ class DnsHijack {
fs.writeFileSync(DNSMASQ_CONF, conf, 'utf8'); fs.writeFileSync(DNSMASQ_CONF, conf, 'utf8');
log.info('dns', `dnsmasq 配置已写入: ${DNSMASQ_CONF}`); log.info('dns', `dnsmasq 配置已写入: ${DNSMASQ_CONF}`);
// 终止系统可能残留的 dnsmasq // 终止所有 dnsmasq（包括 NetworkManager 自动启动的）
try { execSync('pkill -f "dnsmasq.*clawd"', { timeout: 3000 }); } catch (_) {} try { execSync('pkill -9 dnsmasq', { timeout: 3000 }); } catch (_) {}
// 等待端口释放
try { execSync('sleep 1'); } catch (_) {}
// 查找 dnsmasq 二进制（/usr/sbin 可能不在普通用户 PATH 中） // 查找 dnsmasq 二进制（/usr/sbin 可能不在普通用户 PATH 中）
const dnsmasqBin = findBin('dnsmasq'); const dnsmasqBin = findBin('dnsmasq');
@@ -90,7 +92,7 @@ class DnsHijack {
this._watchdog.stop(); this._watchdog.stop();
this._watchdog = null; this._watchdog = null;
} }
try { execSync('pkill -f "dnsmasq.*clawd"', { timeout: 3000 }); } catch (_) {} try { execSync('pkill -9 dnsmasq', { timeout: 3000 }); } catch (_) {}
try { fs.unlinkSync(DNSMASQ_CONF); } catch (_) {} try { fs.unlinkSync(DNSMASQ_CONF); } catch (_) {}
} }
} }