From 1ae8c9fda5889d5a611653446f4d89f0d99c7e27 Mon Sep 17 00:00:00 2001 From: Dennis Schwerdel Date: Tue, 12 Feb 2019 19:29:36 +0100 Subject: [PATCH] Some minor changes --- Cargo.toml | 4 ++-- LICENSE.md | 8 +------- README.md | 2 +- deb/vpncloud/debian/changelog | 8 ++++++++ src/cloud.rs | 2 ++ 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0ca09d4..1b729e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Dennis Schwerdel "] build = "build.rs" license = "GPL-3.0" description = "Peer-to-peer VPN" -homepage = "https://github.com/dswd/vpncloud.rs" -repository = "https://github.com/dswd/vpncloud.rs" +homepage = "https://github.com/dswd/vpncloud" +repository = "https://github.com/dswd/vpncloud" keywords = ["vpn", "p2p", "tun", "tap", "network"] readme = "README.md" diff --git a/LICENSE.md b/LICENSE.md index b87aa6e..1515bbd 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ # License: GPL-3 VpnCloud - Peer-to-Peer VPN -Copyright (C) 2015-2016 Dennis Schwerdel +Copyright (C) 2015-2019 Dennis Schwerdel This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,9 +14,3 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. [Full license text](gpl-3.txt) - - -## Included works - -This software contains the [libsodium](https://github.com/jedisct1/libsodium) -library by Frank Denis which is licensed under the ISC license (similar to BSD). diff --git a/README.md b/README.md index 2b81785..cad8897 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ somewhat stable state. VpnCloud features the following functionality: * Setting up tunnels between two networks via Ethernet (TAP) and IP (TUN) * Connecting multiple networks with multiple forwarding behaviors (Hub, Switch, Router) -* Encrypted connections using [libsodium](https://github.com/jedisct1/libsodium) +* Encrypted connections * Automatic peer-to-peer meshing, no central servers * NAT and (limited) firewall traversal using hole punching * Automatic reconnecting when connections are lost diff --git a/deb/vpncloud/debian/changelog b/deb/vpncloud/debian/changelog index af6f353..011b65f 100644 --- a/deb/vpncloud/debian/changelog +++ b/deb/vpncloud/debian/changelog @@ -1,3 +1,11 @@ +vpncloud (0.9.0) stable; urgency=medium + + * [added] Added ability to write out statistics file with peers and traffic info + * [changed] Using ring instead of libsodium (**incompatible**) + * [fixed] Hashed magics now also consider first character (**incompatible**) + + -- Dennis Schwerdel Wed, 09 Jan 2019 21:32:54 +0100 + vpncloud (0.8.2) stable; urgency=medium * [changed] Using serde instead of rustc_serialize diff --git a/src/cloud.rs b/src/cloud.rs index 85f30dd..5355b1c 100644 --- a/src/cloud.rs +++ b/src/cloud.rs @@ -577,6 +577,7 @@ impl GenericCloud { if !self.peers.contains_addr(&peer) { try!(self.connect(&peer)); } + //TODO: make this address primary // Connect to all peers in the message for p in &peers { if ! self.peers.contains_addr(p) && ! self.blacklist_peers.contains(p) { @@ -594,6 +595,7 @@ impl GenericCloud { } // Add sender as peer or as alternative address to existing peer if self.peers.contains_node(&node_id) { + //TODO: make this address primary self.peers.add_alt_addr(node_id, peer); } else { self.peers.add(node_id, peer);