[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17544 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17544 - gnunet/src/transport |
Date: |
Mon, 17 Oct 2011 14:10:03 +0200 |
Author: grothoff
Date: 2011-10-17 14:10:02 +0200 (Mon, 17 Oct 2011)
New Revision: 17544
Modified:
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/gnunet-service-transport_neighbours.c
gnunet/src/transport/plugin_transport_tcp.c
Log:
simplify
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2011-10-17 11:55:08 UTC
(rev 17543)
+++ gnunet/src/transport/gnunet-service-transport.c 2011-10-17 12:10:02 UTC
(rev 17544)
@@ -243,6 +243,13 @@
GNUNET_free (im);
}
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Discarded %u bytes of type %u from %s via plugin %s:
connection is down!\n"),
+ ntohs (message->size),
+ type,
+ GNUNET_i2s (peer),
+ plugin_name);
break;
}
}
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-10-17
11:55:08 UTC (rev 17543)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-10-17
12:10:02 UTC (rev 17544)
@@ -798,9 +798,6 @@
if (GNUNET_YES != n->is_connected)
return; /* not connected anymore anyway, shouldn't
matter */
-
- //n->is_connected = GNUNET_NO;
-
/* fast disconnect unless ATS suggests a new address */
GNUNET_SCHEDULER_cancel (n->timeout_task);
n->timeout_task =
@@ -869,8 +866,6 @@
cont (cont_cls, GNUNET_SYSERR);
return;
}
-
-
GNUNET_assert (msg_size >= sizeof (struct GNUNET_MessageHeader));
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
@@ -917,6 +912,14 @@
*do_forward = GNUNET_NO;
return GNUNET_TIME_UNIT_ZERO;
}
+ if (GNUNET_YES != n->is_connected)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Plugin gave us %d bytes of data but somehow the session is
not marked as UP yet!\n"),
+ (int) size);
+ *do_forward = GNUNET_NO;
+ return GNUNET_TIME_UNIT_ZERO;
+ }
if (GNUNET_YES == GNUNET_BANDWIDTH_tracker_consume (&n->in_tracker, size))
{
n->quota_violation_count++;
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2011-10-17 11:55:08 UTC (rev
17543)
+++ gnunet/src/transport/plugin_transport_tcp.c 2011-10-17 12:10:02 UTC (rev
17544)
@@ -701,7 +701,7 @@
cbuf += pos->message_size;
ret += pos->message_size;
size -= pos->message_size;
- GNUNET_CONTAINER_DLL_insert_after (hd, tl, tl, pos);
+ GNUNET_CONTAINER_DLL_insert_tail (hd, tl, pos);
}
/* schedule 'continuation' before callbacks so that callbacks that
* cancel everything don't cause us to use a session that no longer
@@ -1066,8 +1066,7 @@
pm->transmit_cont_cls = cont_cls;
/* append pm to pending_messages list */
- GNUNET_CONTAINER_DLL_insert_after (session->pending_messages_head,
- session->pending_messages_tail,
+ GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head,
session->pending_messages_tail, pm);
GNUNET_assert (GNUNET_CONTAINER_multihashmap_put
@@ -1151,9 +1150,8 @@
pm->transmit_cont_cls = cont_cls;
/* append pm to pending_messages list */
- GNUNET_CONTAINER_DLL_insert_after (session->pending_messages_head,
- session->pending_messages_tail,
- session->pending_messages_tail, pm);
+ GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head,
+ session->pending_messages_tail, pm);
#if DEBUG_TCP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
"Asked to transmit %u bytes to `%s', added message to
list.\n",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17544 - gnunet/src/transport,
gnunet <=