Merge pull request #74 from bluejekyll/0.9.0_release

0.9.0 release

CHANGELOG.md

@@ -2,17 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## unreleased (0.9.0)
+## 0.9.0
 ### Added
 - new ServerFuture tokio and futures based server, #61
 - UdpStream & TcpSteam to support stream of messages with src address
 - TimeoutStream to wrap TcpStreams to help guard against malicious clients
 - Added Notify support to ClientFuture
+- Added IntoRecordSet and conversion impls for RecordSet and Record
 
 ### Changed
 - Split Server and Client into separate crates, #43
 - Moved many integration tests to `tests` from `src`, #52
 - Migrated all handles to new futures::sync::mpsc impls
+- Modified all requisite client methods for IntoRecordSet.
+- All client methods now support multiple records per query, update, notify and delete
 
 ### Fixed
 - Flush TcpStream after fully sending Message

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trust-dns"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Benjamin Fry <benjaminfry@me.com>"]
 
 # A short blurb about the package. This is not rendered in any format when
@@ -56,6 +56,3 @@ rand = "^0.3"
 rustc-serialize = "^0.3.18"
 time = "^0.1"
 tokio-core = "^0.1"
-
-[dev-dependencies]
-trust-dns-server = { version = "*", path = "../server" }

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trust-dns-server"
-version = "0.8.1"
+version = "0.9.0"
 authors = ["Benjamin Fry <benjaminfry@me.com>"]
 
 # A short blurb about the package. This is not rendered in any format when

server/src/named.rs

@@ -274,7 +274,7 @@ pub fn main() {
   }
 
   banner();
-  println!("awaiting connections...");
+  info!("awaiting connections...");
   if let Err(e) = server.listen() {
     error!("failed to listen: {}", e);
   }

server/src/server/server.rs

@@ -300,6 +300,7 @@ impl DnsHandler for (UdpSocket, VecDeque<UdpHandler>) {
 }
 
 impl DnsHandler for TcpHandler {
+  #[allow(deprecated)]
   fn handle(&mut self, events: EventSet, catalog: &Arc<Catalog>) -> (Option<EventSet>, Option<(DnsHandlerType, EventSet)>) {
     if events.is_error() {
       warn!("closing, error from: {:?}", self.get_stream());

server/src/server/server_future.rs

@@ -38,6 +38,8 @@ impl ServerFuture {
 
   /// Register a UDP socket. Should be bound before calling this function.
   pub fn register_socket(&self, socket: std::net::UdpSocket) {
+    debug!("registered udp: {:?}", socket);
+
     // create the new UdpStream
     let (buf_stream, stream_handle) = UdpStream::with_bound(socket, self.io_loop.handle());
     let request_stream = RequestStream::new(buf_stream, stream_handle);
@@ -71,6 +73,7 @@ impl ServerFuture {
     // TODO: this is an awkward interface with socketaddr...
     let addr = listener.local_addr().expect("listener is not bound?");
     let listener = tokio_core::net::TcpListener::from_listener(listener, &addr, &handle).expect("could not register listener");
+    debug!("registered tcp: {:?}", listener);
 
     // for each incoming request...
     self.io_loop.handle().spawn(

client/tests/client_tests.rs → server/tests/client_tests.rs

@@ -57,6 +57,7 @@ impl<'a> fmt::Debug for TestClientConnection<'a> {
 }
 
 #[test]
+#[allow(deprecated)]
 fn test_query_nonet() {
   let authority = create_example();
   let mut catalog = Catalog::new();
@@ -69,6 +70,7 @@ fn test_query_nonet() {
 
 #[test]
 #[ignore]
+#[allow(deprecated)]
 fn test_query_udp() {
   let addr: SocketAddr = ("8.8.8.8",53).to_socket_addrs().unwrap().next().unwrap();
   let conn = UdpClientConnection::new(addr).unwrap();
@@ -79,6 +81,7 @@ fn test_query_udp() {
 
 #[test]
 #[ignore]
+#[allow(deprecated)]
 fn test_query_tcp() {
   let addr: SocketAddr = ("8.8.8.8",53).to_socket_addrs().unwrap().next().unwrap();
   let conn = TcpClientConnection::new(addr).unwrap();
@@ -113,6 +116,7 @@ fn test_query<C: ClientConnection>(client: Client<C>) {
 }
 
 #[test]
+#[allow(deprecated)]
 fn test_secure_query_example_nonet() {
   let authority = create_secure_example();
 
@@ -134,6 +138,7 @@ fn test_secure_query_example_nonet() {
 
 #[test]
 #[ignore]
+#[allow(deprecated)]
 fn test_secure_query_example_udp() {
   let addr: SocketAddr = ("8.8.8.8",53).to_socket_addrs().unwrap().next().unwrap();
   let conn = UdpClientConnection::new(addr).unwrap();
@@ -144,6 +149,7 @@ fn test_secure_query_example_udp() {
 
 #[test]
 #[ignore]
+#[allow(deprecated)]
 fn test_secure_query_example_tcp() {
   let addr: SocketAddr = ("8.8.8.8",53).to_socket_addrs().unwrap().next().unwrap();
   let conn = TcpClientConnection::new(addr).unwrap();
@@ -178,6 +184,7 @@ fn test_secure_query_example<C: ClientConnection>(client: Client<C>) {
 
 #[test]
 #[ignore]
+#[allow(deprecated)]
 fn test_dnssec_rollernet_td_udp() {
   let c = Client::new(UdpClientConnection::new("8.8.8.8:53".parse().unwrap()).unwrap());
   c.secure_query(
@@ -189,6 +196,7 @@ fn test_dnssec_rollernet_td_udp() {
 
 #[test]
 #[ignore]
+#[allow(deprecated)]
 fn test_dnssec_rollernet_td_tcp() {
   let c = Client::new(TcpClientConnection::new("8.8.8.8:53".parse().unwrap()).unwrap());
   c.secure_query(
@@ -200,6 +208,7 @@ fn test_dnssec_rollernet_td_tcp() {
 
 #[test]
 #[ignore]
+#[allow(deprecated)]
 fn test_dnssec_rollernet_td_tcp_mixed_case() {
   let c = Client::new(TcpClientConnection::new("8.8.8.8:53".parse().unwrap()).unwrap());
   c.secure_query(
@@ -210,6 +219,7 @@ fn test_dnssec_rollernet_td_tcp_mixed_case() {
 }
 
 #[test]
+#[allow(deprecated)]
 fn test_nsec_query_example_nonet() {
   let authority = create_secure_example();
 
@@ -231,6 +241,7 @@ fn test_nsec_query_example_nonet() {
 
 #[test]
 #[ignore]
+#[allow(deprecated)]
 fn test_nsec_query_example_udp() {
   let addr: SocketAddr = ("8.8.8.8",53).to_socket_addrs().unwrap().next().unwrap();
   let conn = UdpClientConnection::new(addr).unwrap();
@@ -240,6 +251,7 @@ fn test_nsec_query_example_udp() {
 
 #[test]
 #[ignore]
+#[allow(deprecated)]
 fn test_nsec_query_example_tcp() {
   let addr: SocketAddr = ("8.8.8.8",53).to_socket_addrs().unwrap().next().unwrap();
   let conn = TcpClientConnection::new(addr).unwrap();
@@ -261,6 +273,7 @@ fn test_nsec_query_example<C: ClientConnection>(client: Client<C>) {
 
 #[test]
 #[ignore]
+#[allow(deprecated)]
 fn test_nsec_query_type() {
   let name = domain::Name::with_labels(vec!["www".to_string(), "example".to_string(), "com".to_string()]);
 

server/tests/server_future_tests.rs

@@ -57,6 +57,7 @@ fn test_server_www_tcp() {
   //    assert!(server_result.is_ok(), "server failed: {:?}", server_result);
 }
 
+#[allow(deprecated)] // TODO: for now...
 fn client_thread_www<C: ClientConnection>(conn: C) {
   let name = Name::with_labels(vec!["www".to_string(), "example".to_string(), "com".to_string()]);
   println!("about to query server: {:?}", conn);

server/tests/server_tests.rs

@@ -62,6 +62,7 @@ fn test_server_www_tcp() {
   //    assert!(server_result.is_ok(), "server failed: {:?}", server_result);
 }
 
+#[allow(deprecated)]
 #[allow(dead_code)]
 fn client_thread_www<C: ClientConnection>(conn: C) {
   let name = Name::with_labels(vec!["www".to_string(), "example".to_string(), "com".to_string()]);
@@ -102,6 +103,7 @@ fn new_catalog() -> Catalog {
   catalog
 }
 
+#[allow(deprecated)]
 fn server_thread_udp(udp_socket: UdpSocket) {
   let catalog = new_catalog();
 
@@ -111,6 +113,7 @@ fn server_thread_udp(udp_socket: UdpSocket) {
   server.listen().unwrap();
 }
 
+#[allow(deprecated)]
 fn server_thread_tcp(tcp_listener: TcpListener) {
   let catalog = new_catalog();
   let mut server = Server::new(catalog);