public-collect/updns
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change default dns server

Browse Source
This commit is contained in:
wyhaya
2019-09-02 16:37:12 +08:00
parent e518617c7b
commit 78b6b7d90a
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.rs
View File

@@ -24,7 +24,7 @@ use watch::Watch;
const CONFIG_NAME: &str = ".updns/config"; const CONFIG_NAME: &str = ".updns/config";
const DEFAULT_BIND: &str = "0.0.0.0:53"; const DEFAULT_BIND: &str = "0.0.0.0:53";
const DEFAULT_PROXY: [&str; 2] = ["8.8.8.8:53", "114.114.114.114:53"]; const DEFAULT_PROXY: [&str; 2] = ["8.8.8.8:53", "1.1.1.1:53"];
const PROXY_TIMEOUT: u64 = 2000; const PROXY_TIMEOUT: u64 = 2000;
const WATCH_INTERVAL: u64 = 3000; const WATCH_INTERVAL: u64 = 3000;
static mut PROXY: Vec<SocketAddr> = Vec::new(); static mut PROXY: Vec<SocketAddr> = Vec::new();
@@ -117,9 +117,7 @@ fn main() {
exit!("'rm' value: [DOMAIN | IP]"); exit!("'rm' value: [DOMAIN | IP]");
} }
match ask("Confirm delete? Y/N\n") { match ask("Confirm delete? Y/N\n") {
Ok(d) => { Ok(_) => log!("todo"),
log!("todo");
}
Err(err) => exit!("{:?}", err), Err(err) => exit!("{:?}", err),
} }
} }
@@ -204,11 +202,11 @@ fn ask(tips: &str) -> io::Result<bool> {
let mut s = String::new(); let mut s = String::new();
io::stdin().read_line(&mut s)?; io::stdin().read_line(&mut s)?;
return match s.to_uppercase().as_str() { match s.to_uppercase().as_str() {
"Y\n" => Ok(true), "Y\n" => Ok(true),
"N\n" => Ok(false), "N\n" => Ok(false),
_ => Ok(ask(&tips)?), _ => Ok(ask(&tips)?),
}; }
} }
fn update_config(mut proxy: Vec<SocketAddr>, hosts: Hosts) { fn update_config(mut proxy: Vec<SocketAddr>, hosts: Hosts) {
@@ -257,7 +255,7 @@ fn output_invalid(errors: Vec<Invalid>) {
async fn watch_config(p: PathBuf) { async fn watch_config(p: PathBuf) {
let mut watch = Watch::new(p, WATCH_INTERVAL); let mut watch = Watch::new(p, WATCH_INTERVAL);
watch watch
.change(|c| { .for_each(|c| {
log!("Reload the configuration file: {:?}", &c); log!("Reload the configuration file: {:?}", &c);
if let Ok(mut config) = Config::new(c) { if let Ok(mut config) = Config::new(c) {
if let Ok((_, proxy, hosts, errors)) = config.parse() { if let Ok((_, proxy, hosts, errors)) = config.parse() {

2
src/watch.rs
View File

@@ -22,7 +22,7 @@ impl Watch {
Ok(modified) Ok(modified)
} }
pub async fn change(&mut self, func: fn(path: &PathBuf)) { pub async fn for_each(&mut self, func: fn(path: &PathBuf)) {
let mut repeat = stream::repeat(0); let mut repeat = stream::repeat(0);
let mut before = match self.modified().await { let mut before = match self.modified().await {
Ok(time) => Some(time), Ok(time) => Some(time),