aboutsummaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-04-08 22:10:13 -0700
committerSteven Fackler <[email protected]>2015-04-08 22:10:13 -0700
commitc5a16db97e2aaa03b2f2a2d4e38f70ef82307b4e (patch)
tree98547398a1f6dde702b1b058201ac28a5d23e638 /openssl
parentClean up build infrastructure (diff)
downloadrust-openssl-c5a16db97e2aaa03b2f2a2d4e38f70ef82307b4e.tar.xz
rust-openssl-c5a16db97e2aaa03b2f2a2d4e38f70ef82307b4e.zip
Fix dtls tests
There's a reason static mut is unsafe...
Diffstat (limited to 'openssl')
-rw-r--r--openssl/src/ssl/tests.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs
index 334482df..50ae1ff7 100644
--- a/openssl/src/ssl/tests.rs
+++ b/openssl/src/ssl/tests.rs
@@ -29,15 +29,15 @@ use ssl::SslMethod::Dtlsv1;
#[cfg(feature="dtlsv1")]
use connected_socket::Connect;
-#[cfg(test)]
+#[cfg(feature = "dtlsv1")]
mod udp {
- static mut udp_port:u16 = 15410;
+ use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
+
+ static UDP_PORT: AtomicUsize = ATOMIC_USIZE_INIT;
pub fn next_server<'a>() -> String {
- unsafe {
- udp_port += 1;
- format!("127.0.0.1:{}", udp_port)
- }
+ let diff = UDP_PORT.fetch_add(1, Ordering::SeqCst);
+ format!("127.0.0.1:{}", 15411 + diff)
}
}
@@ -60,13 +60,13 @@ macro_rules! run_test(
use crypto::hash::Type::SHA256;
use x509::X509StoreContext;
use serialize::hex::FromHex;
-
+
#[test]
fn sslv23() {
let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
$blk(SslMethod::Sslv23, stream);
}
-
+
#[test]
#[cfg(feature="dtlsv1")]
fn dtlsv1() {