[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10743 - gnunet/src/dv
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r10743 - gnunet/src/dv |
|
Date: |
Thu, 1 Apr 2010 17:51:38 +0200 |
Author: nevans
Date: 2010-04-01 17:51:38 +0200 (Thu, 01 Apr 2010)
New Revision: 10743
Modified:
gnunet/src/dv/Makefile.am
gnunet/src/dv/dv.h
gnunet/src/dv/dv_api.c
gnunet/src/dv/gnunet-service-dv.c
gnunet/src/dv/plugin_transport_dv.c
gnunet/src/dv/test_transport_api_dv_peer1.conf
Log:
dv changes, closer to a working state
Modified: gnunet/src/dv/Makefile.am
===================================================================
--- gnunet/src/dv/Makefile.am 2010-04-01 15:16:00 UTC (rev 10742)
+++ gnunet/src/dv/Makefile.am 2010-04-01 15:51:38 UTC (rev 10743)
@@ -33,6 +33,8 @@
gnunet-service-dv.c
gnunet_service_dv_LDADD = \
$(top_builddir)/src/dv/libgnunetdv.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_LIBINTL)
Modified: gnunet/src/dv/dv.h
===================================================================
--- gnunet/src/dv/dv.h 2010-04-01 15:16:00 UTC (rev 10742)
+++ gnunet/src/dv/dv.h 2010-04-01 15:51:38 UTC (rev 10743)
@@ -163,6 +163,7 @@
*/
typedef struct
{
+ /* Message Header */
struct GNUNET_MessageHeader header;
/**
@@ -176,6 +177,11 @@
struct GNUNET_PeerIdentity neighbor;
/**
+ * PublicKey of neighbor.
+ */
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+
+ /**
* Neighbor ID to use when sending to this peer
*/
unsigned int neighbor_id GNUNET_PACKED;
Modified: gnunet/src/dv/dv_api.c
===================================================================
--- gnunet/src/dv/dv_api.c 2010-04-01 15:16:00 UTC (rev 10742)
+++ gnunet/src/dv/dv_api.c 2010-04-01 15:51:38 UTC (rev 10743)
@@ -57,6 +57,8 @@
};
+
+
/**
* Handle for the service.
*/
@@ -110,6 +112,21 @@
};
+struct StartContext
+{
+
+ /**
+ * Start message
+ */
+ struct GNUNET_MessageHeader *message;
+
+ /**
+ * Handle to service, in case of timeout
+ */
+ struct GNUNET_DV_Handle *handle;
+};
+
+
/**
* Try to (re)connect to the dv service.
*
@@ -215,7 +232,7 @@
GNUNET_YES,
&transmit_pending,
handle)))
{
-#if DEBUG_STATISTICS
+#if DEBUG_DV
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to transmit request to dv service.\n");
#endif
@@ -259,8 +276,6 @@
}
-
-
void handle_message_receipt (void *cls,
const struct GNUNET_MessageHeader * msg)
{
@@ -276,6 +291,9 @@
return; /* Connection closed? */
}
+#if DEBUG_DV
+ fprintf(stdout, "dv api receives message of type %d or raw %d\n",
ntohs(msg->type), msg->type);
+#endif
GNUNET_assert(ntohs(msg->type) == GNUNET_MESSAGE_TYPE_TRANSPORT_DV_RECEIVE);
if (ntohs(msg->size) < sizeof(struct GNUNET_DV_MessageReceived))
@@ -348,6 +366,34 @@
return GNUNET_OK;
}
+/* Forward declaration */
+void GNUNET_DV_disconnect(struct GNUNET_DV_Handle *handle);
+
+static size_t
+transmit_start (void *cls, size_t size, void *buf)
+{
+ struct StartContext *start_context = cls;
+ struct GNUNET_DV_Handle *handle = start_context->handle;
+ size_t tsize;
+
+ if (buf == NULL)
+ {
+ GNUNET_free(start_context->message);
+ GNUNET_free(start_context);
+ GNUNET_DV_disconnect(handle);
+ return 0;
+ }
+
+ tsize = ntohs(start_context->message->size);
+ if (size >= tsize)
+ {
+ memcpy(buf, start_context->message, tsize);
+ return tsize;
+ }
+
+ return 0;
+}
+
/**
* Connect to the DV service
*
@@ -365,7 +411,8 @@
void *receive_handler_cls)
{
struct GNUNET_DV_Handle *handle;
-
+ struct GNUNET_MessageHeader *start_message;
+ struct StartContext *start_context;
handle = GNUNET_malloc(sizeof(struct GNUNET_DV_Handle));
handle->cfg = cfg;
@@ -384,6 +431,19 @@
return NULL;
}
+ start_message = GNUNET_malloc(sizeof(struct GNUNET_MessageHeader));
+ start_message->size = htons(sizeof(struct GNUNET_MessageHeader));
+ start_message->type = htons(GNUNET_MESSAGE_TYPE_DV_START);
+
+ start_context = GNUNET_malloc(sizeof(struct StartContext));
+ start_context->handle = handle;
+ start_context->message = start_message;
+ GNUNET_CLIENT_notify_transmit_ready (handle->client,
+ sizeof(struct GNUNET_MessageHeader),
+
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60),
+ GNUNET_YES,
+ &transmit_start, start_context);
+
GNUNET_CLIENT_receive (handle->client,
&handle_message_receipt,
handle, GNUNET_TIME_UNIT_FOREVER_REL);
Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c 2010-04-01 15:16:00 UTC (rev 10742)
+++ gnunet/src/dv/gnunet-service-dv.c 2010-04-01 15:51:38 UTC (rev 10743)
@@ -37,6 +37,9 @@
#include "gnunet_core_service.h"
#include "gnunet_signal_lib.h"
#include "gnunet_util_lib.h"
+#include "gnunet_hello_lib.h"
+#include "gnunet_peerinfo_service.h"
+#include "gnunet_crypto_lib.h"
#include "dv.h"
/**
@@ -217,6 +220,11 @@
struct GNUNET_PeerIdentity identity;
/**
+ * PublicKey of neighbor.
+ */
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+
+ /**
* Head of DLL of nodes that this direct neighbor referred to us.
*/
struct DistantNeighbor *referee_head;
@@ -277,6 +285,11 @@
struct GNUNET_PeerIdentity identity;
/**
+ * PublicKey of neighbor.
+ */
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+
+ /**
* Last time we received routing information from this peer
*/
struct GNUNET_TIME_Absolute last_activity;
@@ -302,10 +315,47 @@
* from DV?
*/
int hidden;
+
};
+struct PeerIteratorContext
+{
+ /**
+ * The actual context, to be freed later.
+ */
+ struct GNUNET_PEERINFO_IteratorContext *ic;
+ /**
+ * The neighbor about which we are concerned.
+ */
+ struct DirectNeighbor *neighbor;
+
+};
+
/**
+ * Context used for creating hello messages when
+ * gossips are received.
+ */
+struct HelloContext
+{
+ /**
+ * Identity of distant neighbor.
+ */
+ struct GNUNET_PeerIdentity *distant_peer;
+
+ /**
+ * Identity of direct neighbor, via which we send this message.
+ */
+ const struct GNUNET_PeerIdentity *direct_peer;
+
+ /**
+ * How many addresses do we need to add (always starts at 1, then set to 0)
+ */
+ int addresses_to_add;
+
+};
+
+/**
* Global construct
*/
struct GNUNET_DV_Context
@@ -387,7 +437,7 @@
* @return number of bytes written to buf
*/
size_t transmit_to_plugin (void *cls,
- size_t size, void *buf)
+ size_t size, void *buf)
{
struct GNUNET_DV_MessageReceived *msg = cls;
int msize;
@@ -395,17 +445,25 @@
if (buf == NULL)
return 0;
+#if DEBUG_DV
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s: Transmit to plugin sending message of type %d!\n", "dv",
ntohs(msg->header.type));
+#endif
+
msize = ntohs(msg->header.size);
GNUNET_assert(size >= msize);
-
memcpy(buf, msg, msize);
- GNUNET_free(msg);
+ /* FIXME: this causes crash? GNUNET_free(msg);*/
return msize;
}
-void send_to_plugin(const struct GNUNET_PeerIdentity * sender, const struct
GNUNET_MessageHeader *message, size_t message_size, struct DistantNeighbor
*distant_neighbor)
+void send_to_plugin(const struct GNUNET_PeerIdentity * sender,
+ const struct GNUNET_MessageHeader *message,
+ size_t message_size,
+ struct GNUNET_PeerIdentity *distant_neighbor,
+ size_t cost)
{
struct GNUNET_DV_MessageReceived *received_msg;
int size;
@@ -415,19 +473,21 @@
received_msg->header.size = htons(size);
received_msg->header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_DV_RECEIVE);
received_msg->sender_address_len = sizeof(struct GNUNET_PeerIdentity);
- received_msg->distance = htonl(distant_neighbor->cost);
+ received_msg->distance = htonl(cost);
received_msg->msg_len = htons(message_size);
/* Set the sender in this message to be the original sender! */
- memcpy(&received_msg->sender, &distant_neighbor->identity, sizeof(struct
GNUNET_PeerIdentity));
+ memcpy(&received_msg->sender, &distant_neighbor, sizeof(struct
GNUNET_PeerIdentity));
/* Copy the intermediate sender to the end of the message, this is how the
transport identifies this peer */
memcpy(&received_msg[1], sender, sizeof(struct GNUNET_PeerIdentity));
/* Copy the actual message after the sender */
memcpy(&received_msg[1 + sizeof(struct GNUNET_PeerIdentity)], message,
message_size);
- /* FIXME: Send to the client please */
- GNUNET_SERVER_notify_transmit_ready (client_handle,
- size, client_transmit_timeout,
- &transmit_to_plugin, &received_msg);
+ if (client_handle != NULL)
+ {
+ GNUNET_SERVER_notify_transmit_ready (client_handle,
+ size, client_transmit_timeout,
+ &transmit_to_plugin, received_msg);
+ }
}
@@ -612,7 +672,7 @@
if ( (ntohs (packed_message->type) != GNUNET_MESSAGE_TYPE_DV_GOSSIP) &&
(ntohs (packed_message->type) != GNUNET_MESSAGE_TYPE_DV_DATA) )
{
- send_to_plugin(peer, packed_message, ntohs(packed_message->size), pos);
+ send_to_plugin(peer, packed_message, ntohs(packed_message->size),
&pos->identity, pos->cost);
}
return GNUNET_OK;
@@ -730,6 +790,8 @@
message->header.type = htons (GNUNET_MESSAGE_TYPE_DV_GOSSIP);
message->cost = htonl (about->cost);
message->neighbor_id = htonl (about->our_id);
+
+ memcpy (&message->pkey, &about->pkey, sizeof(struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
memcpy (&message->neighbor,
&about->identity, sizeof (struct GNUNET_PeerIdentity));
@@ -753,6 +815,32 @@
/**
+ * Handle START-message. This is the first message sent to us
+ * by the client (can only be one!).
+ *
+ * @param cls closure (always NULL)
+ * @param client identification of the client
+ * @param message the actual message
+ */
+static void
+handle_start (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+
+#if DEBUG_DV
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' request from client\n", "START");
+#endif
+
+ GNUNET_assert(client_handle == NULL);
+ client_handle = client;
+
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+}
+
+
+/**
* Service server's handler for message send requests (which come
* bubbling up to us through the DV plugin).
*
@@ -812,6 +900,7 @@
static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = {
{&send_dv_message, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_DV_SEND, 0},
+ {&handle_start, NULL, GNUNET_MESSAGE_TYPE_DV_START, 0},
{NULL, NULL, 0, 0}
};
@@ -915,12 +1004,13 @@
* needs to be updated.
*
* @param peer identity of the peer whose info is being added/updated
+ * @param pkey public key of the peer whose info is being added/updated
* @param referrer_peer_id id to use when sending to 'peer'
* @param referrer if this is a gossiped peer, who did we hear it from?
* @param cost the cost of communicating with this peer via 'referrer'
*/
static void
-addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer,
+addUpdateNeighbor (const struct GNUNET_PeerIdentity * peer, struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey,
unsigned int referrer_peer_id,
struct DirectNeighbor *referrer, unsigned int cost)
{
@@ -984,6 +1074,8 @@
neighbor, cost);
neighbor->referrer = referrer;
memcpy (&neighbor->identity, peer, sizeof (struct GNUNET_PeerIdentity));
+ if (pkey != NULL) /* pkey will be null on direct neighbor addition */
+ memcpy (&neighbor->pkey, pkey, sizeof(struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
neighbor->last_activity = now;
neighbor->cost = cost;
neighbor->referrer_id = referrer_peer_id;
@@ -1026,6 +1118,42 @@
*/
}
+
+static size_t
+generate_hello_address (void *cls, size_t max, void *buf)
+{
+ struct HelloContext *hello_context = cls;
+ char *addr_buffer;
+ size_t offset;
+ size_t size;
+ size_t ret;
+
+ if (hello_context->addresses_to_add == 0)
+ return 0;
+
+ /* Hello "address" will be concatenation of distant peer and direct peer
identities */
+ size = 2 * sizeof(struct GNUNET_PeerIdentity);
+ fprintf(stdout, "size is %lu, max is %lu\n", size, max);
+ GNUNET_assert(max >= size);
+
+ addr_buffer = GNUNET_malloc(size);
+ offset = 0;
+ /* Copy the distant peer identity to buffer */
+ memcpy(addr_buffer, hello_context->distant_peer, sizeof(struct
GNUNET_PeerIdentity));
+ offset += sizeof(struct GNUNET_PeerIdentity);
+ /* Copy the direct peer identity to buffer */
+ memcpy(&addr_buffer[offset], hello_context->direct_peer, sizeof(struct
GNUNET_PeerIdentity));
+ ret = GNUNET_HELLO_add_address ("dv",
+ GNUNET_TIME_relative_to_absolute
+ (GNUNET_TIME_UNIT_HOURS), addr_buffer, size,
+ buf, max);
+
+ hello_context->addresses_to_add--;
+
+ return ret;
+}
+
+
/**
* Core handler for dv gossip messages. These will be used
* by us to create a HELLO message for the newly peer containing
@@ -1045,13 +1173,20 @@
struct GNUNET_TIME_Relative latency,
uint32_t distance)
{
+ struct HelloContext *hello_context;
+ struct GNUNET_HELLO_Message *hello_msg;
+ struct DirectNeighbor *referrer;
+ p2p_dv_MESSAGE_NeighborInfo *enc_message = (p2p_dv_MESSAGE_NeighborInfo
*)message;
+
+ if (ntohs (message->size) < sizeof (p2p_dv_MESSAGE_NeighborInfo))
+ {
+ return GNUNET_SYSERR; /* invalid message */
+ }
+
#if DEBUG_DV
char * encPeerAbout;
char * encPeerFrom;
-#endif
- struct DirectNeighbor *referrer;
- p2p_dv_MESSAGE_NeighborInfo *enc_message = (p2p_dv_MESSAGE_NeighborInfo
*)message;
-#if DEBUG_DV
+
encPeerAbout = GNUNET_strdup(GNUNET_i2s(&enc_message->neighbor));
encPeerFrom = GNUNET_strdup(GNUNET_i2s(peer));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1060,23 +1195,58 @@
GNUNET_free(encPeerFrom);
#endif
- if (ntohs (message->size) < sizeof (p2p_dv_MESSAGE_NeighborInfo))
- {
- return GNUNET_SYSERR; /* invalid message */
- }
-
referrer = GNUNET_CONTAINER_multihashmap_get (ctx.direct_neighbors,
&peer->hashPubKey);
if (referrer == NULL)
return GNUNET_OK;
- addUpdateNeighbor (&enc_message->neighbor,
+ addUpdateNeighbor (&enc_message->neighbor, &enc_message->pkey,
ntohl (enc_message->neighbor_id),
referrer, ntohl (enc_message->cost) + 1);
+ hello_context = GNUNET_malloc(sizeof(struct HelloContext));
+ hello_context->direct_peer = peer;
+ hello_context->distant_peer = &enc_message->neighbor;
+ hello_context->addresses_to_add = 1;
+ hello_msg = GNUNET_HELLO_create(&enc_message->pkey, &generate_hello_address,
hello_context);
+
+#if DEBUG_DV
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s: Sending %s message to plugin!\n", "dv", "HELLO");
+#endif
+
+ send_to_plugin(&enc_message->neighbor, GNUNET_HELLO_get_header(hello_msg),
GNUNET_HELLO_size(hello_msg), hello_context->distant_peer,
ntohl(enc_message->cost) + 1);
return GNUNET_OK;
}
+static void
+process_peerinfo (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Message *hello, uint32_t trust)
+{
+ struct PeerIteratorContext *peerinfo_iterator = cls;
+ struct DirectNeighbor *neighbor = peerinfo_iterator->neighbor;
+
+#if DEBUG_DV
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s: process_peerinfo called!\n", "dv");
+#endif
+
+ if ((peer == NULL))/* && (neighbor->pkey == NULL))*/
+ {
+ /* FIXME: Remove peer! */
+ return;
+ }
+
+ if (memcmp(&neighbor->identity, peer, sizeof(struct GNUNET_PeerIdentity) !=
0))
+ return;
+
+ if ((hello != NULL) && (GNUNET_HELLO_get_key (hello, &neighbor->pkey) ==
GNUNET_OK))
+ {
+ neighbor->send_context->task = GNUNET_SCHEDULER_add_now(sched,
&neighbor_send_task, neighbor->send_context);
+ }
+}
+
/**
* Method called whenever a peer connects.
*
@@ -1091,6 +1261,7 @@
uint32_t distance)
{
struct DirectNeighbor *neighbor;
+ struct PeerIteratorContext *peerinfo_iterator;
#if DEBUG_DV
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s: Receives core connect message for peer %s distance %d!\n",
"dv", GNUNET_i2s(peer), distance);
@@ -1098,16 +1269,29 @@
if ((distance == 0) &&
(GNUNET_CONTAINER_multihashmap_get(ctx.direct_neighbors, &peer->hashPubKey) ==
NULL))
{
+ peerinfo_iterator = GNUNET_malloc(sizeof(struct PeerIteratorContext));
neighbor = GNUNET_malloc (sizeof (struct DirectNeighbor));
neighbor->send_context = GNUNET_malloc(sizeof(struct NeighborSendContext));
neighbor->send_context->toNeighbor = neighbor;
neighbor->send_context->timeout = default_dv_delay; /* FIXME: base this on
total gossip tasks, or bandwidth */
memcpy (&neighbor->identity, peer, sizeof (struct GNUNET_PeerIdentity));
+ /*memcpy (&neighbor->pkey, ,sizeof(struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));*/
GNUNET_CONTAINER_multihashmap_put (ctx.direct_neighbors,
&peer->hashPubKey,
neighbor,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
- addUpdateNeighbor (peer, 0, neighbor, 0);
- neighbor->send_context->task = GNUNET_SCHEDULER_add_now(sched,
&neighbor_send_task, neighbor->send_context);
+ addUpdateNeighbor (peer, NULL, 0, neighbor, 0);
+ peerinfo_iterator->neighbor = neighbor;
+ peerinfo_iterator->ic = GNUNET_PEERINFO_iterate (cfg,
+ sched,
+ peer,
+ 0,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 15),
+ &process_peerinfo,
peerinfo_iterator);
+ /* Only add once we get the publicKey of this guy
+ *
+ * neighbor->send_context->task = GNUNET_SCHEDULER_add_now(sched,
&neighbor_send_task, neighbor->send_context);
+ */
}
else
{
Modified: gnunet/src/dv/plugin_transport_dv.c
===================================================================
--- gnunet/src/dv/plugin_transport_dv.c 2010-04-01 15:16:00 UTC (rev 10742)
+++ gnunet/src/dv/plugin_transport_dv.c 2010-04-01 15:51:38 UTC (rev 10743)
@@ -166,6 +166,9 @@
};
+/**
+ * Handler for messages received from the DV service.
+ */
void handle_dv_message_received (void *cls,
struct GNUNET_PeerIdentity *sender,
char *msg,
@@ -176,7 +179,10 @@
{
struct Plugin *plugin = cls;
- /* TODO: Add in demultiplexing if we think we'll be receiving multiple
messages at once */
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+ "plugin_transport_dv",
+ _("Received message from %s of type %d!\n"),
+ "DV SERVICE", ntohs(((struct GNUNET_MessageHeader
*)msg)->type));
plugin->env->receive(plugin,
sender,
(struct GNUNET_MessageHeader *)msg,
Modified: gnunet/src/dv/test_transport_api_dv_peer1.conf
===================================================================
--- gnunet/src/dv/test_transport_api_dv_peer1.conf 2010-04-01 15:16:00 UTC
(rev 10742)
+++ gnunet/src/dv/test_transport_api_dv_peer1.conf 2010-04-01 15:51:38 UTC
(rev 10743)
@@ -97,8 +97,8 @@
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-dv
-#BINARY =
/root/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
-#PREFIX = xterm -T dvservice -e gdb --args
+BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
+PREFIX = xterm -T dvservice -e gdb --args
CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10743 - gnunet/src/dv,
gnunet <=