[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 01/17: out-of-order PIDs are not exactly protocol
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 01/17: out-of-order PIDs are not exactly protocol violations, hence do not report as such |
Date: |
Mon, 09 Jan 2017 21:19:07 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit b92cddf9eff5f5fd8b5c9f754a75a79ad24ed14e
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Jan 9 08:22:33 2017 +0100
out-of-order PIDs are not exactly protocol violations, hence do not report
as such
---
src/cadet/gnunet-service-cadet_connection.c | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/cadet/gnunet-service-cadet_connection.c
b/src/cadet/gnunet-service-cadet_connection.c
index fa2bb962b..c0ac32b06 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -2422,6 +2422,7 @@ check_message (const struct GNUNET_MessageHeader *message,
"%s on unknown connection %s\n",
GC_m2s (ntohs (message->type)),
GNUNET_h2s (GC_h2hc (cid)));
+ GNUNET_break_op (0);
send_broken_unknown (cid,
&my_full_id,
NULL,
@@ -2460,10 +2461,13 @@ check_message (const struct GNUNET_MessageHeader
*message,
pid, fc->last_pid_recv + 1, fc->last_ack_sent);
if (GC_is_pid_bigger (pid, fc->last_ack_sent))
{
- GNUNET_break_op (0);
- GNUNET_STATISTICS_update (stats, "# unsolicited message", 1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_WARNING, "Received PID %u, (prev %u), ACK %u\n",
- pid, fc->last_pid_recv, fc->last_ack_sent);
+ GNUNET_STATISTICS_update (stats,
+ "# unsolicited message",
+ 1,
+ GNUNET_NO);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Received PID %u, (prev %u), ACK %u\n",
+ pid, fc->last_pid_recv, fc->last_ack_sent);
return GNUNET_SYSERR;
}
if (GC_is_pid_bigger (pid, fc->last_pid_recv))
@@ -2477,10 +2481,16 @@ check_message (const struct GNUNET_MessageHeader
*message,
}
else
{
- GNUNET_STATISTICS_update (stats, "# out of order PID", 1, GNUNET_NO);
- if (GNUNET_NO == is_ooo_ok (fc->last_pid_recv, pid, fc->recv_bitmap))
+ GNUNET_STATISTICS_update (stats,
+ "# out of order PID",
+ 1,
+ GNUNET_NO);
+ if (GNUNET_NO == is_ooo_ok (fc->last_pid_recv,
+ pid,
+ fc->recv_bitmap))
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "PID %u unexpected (%u+), dropping!\n",
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "PID %u unexpected (%u+), dropping!\n",
pid, fc->last_pid_recv - 31);
return GNUNET_SYSERR;
}
@@ -2489,7 +2499,8 @@ check_message (const struct GNUNET_MessageHeader *message,
}
/* Count as connection confirmation. */
- if (CADET_CONNECTION_SENT == c->state || CADET_CONNECTION_ACK == c->state)
+ if ( (CADET_CONNECTION_SENT == c->state) ||
+ (CADET_CONNECTION_ACK == c->state) )
{
connection_change_state (c, CADET_CONNECTION_READY);
if (NULL != c->t)
@@ -2591,7 +2602,6 @@ GCC_handle_encrypted (struct CadetPeer *peer,
/* If something went wrong, discard message. */
if (GNUNET_SYSERR == fwd)
{
- GNUNET_break_op (0);
GCC_check_connections ();
return;
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (fc158da4c -> aae0e990d), gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 15/17: remove obsolete options, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 13/17: cosmetics, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 05/17: ignore zonefiles dir, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 07/17: rename new core API implementation to name of standard implementation, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 08/17: rename new client API implementation to name of standard implementation, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 04/17: dead code elimination, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 03/17: handle transmissions initiated during disconnect callbacks by dropping, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 12/17: enable upnpc by default, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 01/17: out-of-order PIDs are not exactly protocol violations, hence do not report as such,
gnunet <=
- [GNUnet-SVN] [gnunet] 10/17: fix link issue, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 09/17: log at DEBUG level, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 02/17: cancel potentially dangling reconnect task, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 16/17: do not attempt to publish empty HELLOs, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 14/17: improve comments, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 17/17: cosmetics, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 11/17: eliminate dead NAT options, gnunet, 2017/01/09
- [GNUnet-SVN] [gnunet] 06/17: remove legacy core api code (now dead), gnunet, 2017/01/09