Skip to content
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

fix: flatbuffers offset overflow #89

Merged
merged 3 commits into from
Apr 9, 2019
Merged

fix: flatbuffers offset overflow #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c251109
fix: flatbuffers offset overflow
doitian Apr 1, 2019
2e5d56a
chore: cleanup gen_proto.sh
doitian Apr 1, 2019
2712126
chore: ensure cfbc version
doitian Apr 8, 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
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ bytes = "0.4"
tokio-threadpool = "0.1"

flatbuffers = "0.5.0"
flatbuffers-verifier = "0.1.8"
multiaddr = { package = "parity-multiaddr", version = "0.3.0" }

[dev-dependencies]
Expand Down
31 changes: 31 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
FLATC := flatc
CFBC := cfbc

FBS_FILES := \
src/protocol_select/protocol_select.fbs \
secio/src/handshake/handshake.fbs \
protocols/identify/src/protocol.fbs \
protocols/ping/src/protocol.fbs \
protocols/discovery/src/protocol.fbs

FLATC_RUST_FILES := $(patsubst %.fbs,%_generated.rs,${FBS_FILES})
FLATBUFFERS_VERIFIER_FILES := $(patsubst %.fbs,%_generated_verifier.rs,${FBS_FILES})

fmt:
cargo fmt --all -- --check
Expand All @@ -13,3 +25,22 @@ examples:

ci: fmt clippy test examples
git diff --exit-code Cargo.lock

check-cfbc-version:
test "$$($(CFBC) --version)" = 0.1.9

%_generated_verifier.rs: %.fbs check-cfbc-version
$(FLATC) -b --schema -o $(shell dirname $@) $<
$(CFBC) -o $(shell dirname $@) $*.bfbs
rm -f $*_builder.rs $*.bfbs

%_generated.rs: %.fbs
$(FLATC) -r -o $(shell dirname $@) $<

gen-fb: $(FLATC_RUST_FILES) $(FLATBUFFERS_VERIFIER_FILES)

clean-fb:
rm -f $(FLATC_RUST_FILES) $(FLATBUFFERS_VERIFIER_FILES)


.PHONY: fmt clippy test examples ci gen-fb clean-fb check-cfbc-version
3 changes: 2 additions & 1 deletion protocols/discovery/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ serde_derive = "1.0"
trust-dns = "0.15"
rand = "0.6.1"
flatbuffers = "0.5.0"
flatbuffers-verifier = "0.1.8"

[dev-dependencies]
env_logger = "0.6"
env_logger = "0.6"
8 changes: 0 additions & 8 deletions protocols/discovery/src/gen_proto.sh
View file
Open in desktop

This file was deleted.

12 changes: 5 additions & 7 deletions protocols/discovery/src/protocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@ use std::io;

use bytes::{Bytes, BytesMut};
use flatbuffers::FlatBufferBuilder;
use flatbuffers_verifier::get_root;
use log::debug;
use p2p::multiaddr::Multiaddr;
use tokio::codec::length_delimited::LengthDelimitedCodec;
use tokio::codec::{Decoder, Encoder};

use crate::{
protocol_generated::p2p::discovery::{
BytesBuilder, DiscoveryMessage as FbsDiscoveryMessage, DiscoveryMessageBuilder,
DiscoveryPayload as FbsDiscoveryPayload, GetNodes as FbsGetNodes, GetNodesBuilder,
NodeBuilder, Nodes as FbsNodes, NodesBuilder,
},
protocol_generated_verifier::get_root,
use crate::protocol_generated::p2p::discovery::{
BytesBuilder, DiscoveryMessage as FbsDiscoveryMessage, DiscoveryMessageBuilder,
DiscoveryPayload as FbsDiscoveryPayload, GetNodes as FbsGetNodes, GetNodesBuilder, NodeBuilder,
Nodes as FbsNodes, NodesBuilder,
};

pub(crate) struct DiscoveryCodec {
Expand Down
Loading