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

Made the stream methods more generic

Browse source
This commit is contained in:
John Jones 2017-03-09 10:01:09 -05:00
parent cd5d347e63
commit 15a8abff9a
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/null.c
View file

@ -26,28 +26,27 @@ void *ipfs_null_connection (void *ptr)
{ {
struct null_connection_params *connection_param = NULL; struct null_connection_params *connection_param = NULL;
struct s_ipfs_routing* routing = NULL; struct s_ipfs_routing* routing = NULL;
struct Stream* stream = NULL;
connection_param = (struct null_connection_params*) ptr; connection_param = (struct null_connection_params*) ptr;
// TODO: multistream + secio + message. // TODO: multistream + secio + message.
// TODO: when should we exit the for loop and disconnect? // TODO: when should we exit the for loop and disconnect?
stream = libp2p_net_multistream_stream_new(connection_param->socket); struct SecureSession secure_session;
secure_session.insecure_stream = libp2p_net_multistream_stream_new(connection_param->socket);
secure_session.default_stream = secure_session.insecure_stream;
fprintf(stderr, "Connection %d, count %d\n", connection_param->socket, *(connection_param->count)); fprintf(stderr, "Connection %d, count %d\n", connection_param->socket, *(connection_param->count));
if (libp2p_net_multistream_negotiate(stream)) { if (libp2p_net_multistream_negotiate(secure_session.insecure_stream)) {
routing = ipfs_routing_new_online(connection_param->local_node, &connection_param->local_node->identity->private_key, stream); routing = ipfs_routing_new_online(connection_param->local_node, &connection_param->local_node->identity->private_key, secure_session.insecure_stream);
for(;;) { for(;;) {
// check if they're looking for an upgrade (i.e. secio) // check if they're looking for an upgrade (i.e. secio)
unsigned char* results = NULL; unsigned char* results = NULL;
size_t bytes_read; size_t bytes_read;
libp2p_net_multistream_read(stream, &results, &bytes_read); secure_session.default_stream->read(&secure_session, &results, &bytes_read);
if (ipfs_null_requesting_secio(results, bytes_read)) { if (secure_session.secure_stream == NULL && ipfs_null_requesting_secio(results, bytes_read)) {
struct SecureSession secure_session;
secure_session.stream = stream;
if (!libp2p_secio_handshake(&secure_session, &connection_param->local_node->identity->private_key, 1)) { if (!libp2p_secio_handshake(&secure_session, &connection_param->local_node->identity->private_key, 1)) {
// rejecting connection // rejecting connection
break; break;
@ -66,9 +65,9 @@ void *ipfs_null_connection (void *ptr)
routing->GetValue(routing, msg->key, msg->key_size, (void**)&val, &val_size); routing->GetValue(routing, msg->key, msg->key_size, (void**)&val, &val_size);
if (val == NULL) { if (val == NULL) {
// write a 0 to the stream to tell the client we couldn't find it. // write a 0 to the stream to tell the client we couldn't find it.
stream->write(stream, 0, 1); secure_session.default_stream->write(&secure_session, 0, 1);
} else { } else {
stream->write(stream, val, val_size); secure_session.default_stream->write(&secure_session, val, val_size);
} }
break; break;
} }
@ -95,8 +94,8 @@ void *ipfs_null_connection (void *ptr)
} }
*/ */
if (stream != NULL) { if (secure_session.default_stream != NULL) {
stream->close(stream); secure_session.default_stream->close(&secure_session);
} }
(*(connection_param->count))--; // update counter. (*(connection_param->count))--; // update counter.
free (connection_param); free (connection_param);

4
test/core/test_ping.h
View file

@ -19,7 +19,7 @@ int test_ping() {
int retVal = 0; int retVal = 0;
struct FSRepo* fs_repo = NULL; struct FSRepo* fs_repo = NULL;
struct Libp2pMessage* message = NULL; struct Libp2pMessage* message = NULL;
struct IpfsNode local_node; //struct IpfsNode local_node;
struct Libp2pPeer* remote_peer = NULL; struct Libp2pPeer* remote_peer = NULL;
struct Dialer* dialer = NULL; struct Dialer* dialer = NULL;
struct Connection* conn = NULL; struct Connection* conn = NULL;
@ -32,10 +32,12 @@ int test_ping() {
drop_build_and_open_repo("/tmp/.ipfs", &fs_repo); drop_build_and_open_repo("/tmp/.ipfs", &fs_repo);
// create a new IpfsNode // create a new IpfsNode
/*
local_node.mode = MODE_ONLINE; local_node.mode = MODE_ONLINE;
local_node.peerstore = libp2p_peerstore_new(); local_node.peerstore = libp2p_peerstore_new();
local_node.repo = fs_repo; local_node.repo = fs_repo;
local_node.identity = fs_repo->config->identity; local_node.identity = fs_repo->config->identity;
*/
// build the ping message // build the ping message
message = libp2p_message_new(); message = libp2p_message_new();

3
test/node/test_resolver.h
View file

@ -87,7 +87,8 @@ int test_resolver_remote_get() {
// start the daemon in a separate thread // start the daemon in a separate thread
pthread_t thread; pthread_t thread;
int rc = pthread_create(&thread, NULL, test_resolver_daemon_start, (void*)ipfs_path); if (pthread_create(&thread, NULL, test_resolver_daemon_start, (void*)ipfs_path) < 0)
return 0;
// this should point to a test directory with files and directories // this should point to a test directory with files and directories
char* home_dir = os_utils_get_homedir(); char* home_dir = os_utils_get_homedir();