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

Moved buffered secio to context struct

Browse source
This commit is contained in:
John Jones 2017-11-02 13:43:52 -05:00
parent 65194c06ee
commit 5e1cdac4cf
3 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/libp2p/secio/secio.h
View file

@ -15,6 +15,8 @@ struct SecioContext {
struct SessionContext* session_context; struct SessionContext* session_context;
struct RsaPrivateKey* private_key; struct RsaPrivateKey* private_key;
struct Peerstore* peer_store; struct Peerstore* peer_store;
struct StreamMessage* buffered_message;
size_t buffered_message_pos;
}; };
struct Libp2pProtocolHandler* libp2p_secio_build_protocol_handler(struct RsaPrivateKey* private_key, struct Peerstore* peer_store); struct Libp2pProtocolHandler* libp2p_secio_build_protocol_handler(struct RsaPrivateKey* private_key, struct Peerstore* peer_store);

29
secio/secio.c
View file

@ -35,9 +35,6 @@ const char* SupportedExchanges = "P-256,P-384,P-521";
const char* SupportedCiphers = "AES-256,AES-128,Blowfish"; const char* SupportedCiphers = "AES-256,AES-128,Blowfish";
const char* SupportedHashes = "SHA256,SHA512"; const char* SupportedHashes = "SHA256,SHA512";
static struct StreamMessage* secio_buffered_message;
static size_t secio_buffered_message_pos = -1;
int libp2p_secio_can_handle(const struct StreamMessage* msg) { int libp2p_secio_can_handle(const struct StreamMessage* msg) {
const char* protocol = "/secio/1.0.0"; const char* protocol = "/secio/1.0.0";
// sanity checks // sanity checks
@ -77,6 +74,8 @@ struct Libp2pProtocolHandler* libp2p_secio_build_protocol_handler(struct RsaPriv
struct Libp2pProtocolHandler* handler = (struct Libp2pProtocolHandler*) malloc(sizeof(struct Libp2pProtocolHandler)); struct Libp2pProtocolHandler* handler = (struct Libp2pProtocolHandler*) malloc(sizeof(struct Libp2pProtocolHandler));
if (handler != NULL) { if (handler != NULL) {
struct SecioContext* context = (struct SecioContext*) malloc(sizeof(struct SecioContext)); struct SecioContext* context = (struct SecioContext*) malloc(sizeof(struct SecioContext));
context->buffered_message = NULL;
context->buffered_message_pos = -1;
context->private_key = private_key; context->private_key = private_key;
context->peer_store = peer_store; context->peer_store = peer_store;
handler->context = context; handler->context = context;
@ -1314,24 +1313,24 @@ int libp2p_secio_read_raw(void* stream_context, uint8_t* buffer, int buffer_size
return -1; return -1;
} }
struct SecioContext* ctx = (struct SecioContext*)stream_context; struct SecioContext* ctx = (struct SecioContext*)stream_context;
if (secio_buffered_message_pos == -1) { if (ctx->buffered_message_pos == -1) {
// we need to get info from the network // we need to get info from the network
if (!ctx->stream->read(ctx->stream->stream_context, &secio_buffered_message, timeout_secs)) { if (!ctx->stream->read(ctx->stream->stream_context, &ctx->buffered_message, timeout_secs)) {
return -1; return -1;
} }
secio_buffered_message_pos = 0; ctx->buffered_message_pos = 0;
} }
int max_to_read = (buffer_size > secio_buffered_message->data_size ? secio_buffered_message->data_size : buffer_size); int max_to_read = (buffer_size > ctx->buffered_message->data_size ? ctx->buffered_message->data_size : buffer_size);
memcpy(buffer, &secio_buffered_message->data[secio_buffered_message_pos], max_to_read); memcpy(buffer, &ctx->buffered_message->data[ctx->buffered_message_pos], max_to_read);
secio_buffered_message_pos += max_to_read; ctx->buffered_message_pos += max_to_read;
if (secio_buffered_message_pos == secio_buffered_message->data_size) { if (ctx->buffered_message_pos == ctx->buffered_message->data_size) {
// we read everything // we read everything
libp2p_stream_message_free(secio_buffered_message); libp2p_stream_message_free(ctx->buffered_message);
secio_buffered_message = NULL; ctx->buffered_message = NULL;
secio_buffered_message_pos = -1; ctx->buffered_message_pos = -1;
} else { } else {
// we didn't read everything. // we didn't read everything.
secio_buffered_message_pos = max_to_read; ctx->buffered_message_pos = max_to_read;
} }
return max_to_read; return max_to_read;
} }
@ -1354,6 +1353,8 @@ struct Stream* libp2p_secio_stream_new(struct Stream* parent_stream, struct Libp
new_stream = NULL; new_stream = NULL;
return NULL; return NULL;
} }
ctx->buffered_message = NULL;
ctx->buffered_message_pos = -1;
new_stream->stream_context = ctx; new_stream->stream_context = ctx;
ctx->stream = new_stream; ctx->stream = new_stream;
ctx->session_context = remote_peer->sessionContext; ctx->session_context = remote_peer->sessionContext;

28
yamux/yamux.c
View file

@ -177,5 +177,33 @@ struct Libp2pProtocolHandler* yamux_build_protocol_handler(struct Libp2pVector*
* @returns a Stream initialized and ready for yamux * @returns a Stream initialized and ready for yamux
*/ */
struct Stream* libp2p_yamux_stream_new(struct Stream* parent_stream) { struct Stream* libp2p_yamux_stream_new(struct Stream* parent_stream) {
struct Stream* out = NULL;
/*
struct Stream* out = (struct Stream*)malloc(sizeof(struct Stream));
if (out != NULL) {
out->parent_stream = parent_stream;
out->close = libp2p_yamux_close;
out->read = libp2p_yamux_read;
out->write = libp2p_yamux_write;
out->peek = libp2p_yamux_peek;
out->read_raw = libp2p_yamux_read_raw;
out->address = parent_stream->address;
// build YamuxContext
struct YamuxContext* ctx = (struct YamuxContext*) malloc(sizeof(struct YamuxContext));
if (ctx == NULL) {
libp2p_net_multistream_stream_free(out);
return NULL; return NULL;
}
out->stream_context = ctx;
ctx->stream = out;
ctx->handlers = NULL;
ctx->session_context = NULL;
// attempt to negotiate yamux protocol
if (!libp2p_yamux_negotiate(ctx)) {
libp2p_yamux_stream_free(out);
return NULL;
}
}
*/
return out;
} }