[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33151 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33151 - gnunet/src/ats |
Date: |
Wed, 30 Apr 2014 17:41:52 +0200 |
Author: wachs
Date: 2014-04-30 17:41:52 +0200 (Wed, 30 Apr 2014)
New Revision: 33151
Modified:
gnunet/src/ats/gnunet-ats-solver-eval.c
Log:
simplify definition of address delete: only peer id and address id is required
Modified: gnunet/src/ats/gnunet-ats-solver-eval.c
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.c 2014-04-30 15:23:03 UTC (rev
33150)
+++ gnunet/src/ats/gnunet-ats-solver-eval.c 2014-04-30 15:41:52 UTC (rev
33151)
@@ -1263,7 +1263,7 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *op_name;
- char *op_network;
+ //char *op_network;
/* peer pid */
GNUNET_asprintf(&op_name, "op-%u-peer-id", op_counter);
@@ -1289,6 +1289,7 @@
}
GNUNET_free (op_name);
+#if 0
/* plugin */
GNUNET_asprintf(&op_name, "op-%u-plugin", op_counter);
if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg,
@@ -1324,56 +1325,8 @@
return GNUNET_SYSERR;
}
GNUNET_free (op_name);
+#endif
- /* network */
- GNUNET_asprintf(&op_name, "op-%u-address-network", op_counter);
- if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg,
- sec_name, op_name, &op_network))
- {
- fprintf (stderr, "Missing address-network in operation %u `%s' in episode
`%s'\n",
- op_counter, "ADD_ADDRESS", op_name);
- GNUNET_free (op_name);
- return GNUNET_SYSERR;
- }
- else
- {
- GNUNET_STRINGS_utf8_toupper (op_network,op_network);
- if (0 == strcmp(op_network, "UNSPECIFIED"))
- {
- o->address_network = GNUNET_ATS_NET_UNSPECIFIED;
- }
- else if (0 == strcmp(op_network, "LOOPBACK"))
- {
- o->address_network = GNUNET_ATS_NET_LOOPBACK;
- }
- else if (0 == strcmp(op_network, "LAN"))
- {
- o->address_network = GNUNET_ATS_NET_LAN;
- }
- else if (0 == strcmp(op_network, "WAN"))
- {
- o->address_network = GNUNET_ATS_NET_WAN;
- }
- else if (0 == strcmp(op_network, "WLAN"))
- {
- o->address_network = GNUNET_ATS_NET_WLAN;
- }
- else if (0 == strcmp(op_network, "BT"))
- {
- o->address_network = GNUNET_ATS_NET_BT;
- }
- else
- {
- fprintf (stderr, "Invalid address-network in operation %u `%s' in
episode `%s': `%s'\n",
- op_counter, "ADD_ADDRESS", op_name, op_network);
- GNUNET_free (op_network);
- GNUNET_free (op_name);
- return GNUNET_SYSERR;
- }
- }
- GNUNET_free (op_network);
- GNUNET_free (op_name);
-
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Found operation %s: [%llu:%llu] address `%s' plugin `%s' \n",
"DEL_ADDRESS", o->peer_id, o->address_id, o->address, o->plugin);
@@ -2146,7 +2099,6 @@
{
struct TestPeer *p;
struct TestAddress *a;
- struct AddressLookupCtx ctx;
struct PropertyGenerator *pg;
if (NULL == (p = find_peer_by_id (op->peer_id)))
@@ -2157,19 +2109,6 @@
return;
}
- ctx.plugin = op->plugin;
- ctx.addr = op->address;
- ctx.res = NULL;
- GNUNET_CONTAINER_multipeermap_get_multiple (sh->addresses, &p->peer_id,
- find_address_it, &ctx);
- if (NULL == ctx.res)
- {
- GNUNET_break (0);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Deleting unknown address for peer %u\n", op->peer_id);
- return;
- }
-
if (NULL == (a =find_address_by_id (p, op->address_id)))
{
GNUNET_break (0);
@@ -2184,15 +2123,14 @@
}
GNUNET_CONTAINER_DLL_remove(p->addr_head, p->addr_tail, a);
- GNUNET_free (a);
+ GNUNET_CONTAINER_multipeermap_remove (sh->addresses, &p->peer_id,
a->ats_addr);
- GNUNET_CONTAINER_multipeermap_remove (sh->addresses, &p->peer_id, ctx.res);
-
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Removing address %u for peer %u\n",
op->address_id, op->peer_id);
- sh->env.sf.s_del (sh->solver, ctx.res, GNUNET_NO);
- GNUNET_free (ctx.res);
+ sh->env.sf.s_del (sh->solver, a->ats_addr, GNUNET_NO);
+ GNUNET_free (a->ats_addr);
+ GNUNET_free (a);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33151 - gnunet/src/ats,
gnunet <=