#include "gnunet_core_service.h"
#include "gnunet_statistics_service.h"
-#include "mesh_protocol_enc.h"
+#include "mesh_protocol.h"
#include "gnunet-service-mesh_peer.h"
#include "gnunet-service-mesh_dht.h"
static void
core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
- struct MeshPeer *pi;
+ struct MeshPeer *p;
LOG (GNUNET_ERROR_TYPE_DEBUG, "Peer disconnected\n");
- pi = GNUNET_CONTAINER_multipeermap_get (peers, peer);
- if (NULL == pi)
+ p = GNUNET_CONTAINER_multipeermap_get (peers, peer);
+ if (NULL == p)
{
GNUNET_break (0);
return;
}
+ if (myid == p->id)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " (self)\n");
+ else
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " %s\n", GMP_2s (p));
+
- GNUNET_CONTAINER_multihashmap_iterate (pi->connections, ¬ify_broken, pi);
- GNUNET_CONTAINER_multihashmap_destroy (pi->connections);
- pi->connections = NULL;
- if (NULL != pi->core_transmit)
+ GNUNET_CONTAINER_multihashmap_iterate (p->connections, ¬ify_broken, p);
+ GNUNET_CONTAINER_multihashmap_destroy (p->connections);
+ p->connections = NULL;
+ if (NULL != p->core_transmit)
{
- GNUNET_CORE_notify_transmit_ready_cancel (pi->core_transmit);
- pi->core_transmit = NULL;
+ GNUNET_CORE_notify_transmit_ready_cancel (p->core_transmit);
+ p->core_transmit = NULL;
}
- if (myid == pi->id)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " (self)\n");
- }
GNUNET_STATISTICS_update (stats, "# peers", -1, GNUNET_NO);
return;
sizeof (struct GNUNET_MESH_ConnectionBroken)},
{&GMC_handle_destroy, GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY,
sizeof (struct GNUNET_MESH_ConnectionDestroy)},
- {&GMC_handle_keepalive, GNUNET_MESSAGE_TYPE_MESH_FWD_KEEPALIVE,
- sizeof (struct GNUNET_MESH_ConnectionKeepAlive)},
- {&GMC_handle_keepalive, GNUNET_MESSAGE_TYPE_MESH_BCK_KEEPALIVE,
+ {&GMC_handle_keepalive, GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE,
sizeof (struct GNUNET_MESH_ConnectionKeepAlive)},
{&GMC_handle_ack, GNUNET_MESSAGE_TYPE_MESH_ACK,
sizeof (struct GNUNET_MESH_ACK)},
size_t size_needed;
int i;
+ if (NULL == p)
+ return 0;
+
LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending CONNECTION CREATE...\n");
size_needed =
sizeof (struct GNUNET_MESH_ConnectionCreate) +
GNUNET_PEER_resolve (p->peers[i], peer_ptr++);
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"CONNECTION CREATE (%u bytes long) sent!\n",
size_needed);
return size_needed;
GNUNET_PEER_resolve (peer->id, &id);
GNUNET_PEER_change_rc (peer->id, -1);
+ LOG (GNUNET_ERROR_TYPE_WARNING, "destroying peer %s\n", GNUNET_i2s (&id));
+
if (GNUNET_YES !=
GNUNET_CONTAINER_multipeermap_remove (peers, &id, peer))
{
GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "removing peer %s, not in peermap\n", GNUNET_i2s (&id));
+ LOG (GNUNET_ERROR_TYPE_WARNING, " not in peermap!!\n");
}
if (NULL != peer->search_h)
{
struct MeshPeer *p = value;
struct GNUNET_TIME_Absolute *abs = cls;
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "peer %s timeout\n", GNUNET_i2s (key));
+
if (p->last_contact.abs_value_us == abs->abs_value_us &&
- GNUNET_NO == peer_is_used (p))
+ GNUNET_NO == peer_is_used (p))
{
peer_destroy (p);
return GNUNET_NO;
if (3 <= connection_count)
return;
- if (MESH_TUNNEL3_SEARCHING == GMT_get_state (peer->tunnel))
+ if (MESH_TUNNEL3_SEARCHING == GMT_get_cstate (peer->tunnel))
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " ... connect!\n");
GMP_connect (peer);
}
-/**
- * Free a transmission that was already queued with all resources
- * associated to the request.
- *
- * @param queue Queue handler to cancel.
- * @param clear_cls Is it necessary to free associated cls?
- */
-static void
-queue_destroy (struct MeshPeerQueue *queue, int clear_cls)
-{
- struct MeshPeer *peer;
-
- peer = queue->peer;
- GNUNET_assert (NULL != queue->c);
-
- if (GNUNET_YES == clear_cls)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, "# queue destroy type %s\n",
- GNUNET_MESH_DEBUG_M2S (queue->type));
- switch (queue->type)
- {
- case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
- case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
- LOG (GNUNET_ERROR_TYPE_INFO, "destroying a DESTROY message\n");
- /* fall through */
- case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
- case GNUNET_MESSAGE_TYPE_MESH_ACK:
- case GNUNET_MESSAGE_TYPE_MESH_POLL:
- case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK:
- case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE:
- case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
- LOG (GNUNET_ERROR_TYPE_DEBUG, "# prebuilt message\n");;
- GNUNET_free_non_null (queue->cls);
- break;
-
- default:
- GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_ERROR, "# type %s unknown!\n",
- GNUNET_MESH_DEBUG_M2S (queue->type));
- }
- }
- GNUNET_CONTAINER_DLL_remove (peer->queue_head, peer->queue_tail, queue);
-
- if (queue->type != GNUNET_MESSAGE_TYPE_MESH_ACK &&
- queue->type != GNUNET_MESSAGE_TYPE_MESH_POLL)
- {
- peer->queue_n--;
- }
-
- if (NULL != queue->callback)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, "# Calling callback\n");
- queue->callback (queue->callback_cls,
- queue->c, queue->type,
- queue->fwd, queue->size,
- GNUNET_TIME_absolute_get_duration (queue->start_waiting));
- }
-
- GNUNET_free (queue);
-}
-
/**
* Core callback to write a queued packet to core buffer
*
* @param buf Where the to write the message.
*
* @return number of bytes written to buf
+ *
+ * FIXME add GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE
*/
static size_t
queue_send (void *cls, size_t size, void *buf)
dst_id = GNUNET_PEER_resolve2 (peer->id);
LOG (GNUNET_ERROR_TYPE_DEBUG, "* towards %s\n", GNUNET_i2s (dst_id));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "* on connection %s\n", GMC_2s (c));
/* Check if buffer size is enough for the message */
if (queue->size > size)
{
/* Fill buf */
switch (queue->type)
{
- case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
+ case GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE:
case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
case GNUNET_MESSAGE_TYPE_MESH_KX:
case GNUNET_MESSAGE_TYPE_MESH_ACK:
case GNUNET_MESSAGE_TYPE_MESH_POLL:
LOG (GNUNET_ERROR_TYPE_DEBUG,
"* raw: %s\n",
- GNUNET_MESH_DEBUG_M2S (queue->type));
+ GM_m2s (queue->type));
data_size = send_core_data_raw (queue->cls, size, buf);
break;
case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE:
break;
default:
GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_WARNING, "* type unknown: %u\n",
- queue->type);
+ LOG (GNUNET_ERROR_TYPE_WARNING, "* type unknown: %u\n", queue->type);
data_size = 0;
}
{
LOG (GNUNET_ERROR_TYPE_WARNING,
"Dropping message of type %s\n",
- GNUNET_MESH_DEBUG_M2S (queue->type));
+ GM_m2s (queue->type));
data_size = 0;
}
/* Free queue, but cls was freed by send_core_* */
- queue_destroy (queue, GNUNET_NO);
+ GMP_queue_destroy (queue, GNUNET_NO);
/* If more data in queue, send next */
queue = peer_get_first_message (peer);
/******************************** API ***********************************/
/******************************************************************************/
+
+/**
+ * Free a transmission that was already queued with all resources
+ * associated to the request.
+ *
+ * @param queue Queue handler to cancel.
+ * @param clear_cls Is it necessary to free associated cls?
+ */
+void
+GMP_queue_destroy (struct MeshPeerQueue *queue, int clear_cls)
+{
+ struct MeshPeer *peer;
+
+ peer = queue->peer;
+ GNUNET_assert (NULL != queue->c);
+
+ if (GNUNET_YES == clear_cls)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# queue destroy type %s\n",
+ GM_m2s (queue->type));
+ switch (queue->type)
+ {
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY:
+ LOG (GNUNET_ERROR_TYPE_INFO, "destroying a DESTROY message\n");
+ /* fall through */
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK:
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE:
+ case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN:
+ case GNUNET_MESSAGE_TYPE_MESH_KX:
+ case GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED:
+ case GNUNET_MESSAGE_TYPE_MESH_ACK:
+ case GNUNET_MESSAGE_TYPE_MESH_POLL:
+ GNUNET_free_non_null (queue->cls);
+ break;
+
+ default:
+ GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_ERROR, "# type %s unknown!\n",
+ GM_m2s (queue->type));
+ }
+ }
+ GNUNET_CONTAINER_DLL_remove (peer->queue_head, peer->queue_tail, queue);
+
+ if (queue->type != GNUNET_MESSAGE_TYPE_MESH_ACK &&
+ queue->type != GNUNET_MESSAGE_TYPE_MESH_POLL)
+ {
+ peer->queue_n--;
+ }
+
+ if (NULL != queue->callback)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "# Calling callback\n");
+ queue->callback (queue->callback_cls,
+ queue->c, queue->type,
+ queue->fwd, queue->size,
+ GNUNET_TIME_absolute_get_duration (queue->start_waiting));
+ }
+
+ GNUNET_free (queue);
+}
+
+
/**
* @brief Queue and pass message to core when possible.
*
* @param fwd Is this a message going root->dest? (FWD ACK are NOT FWD!)
* @param cont Continuation to be called once CORE has taken the message.
* @param cont_cls Closure for @c cont.
+ *
+ * @return Handle to cancel the message before it is sent. Once cont is called
+ * message has been sent and therefore the handle is no longer valid.
*/
-void
+struct MeshPeerQueue *
GMP_queue_add (struct MeshPeer *peer, void *cls, uint16_t type, size_t size,
struct MeshConnection *c, int fwd,
GMP_sent cont, void *cont_cls)
LOG (GNUNET_ERROR_TYPE_DEBUG,
"queue add %s %s towards %s (size %u) on c %p (%s)\n",
- fwd ? "FWD" : "BCK", GNUNET_MESH_DEBUG_M2S (type), GMP_2s(peer),
+ GM_f2s (fwd), GM_m2s (type), GMP_2s(peer),
size, c, GMC_2s (c));
GNUNET_assert (NULL != c);
{
/* We are not connected to this peer, ignore request. */
GNUNET_break_op (0);
- return;
+ return NULL;
}
priority = 0;
GMP_2s (peer));
}
+ return queue;
}
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"GMP_cancel_queue %s\n",
- GNUNET_MESH_DEBUG_M2S (q->type));
- queue_destroy (q, GNUNET_YES);
+ GM_m2s (q->type));
+ GMP_queue_destroy (q, GNUNET_YES);
/* Get next from prev, q->next might be already freed:
* queue destroy -> callback -> GMC_destroy -> cancel_queues -> here
if (q->c != c)
continue;
if (queue_is_sendable (q))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " sendable!!\n");
return q;
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " not sendable\n");
}
return NULL;
}
+
void
GMP_queue_unlock (struct MeshPeer *peer, struct MeshConnection *c)
{
* Re-running the DHT GET should give core time to callback.
*/
GNUNET_break(0);
- rerun_search = GNUNET_YES;
+ rerun_search = GNUNET_YES;
}
else
{
return;
}
}
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "but is NULL!!\n");
+ GNUNET_break (0);
+ }
}
if (NULL != peer->search_h && GNUNET_YES == rerun_search)
{
GMD_search_stop (peer->search_h);
peer->search_h = NULL;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
" Stopping DHT GET for peer %s\n",
GMP_2s (peer));
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
" Starting DHT GET for peer %s\n", GMP_2s (peer));
peer->search_h = GMD_search (id, &search_handler, peer);
- if (MESH_TUNNEL3_NEW == GMT_get_state (t))
- GMT_change_state (t, MESH_TUNNEL3_SEARCHING);
+ if (MESH_TUNNEL3_NEW == GMT_get_cstate (t))
+ GMT_change_cstate (t, MESH_TUNNEL3_SEARCHING);
}
}
if (NULL == peer || NULL == peer->connections)
{
GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_WARNING,
"Peer %s is not a neighbor!\n",
GMP_2s (peer));
return GNUNET_SYSERR;
if (NULL == peer)
return "(NULL)";
return GNUNET_i2s (GNUNET_PEER_resolve2 (peer->id));
-}
\ No newline at end of file
+}