Skip to content

Rewrite networking code to use Tokio #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caelunshun merged 19 commits into from
Sep 30, 2019
Merged

Rewrite networking code to use Tokio #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
362823b
Initial work: begin switching packets to use `Bytes` over Feather's `…
caelunshun Sep 26, 2019
efc34bc
Rewrite packet encoding functionality
caelunshun Sep 28, 2019
be4e5c7
Reimplement packet decoder and get feather-core to compile
caelunshun Sep 28, 2019
c9abf80
bla
caelunshun Sep 28, 2019
966cc95
Replace mio event loop with Tokio tasks, get feather-server to compile
caelunshun Sep 28, 2019
95a62a7
Fix packet stage not being updated correctly
caelunshun Sep 28, 2019
241ef04
Fix authentication issues on login
caelunshun Sep 28, 2019
5649ed1
Fix some more issues with packet serializer
caelunshun Sep 29, 2019
0a41bb4
Rename serialize.rs -> codec.rs
caelunshun Sep 29, 2019
a22ab22
Fix encoding of compressed packets
caelunshun Sep 29, 2019
9a671b3
Fix decoding of encrypted packets
caelunshun Sep 29, 2019
cc58433
Fix disconnect not being detected
caelunshun Sep 29, 2019
b06a398
Fix compile error
caelunshun Sep 29, 2019
e5e0756
Remove now unused io_worker_threads config entry
caelunshun Sep 29, 2019
3b6f050
Fix tests
caelunshun Sep 30, 2019
a17b78a
Fix clippy warnings
caelunshun Sep 30, 2019
e5e0f3a
Fix panic when worker shuts down
caelunshun Sep 30, 2019
6e81ae8
Attempt to fix Clippy install on CI
caelunshun Sep 30, 2019
0082762
Bump nightly version
caelunshun Sep 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions .azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,24 @@ jobs:
- job: 'CI'
strategy:
matrix:
linux-stable:
rustup_toolchain: stable
image_name: 'ubuntu-16.04'
linux-beta:
rustup_toolchain: beta
#linux-stable:
# rustup_toolchain: stable
# image_name: 'ubuntu-16.04'
#linux-beta:
# rustup_toolchain: beta
# image_name: 'ubuntu-16.04'
linux-nightly:
rustup_toolchain: nightly-2019-09-28
image_name: 'ubuntu-16.04'
windows-stable:
rustup_toolchain: stable
image_name: 'windows-latest'
#windows-stable:
# rustup_toolchain: stable
# image_name: 'windows-latest'
#windows-beta:
# rustup_toolchain: beta-gnu
# image_name: 'windows-latest'
windows-nightly:
rustup_toolchain: nightly-2019-09-28
image_name: 'ubuntu-16.04'
#apple-stable:
# rustup_toolchain: stable
# image_name: 'macOS-10.13'
Expand Down Expand Up @@ -98,11 +104,11 @@ jobs:
linux:
image_name: 'ubuntu-16.04'
platform: 'linux'
rustup_toolchain: 'stable'
rustup_toolchain: 'nightly-2019-09-28'
windows:
image_name: 'windows-latest'
platform: 'windows'
rustup_toolchain: 'stable'
rustup_toolchain: 'nightly-2019-09-28'
#macos:
# image_name: 'macOS-10.13'
# platform: 'macos'
Expand Down
771 changes: 482 additions & 289 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions codegen/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,18 @@ lazy_static! {
m.insert("var_int", PacketParameterType::Varint);
m.insert("var_long", PacketParameterType::Varlong);
m.insert("string", PacketParameterType::String);
m.insert("u64_be", PacketParameterType::U64);
m.insert("u32_be", PacketParameterType::U32);
m.insert("u16_be", PacketParameterType::U16);
m.insert("u64", PacketParameterType::U64);
m.insert("u32", PacketParameterType::U32);
m.insert("u16", PacketParameterType::U16);
m.insert("u8", PacketParameterType::U8);
m.insert("i64_be", PacketParameterType::I64);
m.insert("i32_be", PacketParameterType::I32);
m.insert("i16_be", PacketParameterType::I16);
m.insert("i64", PacketParameterType::I64);
m.insert("i32", PacketParameterType::I32);
m.insert("i16", PacketParameterType::I16);
m.insert("i8", PacketParameterType::I8);
m.insert("position", PacketParameterType::Position);
m.insert("bool", PacketParameterType::Boolean);
m.insert("f32_be", PacketParameterType::F32);
m.insert("f64_be", PacketParameterType::F64);
m.insert("f32", PacketParameterType::F32);
m.insert("f64", PacketParameterType::F64);
m.insert("uuid", PacketParameterType::Uuid);
m.insert("nbt", PacketParameterType::Nbt);
m.insert("slot", PacketParameterType::Slot);
Expand Down Expand Up @@ -155,8 +155,8 @@ pub fn derive_packet(_item: TokenStream) -> TokenStream {
Span::call_site(),
);

let write_fn_ident = Ident::new(&format!("write_{}", function_ident), Span::call_site());
let read_fn_ident = Ident::new(&format!("read_{}", function_ident), Span::call_site());
let write_fn_ident = Ident::new(&format!("push_{}", function_ident), Span::call_site());
let read_fn_ident = Ident::new(&format!("try_get_{}", function_ident), Span::call_site());

let use_ref = {
vec![
Expand Down Expand Up @@ -193,12 +193,12 @@ pub fn derive_packet(_item: TokenStream) -> TokenStream {

let r = quote! {
impl Packet for #ident {
fn read_from(&mut self, mut buf: &mut dyn PacketBuf) -> Result<(), ()> {
fn read_from(&mut self, buf: &mut Cursor<&[u8]>) -> Result<(), failure::Error> {
#(#read_code)*
Ok(())
}

fn write_to(&self, buf: &mut ByteBuf) {
fn write_to(&self, buf: &mut BytesMut) {
#(#write_code)*
}

Expand Down
4 changes: 3 additions & 1 deletion core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,6 @@ smallvec = "0.6.10"
hash32 = "0.1.0"
hash32-derive = "0.1.0"
strum = "0.15.0"
strum_macros = "0.15.0"
strum_macros = "0.15.0"
tokio = "=0.2.0-alpha.5"
failure = "0.1.5"
Loading