From b5acf226f9f9cc690af194d7addaeb3536e2b9b1 Mon Sep 17 00:00:00 2001 From: Toralf Wittner Date: Mon, 3 Sep 2018 11:13:42 +0200 Subject: [PATCH] multistream-select: Include `\n` in length. (#439) * multistream-select: Include `\n` in length. * Add comment to explain the +1. * Re-enable test. --- misc/multistream-select/src/protocol/listener.rs | 2 +- misc/multistream-select/src/tests.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/misc/multistream-select/src/protocol/listener.rs b/misc/multistream-select/src/protocol/listener.rs index ba4a8516..a4cc3ac1 100644 --- a/misc/multistream-select/src/protocol/listener.rs +++ b/misc/multistream-select/src/protocol/listener.rs @@ -111,7 +111,7 @@ where let mut buf = encode::usize_buffer(); let mut out_msg = Vec::from(encode::usize(list.len(), &mut buf)); for elem in &list { - out_msg.extend(encode::usize(elem.len(), &mut buf)); + out_msg.extend(encode::usize(elem.len() + 1, &mut buf)); // +1 for '\n' out_msg.extend_from_slice(elem); out_msg.extend(iter::once(b'\n')); } diff --git a/misc/multistream-select/src/tests.rs b/misc/multistream-select/src/tests.rs index c990d167..b9bd569d 100644 --- a/misc/multistream-select/src/tests.rs +++ b/misc/multistream-select/src/tests.rs @@ -142,7 +142,6 @@ fn no_protocol_found() { } #[test] -#[ignore] // TODO: not working fn select_proto_parallel() { let listener = TcpListener::bind(&"127.0.0.1:0".parse().unwrap()).unwrap(); let listener_addr = listener.local_addr().unwrap();