mirrors/doh-server
1
0
Fork 0
mirror of https://github.com/DNSCrypt/doh-server.git synced 2025-04-04 21:47:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Default bind to IPv6 socket if connecting to server over IPv6

Browse source 
Fixes #37
This commit is contained in:
Frank Denis 2019-10-13 12:57:32 +02:00
parent 7bd2bf2131
commit 37d40e88a3
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main.rs
View file

@ -17,7 +17,7 @@ use hyper::server::conn::Http;
use hyper::service::Service; use hyper::service::Service;
use hyper::{Body, Method, Request, Response, StatusCode}; use hyper::{Body, Method, Request, Response, StatusCode};
use std::io; use std::io;
use std::net::{SocketAddr, ToSocketAddrs}; use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
#[cfg(feature = "tls")] #[cfg(feature = "tls")]
use native_tls::{self, Identity}; use native_tls::{self, Identity};
@ -43,7 +43,6 @@ use tokio_tls::TlsAcceptor;
const BLOCK_SIZE: usize = 128; const BLOCK_SIZE: usize = 128;
const DNS_QUERY_PARAM: &str = "dns"; const DNS_QUERY_PARAM: &str = "dns";
const LISTEN_ADDRESS: &str = "127.0.0.1:3000"; const LISTEN_ADDRESS: &str = "127.0.0.1:3000";
const LOCAL_BIND_ADDRESS: &str = "0.0.0.0:0";
const MAX_CLIENTS: usize = 512; const MAX_CLIENTS: usize = 512;
const MAX_DNS_QUESTION_LEN: usize = 512; const MAX_DNS_QUESTION_LEN: usize = 512;
const MAX_DNS_RESPONSE_LEN: usize = 4096; const MAX_DNS_RESPONSE_LEN: usize = 4096;
@ -442,7 +441,7 @@ fn main() {
tls_cert_password: None, tls_cert_password: None,
listen_address: LISTEN_ADDRESS.parse().unwrap(), listen_address: LISTEN_ADDRESS.parse().unwrap(),
local_bind_address: LOCAL_BIND_ADDRESS.parse().unwrap(), local_bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), 0),
server_address: SERVER_ADDRESS.parse().unwrap(), server_address: SERVER_ADDRESS.parse().unwrap(),
path: PATH.to_string(), path: PATH.to_string(),
max_clients: MAX_CLIENTS, max_clients: MAX_CLIENTS,
@ -524,7 +523,6 @@ fn parse_opts(inner_doh: &mut InnerDoH) {
.short("b") .short("b")
.long("local-bind-address") .long("local-bind-address")
.takes_value(true) .takes_value(true)
.default_value(LOCAL_BIND_ADDRESS)
.validator(verify_sock_addr) .validator(verify_sock_addr)
.help("Address to connect from"), .help("Address to connect from"),
) )
@ -616,11 +614,18 @@ fn parse_opts(inner_doh: &mut InnerDoH) {
.unwrap() .unwrap()
.next() .next()
.unwrap(); .unwrap();
inner_doh.local_bind_address = matches inner_doh.local_bind_address = match matches.value_of("local_bind_address") {
.value_of("local_bind_address") Some(address) => address.parse().unwrap(),
.unwrap() None => match inner_doh.server_address {
.parse() SocketAddr::V4(_) => SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0)),
.unwrap(); SocketAddr::V6(s) => SocketAddr::V6(SocketAddrV6::new(
Ipv6Addr::UNSPECIFIED,
0,
s.flowinfo(),
s.scope_id(),
)),
},
};
inner_doh.path = matches.value_of("path").unwrap().to_string(); inner_doh.path = matches.value_of("path").unwrap().to_string();
if !inner_doh.path.starts_with('/') { if !inner_doh.path.starts_with('/') {
inner_doh.path = format!("/{}", inner_doh.path); inner_doh.path = format!("/{}", inner_doh.path);