[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20815 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20815 - gnunet/src/transport |
Date: |
Fri, 30 Mar 2012 12:05:03 +0200 |
Author: wachs
Date: 2012-03-30 12:05:03 +0200 (Fri, 30 Mar 2012)
New Revision: 20815
Modified:
gnunet/src/transport/gnunet-service-transport_neighbours.c
gnunet/src/transport/gnunet-service-transport_validation.c
gnunet/src/transport/gnunet-service-transport_validation.h
Log:
- debugging code for mantis 2216
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2012-03-30
09:48:40 UTC (rev 20814)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2012-03-30
10:05:03 UTC (rev 20815)
@@ -921,7 +921,7 @@
GNUNET_assert (NULL != n->address);
if (n->address_state == USED)
{
- GST_validation_set_address_use (n->address, n->session, GNUNET_NO);
+ GST_validation_set_address_use (n->address, n->session, GNUNET_NO,
__LINE__);
GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_NO);
n->address_state = UNUSED;
}
@@ -1270,7 +1270,7 @@
case S_CONNECTED:
if (n->address_state == FRESH)
{
- GST_validation_set_address_use (cc->address, cc->session, GNUNET_YES);
+ GST_validation_set_address_use (cc->address, cc->session, GNUNET_YES,
__LINE__);
GNUNET_ATS_address_update (GST_ats, cc->address, cc->session, NULL, 0);
if (cc->session != n->session)
GNUNET_break (0);
@@ -1291,7 +1291,7 @@
if (n->address_state == FRESH)
{
- GST_validation_set_address_use (cc->address, cc->session, GNUNET_YES);
+ GST_validation_set_address_use (cc->address, cc->session, GNUNET_YES,
__LINE__);
GNUNET_ATS_address_update (GST_ats, cc->address, cc->session, NULL, 0);
GNUNET_ATS_address_in_use (GST_ats, cc->address, cc->session,
GNUNET_YES);
n->address_state = USED;
@@ -1471,7 +1471,7 @@
GNUNET_assert (NULL != n->address);
if (n->address_state == USED)
{
- GST_validation_set_address_use (n->address, n->session, GNUNET_NO);
+ GST_validation_set_address_use (n->address, n->session, GNUNET_NO,
__LINE__);
GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_NO);
n->address_state = UNUSED;
}
@@ -1802,7 +1802,7 @@
{
if (n->address_state == USED)
{
- GST_validation_set_address_use (n->address, n->session, GNUNET_NO);
+ GST_validation_set_address_use (n->address, n->session, GNUNET_NO,
__LINE__);
GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_NO);
n->address_state = UNUSED;
}
@@ -2469,7 +2469,7 @@
if ((n->address_state == FRESH) && (0 == GNUNET_HELLO_address_cmp(address,
n->address)))
{
- GST_validation_set_address_use (n->address, n->session, GNUNET_YES);
+ GST_validation_set_address_use (n->address, n->session, GNUNET_YES,
__LINE__);
GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES);
n->address_state = USED;
}
@@ -2556,7 +2556,7 @@
if ((n->address_state == FRESH) && (0 == GNUNET_HELLO_address_cmp(address,
n->address)))
{
- GST_validation_set_address_use (n->address, n->session, GNUNET_YES);
+ GST_validation_set_address_use (n->address, n->session, GNUNET_YES,
__LINE__);
GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES);
n->address_state = USED;
}
Modified: gnunet/src/transport/gnunet-service-transport_validation.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_validation.c 2012-03-30
09:48:40 UTC (rev 20814)
+++ gnunet/src/transport/gnunet-service-transport_validation.c 2012-03-30
10:05:03 UTC (rev 20815)
@@ -1211,13 +1211,16 @@
* @param session the session
* @param in_use GNUNET_YES if we are now using the address for a connection,
* GNUNET_NO if we are no longer using the address for a
connection
+ * @param line line of caller just for DEBUGGING!
*/
void
GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
struct Session *session,
- int in_use)
+ int in_use,
+ int line)
{
struct ValidationEntry *ve;
+ static int last_calling_line = 0;
if (NULL != address)
ve = find_validation_entry (NULL, address);
@@ -1229,10 +1232,16 @@
return;
}
if (ve->in_use == in_use)
+ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "GST_validation_set_address_use: %s %s: ve->in_use %i <->
in_use %i\n",
- GNUNET_i2s (&address->peer), GST_plugins_a2s (address),
ve->in_use,
- in_use);
+ "Error setting address in use for peer `%s' `%s': %s -> %s;
set last time by %i, called now by %i\n",
+
+ GNUNET_i2s (&address->peer), GST_plugins_a2s (address),
+ (GNUNET_NO == ve->in_use) ? "NOT USED" : "USED",
+ (GNUNET_NO == in_use) ? "NOT USED" : "USED",
+ last_calling_line, line);
+ }
+ last_calling_line = line;
GNUNET_break (ve->in_use != in_use); /* should be different... */
ve->in_use = in_use;
if (in_use == GNUNET_YES)
Modified: gnunet/src/transport/gnunet-service-transport_validation.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport_validation.h 2012-03-30
09:48:40 UTC (rev 20814)
+++ gnunet/src/transport/gnunet-service-transport_validation.h 2012-03-30
10:05:03 UTC (rev 20815)
@@ -52,13 +52,16 @@
* address more or less often.
*
* @param address the address
- * @param session session
+ * @param session the session
* @param in_use GNUNET_YES if we are now using the address for a connection,
* GNUNET_NO if we are no longer using the address for a
connection
+ * @param line line of caller just for DEBUGGING!
*/
void
GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
- struct Session *session, int in_use);
+ struct Session *session,
+ int in_use,
+ int line);
/**
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20815 - gnunet/src/transport,
gnunet <=