dswd
/
vpncloud
mirror of https://github.com/dswd/vpncloud.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow to use minus instead of underscore

This commit is contained in:
Dennis Schwerdel 2020-06-30 17:38:33 +02:00
parent 94c80acae1
commit 0cead0fd08
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/config.rs
View File

@ -13,9 +13,9 @@ use super::{
use siphasher::sip::SipHasher24; use siphasher::sip::SipHasher24;
use std::{ use std::{
cmp::max,
hash::{Hash, Hasher}, hash::{Hash, Hasher},
net::{IpAddr, Ipv6Addr, SocketAddr}, net::{IpAddr, Ipv6Addr, SocketAddr}
cmp::max
}; };
@ -294,29 +294,43 @@ impl Config {
#[derive(Serialize, Deserialize, Debug, PartialEq, Default)] #[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
pub struct ConfigFile { pub struct ConfigFile {
#[serde(alias = "device-type")]
pub device_type: Option<Type>, pub device_type: Option<Type>,
#[serde(alias = "device-name")]
pub device_name: Option<String>, pub device_name: Option<String>,
#[serde(alias = "device-path")]
pub device_path: Option<String>, pub device_path: Option<String>,
pub ifup: Option<String>, pub ifup: Option<String>,
pub ifdown: Option<String>, pub ifdown: Option<String>,
pub crypto: Option<CryptoMethod>, pub crypto: Option<CryptoMethod>,
#[serde(alias = "shared-key")]
pub shared_key: Option<String>, pub shared_key: Option<String>,
pub magic: Option<String>, pub magic: Option<String>,
pub port: Option<u16>, pub port: Option<u16>,
pub listen: Option<String>, pub listen: Option<String>,
pub peers: Option<Vec<String>>, pub peers: Option<Vec<String>>,
#[serde(alias = "peer-timeout")]
pub peer_timeout: Option<Duration>, pub peer_timeout: Option<Duration>,
pub keepalive: Option<Duration>, pub keepalive: Option<Duration>,
#[serde(alias = "beacon-store")]
pub beacon_store: Option<String>, pub beacon_store: Option<String>,
#[serde(alias = "beacon-load")]
pub beacon_load: Option<String>, pub beacon_load: Option<String>,
#[serde(alias = "beacon-interval")]
pub beacon_interval: Option<Duration>, pub beacon_interval: Option<Duration>,
pub mode: Option<Mode>, pub mode: Option<Mode>,
#[serde(alias = "dst-timeout")]
pub dst_timeout: Option<Duration>, pub dst_timeout: Option<Duration>,
pub subnets: Option<Vec<String>>, pub subnets: Option<Vec<String>>,
#[serde(alias = "port-forwarding")]
pub port_forwarding: Option<bool>, pub port_forwarding: Option<bool>,
#[serde(alias = "pid-file")]
pub pid_file: Option<String>, pub pid_file: Option<String>,
#[serde(alias = "stats-file")]
pub stats_file: Option<String>, pub stats_file: Option<String>,
#[serde(alias = "statsd-server")]
pub statsd_server: Option<String>, pub statsd_server: Option<String>,
#[serde(alias = "statsd-prefix")]
pub statsd_prefix: Option<String>, pub statsd_prefix: Option<String>,
pub user: Option<String>, pub user: Option<String>,
pub group: Option<String> pub group: Option<String>