From 91f5c50a71e8d09ec1444b55c214b4451c43e29c Mon Sep 17 00:00:00 2001 From: jmjatlanta Date: Mon, 23 Oct 2017 09:48:19 -0500 Subject: [PATCH] Network write methods now expect struct StreamMessage --- exchange/bitswap/network.c | 5 ++++- importer/resolver.c | 5 ++++- journal/journal.c | 9 +++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/exchange/bitswap/network.c b/exchange/bitswap/network.c index c1f05d8..2904fd6 100644 --- a/exchange/bitswap/network.c +++ b/exchange/bitswap/network.c @@ -38,7 +38,10 @@ int ipfs_bitswap_network_send_message(const struct BitswapContext* context, stru memcpy(buf, "/ipfs/bitswap/1.1.0\n", 20); buf_size += 20; // send it - int bytes_written = peer->sessionContext->default_stream->write(peer->sessionContext, buf, buf_size); + struct StreamMessage outgoing; + outgoing.data = buf; + outgoing.data_size = buf_size; + int bytes_written = peer->sessionContext->default_stream->write(peer->sessionContext, &outgoing); if (bytes_written <= 0) { free(buf); return 0; diff --git a/importer/resolver.c b/importer/resolver.c index e51c6b1..bb50a59 100644 --- a/importer/resolver.c +++ b/importer/resolver.c @@ -167,7 +167,10 @@ struct HashtableNode* ipfs_resolver_remote_get(const char* path, struct Hashtabl // switch to kademlia if (!libp2p_routing_dht_upgrade_stream(&session_context)) return NULL; - stream->write(&session_context, message_protobuf, message_protobuf_size); + struct StreamMessage outgoing; + outgoing.data = message_protobuf; + outgoing.data_size = message_protobuf_size; + stream->write(&session_context, &outgoing); struct StreamMessage* response; // we should get back a protobuf'd record stream->read(&session_context, &response, 5); diff --git a/journal/journal.c b/journal/journal.c index dccc017..0bcbb7a 100644 --- a/journal/journal.c +++ b/journal/journal.c @@ -116,10 +116,15 @@ int ipfs_journal_send_message(struct IpfsNode* node, struct Libp2pPeer* peer, st return 0; // send the header char* header = "/ipfs/journalio/1.0.0\n"; - if (!peer->sessionContext->default_stream->write(peer->sessionContext, (unsigned char*)header, strlen(header))) + struct StreamMessage outgoing; + outgoing.data = (uint8_t*)header; + outgoing.data_size = strlen(header); + if (!peer->sessionContext->default_stream->write(peer->sessionContext, &outgoing)) return 0; // send the message - return peer->sessionContext->default_stream->write(peer->sessionContext, msg, msg_size); + outgoing.data = msg; + outgoing.data_size = msg_size; + return peer->sessionContext->default_stream->write(peer->sessionContext, &outgoing); } /***