[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28257 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28257 - gnunet/src/mesh |
Date: |
Tue, 23 Jul 2013 01:20:27 +0200 |
Author: bartpolot
Date: 2013-07-23 01:20:26 +0200 (Tue, 23 Jul 2013)
New Revision: 28257
Modified:
gnunet/src/mesh/gnunet-service-mesh.c
Log:
- don't try to do stuff on an error callback
Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c 2013-07-22 21:46:28 UTC (rev
28256)
+++ gnunet/src/mesh/gnunet-service-mesh.c 2013-07-22 23:20:26 UTC (rev
28257)
@@ -3610,6 +3610,12 @@
peer->core_transmit = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* Queue send\n");
+
+ if (NULL == buf || 0 ==size)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* Buffer size 0.\n");
+ return 0;
+ }
queue = queue_get_next (peer);
/* Queue has no internal mesh traffic nor sendable payload */
@@ -3620,6 +3626,7 @@
GNUNET_break (0); /* Core tmt_rdy should've been canceled */
return 0;
}
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "* not empty\n");
GNUNET_PEER_resolve (peer->id, &dst_id);
@@ -3802,7 +3809,6 @@
struct MeshPeerInfo *dst, struct MeshTunnel *t)
{
struct MeshPeerQueue *queue;
- struct GNUNET_PeerIdentity id;
struct MeshFlowControl *fc;
int priority;
@@ -3869,16 +3875,15 @@
}
else
GNUNET_CONTAINER_DLL_insert_tail (dst->queue_head, dst->queue_tail, queue);
-
+
if (NULL == dst->core_transmit)
{
- GNUNET_PEER_resolve (dst->id, &id);
dst->core_transmit =
GNUNET_CORE_notify_transmit_ready (core_handle,
0,
0,
GNUNET_TIME_UNIT_FOREVER_REL,
- &id,
+ GNUNET_PEER_resolve2 (dst->id),
size,
&queue_send,
dst);
@@ -4662,7 +4667,7 @@
uint32_t pid;
uint32_t old;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got an POLL packet from %s!\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got a POLL packet from %s!\n",
GNUNET_i2s (peer));
msg = (struct GNUNET_MESH_Poll *) message;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28257 - gnunet/src/mesh,
gnunet <=