Merge pull request #43 from tox-rs/tcp_limit

Add limit for TCP connections count

Author: kpp

Cargo.lock

@@ -30,7 +30,7 @@ config = "0.9"
 serde = "1.0"
 serde_derive = "1.0"
 serde_yaml = "0.8.8"
-tox = "0.0.8"
+tox = { git = "https://github.com/tox-rs/tox.git" }
 
 [target.'cfg(unix)'.dependencies]
 syslog = "4.0"

Cargo.toml

@@ -82,6 +82,7 @@ keys-file: ./keys
 udp-address: 0.0.0.0:33445
 tcp-addresses:
   - 0.0.0.0:33445
+tcp-connections-limit: 512
 motd: "{{start_date}} {{uptime}} Tcp: incoming {{tcp_packets_in}}, outgoing {{tcp_packets_out}}, Udp: incoming {{udp_packets_in}}, outgoing {{udp_packets_out}}"
 bootstrap-nodes:
   - pk: 1D5A5F2F5D6233058BF0259B09622FB40B482E4FA0931EB8FD3AB8E7BF7DAF6F

README.md

@@ -192,7 +192,7 @@ fn run_tcp(config: &NodeConfig, dht_sk: SecretKey, tcp_onion: TcpOnion, stats: S
         let tcp_server_c = tcp_server_c.clone();
         let dht_sk = dht_sk.clone();
         let listener = TcpListener::bind(&addr).expect("Failed to bind TCP listener");
-        tcp_server_c.run(listener, dht_sk, stats.clone())
+        tcp_server_c.run(listener, dht_sk, stats.clone(), config.tcp_connections_limit)
             .map_err(Error::from)
     });
 

src/main.rs

@@ -112,6 +112,9 @@ pub struct NodeConfig {
     #[serde(rename = "tcp-addresses")]
     #[serde(default)]
     pub tcp_addrs: Vec<SocketAddr>,
+    /// Maximum number of active TCP connections relay can hold.
+    #[serde(rename = "tcp-connections-limit")]
+    pub tcp_connections_limit: usize,
     /// DHT SecretKey
     #[serde(skip_deserializing)]
     pub sk: Option<SecretKey>,
@@ -172,6 +175,13 @@ pub fn cli_parse() -> NodeConfig {
             .takes_value(true)
             .use_delimiter(true)
             .required_unless("udp-address"))
+        .arg(Arg::with_name("tcp-connections-limit")
+            .short("c")
+            .long("tcp-connections-limit")
+            .help("Maximum number of active TCP connections relay can hold")
+            .requires("tcp-address")
+            .takes_value(true)
+            .default_value("512"))
         .arg(Arg::with_name("secret-key")
             .short("s")
             .long("secret-key")
@@ -250,6 +260,7 @@ fn parse_config(config_path: &str) -> NodeConfig {
     settings.set_default("motd", "This is tox-rs").expect("Can't set default value for `motd`");
     settings.set_default("lan-discovery", "False").expect("Can't set default value for `lan-discovery`");
     settings.set_default("threads", "1").expect("Can't set default value for `threads`");
+    settings.set_default("tcp-connections-limit", "512").expect("Can't set default value for `tcp-connections-limit`");
 
     let config_file = if !Path::new(config_path).exists() {
         panic!("Can't find config file {}", config_path);
@@ -287,6 +298,8 @@ fn run_args(matches: &ArgMatches) -> NodeConfig {
         Vec::new()
     };
 
+    let tcp_connections_limit = value_t!(matches.value_of("tcp-connections-limit"), usize).unwrap_or_else(|e| e.exit());
+
     let sk = matches.value_of("secret-key").map(|s| {
         let sk_bytes: [u8; 32] = FromHex::from_hex(s).expect("Invalid DHT secret key");
         SecretKey::from_slice(&sk_bytes).expect("Invalid DHT secret key")
@@ -325,6 +338,7 @@ fn run_args(matches: &ArgMatches) -> NodeConfig {
     NodeConfig {
         udp_addr,
         tcp_addrs,
+        tcp_connections_limit,
         sk,
         sk_passed_as_arg,
         keys_file,