[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33100 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33100 - gnunet/src/ats |
Date: |
Wed, 16 Apr 2014 15:06:48 +0200 |
Author: wachs
Date: 2014-04-16 15:06:48 +0200 (Wed, 16 Apr 2014)
New Revision: 33100
Modified:
gnunet/src/ats/gnunet-ats-solver-eval.c
Log:
improved network definition
Modified: gnunet/src/ats/gnunet-ats-solver-eval.c
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.c 2014-04-16 12:20:59 UTC (rev
33099)
+++ gnunet/src/ats/gnunet-ats-solver-eval.c 2014-04-16 13:06:48 UTC (rev
33100)
@@ -1079,6 +1079,7 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *op_name;
+ char *op_network;
/* peer pid */
GNUNET_asprintf(&op_name, "op-%u-peer-id", op_counter);
@@ -1142,14 +1143,51 @@
/* network */
GNUNET_asprintf(&op_name, "op-%u-address-network", op_counter);
- if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
- sec_name, op_name, &o->address_network))
+ 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,
@@ -1167,6 +1205,7 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *op_name;
+ char *op_network;
/* peer pid */
GNUNET_asprintf(&op_name, "op-%u-peer-id", op_counter);
@@ -1230,14 +1269,51 @@
/* network */
GNUNET_asprintf(&op_name, "op-%u-address-network", op_counter);
- if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
- sec_name, op_name, &o->address_network))
+ 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, "DEL_ADDRESS", op_name);
+ 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,
@@ -1989,8 +2065,8 @@
GNUNET_CONTAINER_multipeermap_put (sh->addresses, &p->peer_id, a->ats_addr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Adding address %u for peer %u\n",
- op->address_id, op->peer_id);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Adding address %u for peer %u in
network `%s'\n",
+ op->address_id, op->peer_id,
GNUNET_ATS_print_network_type(op->address_network));
sh->env.sf.s_add (sh->solver, a->ats_addr, op->address_network);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33100 - gnunet/src/ats,
gnunet <=