[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21335 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21335 - gnunet/src/ats |
Date: |
Tue, 8 May 2012 11:45:08 +0200 |
Author: wachs
Date: 2012-05-08 11:45:08 +0200 (Tue, 08 May 2012)
New Revision: 21335
Modified:
gnunet/src/ats/gnunet-service-ats_addresses.c
gnunet/src/ats/gnunet-service-ats_addresses.h
gnunet/src/ats/gnunet-service-ats_scheduling.c
Log:
- fix for 601 assertion
Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c 2012-05-08 09:07:18 UTC
(rev 21334)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c 2012-05-08 09:45:08 UTC
(rev 21335)
@@ -576,7 +576,7 @@
}
-void
+int
GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
const char *plugin_name, const void *plugin_addr,
size_t plugin_addr_len, uint32_t session_id, int in_use)
@@ -591,7 +591,7 @@
struct ATS_Address *old;
if (GNUNET_NO == running)
- return;
+ return GNUNET_SYSERR;
aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len,
session_id);
old = find_exact_address (peer, aa);
@@ -599,26 +599,25 @@
if (NULL == old)
{
- GNUNET_break_op (0);
- return;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
if (old->used == in_use)
{
- GNUNET_break_op (0);
+ GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Address in use called multiple times for peer `%s': %s -> %s
\n",
GNUNET_i2s (peer),
(GNUNET_NO == old->used) ? "NO" : "YES",
(GNUNET_NO == in_use) ? "NO" : "YES");
- return;
+ return GNUNET_SYSERR;
}
-
old->used = in_use;
-
#if HAVE_LIBGLPK
if (ats_mode == MLP)
GAS_mlp_address_update (mlp, addresses, old);
#endif
+ return GNUNET_OK;
}
Modified: gnunet/src/ats/gnunet-service-ats_addresses.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.h 2012-05-08 09:07:18 UTC
(rev 21334)
+++ gnunet/src/ats/gnunet-service-ats_addresses.h 2012-05-08 09:45:08 UTC
(rev 21335)
@@ -105,7 +105,7 @@
/**
* This address is now used or not used anymore
*/
-void
+int
GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
const char *plugin_name, const void *plugin_addr,
size_t plugin_addr_len, uint32_t session_id, int in_use);
Modified: gnunet/src/ats/gnunet-service-ats_scheduling.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_scheduling.c 2012-05-08 09:07:18 UTC
(rev 21334)
+++ gnunet/src/ats/gnunet-service-ats_scheduling.c 2012-05-08 09:45:08 UTC
(rev 21335)
@@ -274,6 +274,7 @@
const struct AddressUseMessage *m;
const char *address;
const char *plugin_name;
+ int res;
uint16_t address_length;
uint16_t plugin_name_length;
@@ -309,10 +310,14 @@
}
in_use = ntohs (m->in_use);
- GAS_addresses_in_use (&m->peer, plugin_name, address, address_length,
- ntohl (m->session_id), in_use);
+ res = GAS_addresses_in_use (&m->peer,
+ plugin_name,
+ address,
+ address_length,
+ ntohl (m->session_id),
+ in_use);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client, res);
}
/**
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21335 - gnunet/src/ats,
gnunet <=