agorise
/
c-ipfs
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network write methods now expect struct StreamMessage

yamux
jmjatlanta 2017-10-23 09:48:19 -05:00
parent 9afaf535d6
commit 91f5c50a71
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
exchange/bitswap/network.c
View File

@ -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;

5
importer/resolver.c
View File

@ -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);

9
journal/journal.c
View File

@ -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);
}
/***