agorise/c-libp2p
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Final adjustments before merge back to master

Browse source
This commit is contained in:
John Jones 2017-11-29 05:54:27 -05:00
parent 35d795df94
commit 8f4adf682b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
yamux/yamux.c
View file

@ -277,6 +277,7 @@ int libp2p_yamux_read(void* stream_context, struct StreamMessage** message, int
struct Stream* parent_stream = libp2p_yamux_get_parent_stream(stream_context); struct Stream* parent_stream = libp2p_yamux_get_parent_stream(stream_context);
if (channel != NULL && channel->channel != 0) { if (channel != NULL && channel->channel != 0) {
// I don't think this will ever be the case. This I believe to be dead code
libp2p_logger_debug("yamux", "Data received on yamux stream %d.\n", channel->channel); libp2p_logger_debug("yamux", "Data received on yamux stream %d.\n", channel->channel);
// we have an established channel. Use it. // we have an established channel. Use it.
if (!parent_stream->read(parent_stream->stream_context, message, yamux_default_timeout)) { if (!parent_stream->read(parent_stream->stream_context, message, yamux_default_timeout)) {
@ -294,12 +295,14 @@ int libp2p_yamux_read(void* stream_context, struct StreamMessage** message, int
} }
libp2p_logger_error("yamux", "yamux_decode returned error.\n"); libp2p_logger_error("yamux", "yamux_decode returned error.\n");
} else if (ctx != NULL) { } else if (ctx != NULL) {
libp2p_logger_debug("yamux", "read: It looks like we're trying to negotiate a new protocol.\n"); // this is the normal situation (not dead code).
// We are still negotiating. They are probably attempting to negotiate a new protocol libp2p_logger_debug("yamux", "read: It looks like we're trying to negotiate a new protocol or received a yamux frame.\n");
struct StreamMessage* incoming = NULL; struct StreamMessage* incoming = NULL;
if (parent_stream->read(parent_stream->stream_context, &incoming, yamux_default_timeout)) { if (parent_stream->read(parent_stream->stream_context, &incoming, yamux_default_timeout)) {
libp2p_logger_debug("yamux", "read: successfully read %d bytes from network.\n", incoming->data_size); libp2p_logger_debug("yamux", "read: successfully read %d bytes from network.\n", incoming->data_size);
// parse the frame // parse the frame. This is where the work happens.
// JMJ: Maybe this should come back with a message to be processed further, along with some stream number to
// know who to dispatch it to. Or perhaps it should have all the information to handle it internally (better option)
if (yamux_decode(ctx, incoming->data, incoming->data_size, message) == 0) { if (yamux_decode(ctx, incoming->data, incoming->data_size, message) == 0) {
libp2p_stream_message_free(incoming); libp2p_stream_message_free(incoming);
// The message may not have anything in it. If so, return 0, as if nothing was done. Everything has been handled // The message may not have anything in it. If so, return 0, as if nothing was done. Everything has been handled