diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-11-23 17:19:53 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-11-23 17:19:53 +0100 |
commit | 61787bfa37e0ac5998e01d9c4806600033c19c74 (patch) | |
tree | 1ceb843f63aa076682ebfa2de2250dc32ee65004 /src/dv/gnunet-service-dv.c | |
parent | 4a3be482811fe8ed1502fea2c12a8449b560a99e (diff) | |
download | gnunet-61787bfa37e0ac5998e01d9c4806600033c19c74.tar.gz gnunet-61787bfa37e0ac5998e01d9c4806600033c19c74.zip |
rename fest: use new libgnunetnt instead of old libgnunetats logic for network type classification
Diffstat (limited to 'src/dv/gnunet-service-dv.c')
-rw-r--r-- | src/dv/gnunet-service-dv.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 907963252..f183c77fd 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -222,7 +222,7 @@ struct DirectNeighbor | |||
222 | /** | 222 | /** |
223 | * The network this peer is in | 223 | * The network this peer is in |
224 | */ | 224 | */ |
225 | enum GNUNET_ATS_Network_Type network; | 225 | enum GNUNET_NetworkType network; |
226 | 226 | ||
227 | /** | 227 | /** |
228 | * Is this neighbor connected at the core level? | 228 | * Is this neighbor connected at the core level? |
@@ -439,11 +439,11 @@ send_control_to_plugin (const struct GNUNET_MessageHeader *message) | |||
439 | static void | 439 | static void |
440 | send_distance_change_to_plugin (const struct GNUNET_PeerIdentity *peer, | 440 | send_distance_change_to_plugin (const struct GNUNET_PeerIdentity *peer, |
441 | uint32_t distance, | 441 | uint32_t distance, |
442 | enum GNUNET_ATS_Network_Type network) | 442 | enum GNUNET_NetworkType network) |
443 | { | 443 | { |
444 | struct GNUNET_DV_DistanceUpdateMessage du_msg; | 444 | struct GNUNET_DV_DistanceUpdateMessage du_msg; |
445 | 445 | ||
446 | GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network); | 446 | GNUNET_break (GNUNET_NT_UNSPECIFIED != network); |
447 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 447 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
448 | "Delivering DISTANCE_CHANGED for message about peer `%s'\n", | 448 | "Delivering DISTANCE_CHANGED for message about peer `%s'\n", |
449 | GNUNET_i2s (peer)); | 449 | GNUNET_i2s (peer)); |
@@ -466,7 +466,7 @@ send_distance_change_to_plugin (const struct GNUNET_PeerIdentity *peer, | |||
466 | static void | 466 | static void |
467 | send_connect_to_plugin (const struct GNUNET_PeerIdentity *target, | 467 | send_connect_to_plugin (const struct GNUNET_PeerIdentity *target, |
468 | uint32_t distance, | 468 | uint32_t distance, |
469 | enum GNUNET_ATS_Network_Type network) | 469 | enum GNUNET_NetworkType network) |
470 | { | 470 | { |
471 | struct GNUNET_DV_ConnectMessage cm; | 471 | struct GNUNET_DV_ConnectMessage cm; |
472 | 472 | ||
@@ -833,7 +833,7 @@ handle_core_connect (void *cls, | |||
833 | peer); | 833 | peer); |
834 | if (NULL != neighbor) | 834 | if (NULL != neighbor) |
835 | { | 835 | { |
836 | GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != neighbor->network); | 836 | GNUNET_break (GNUNET_NT_UNSPECIFIED != neighbor->network); |
837 | GNUNET_break (GNUNET_YES != neighbor->connected); | 837 | GNUNET_break (GNUNET_YES != neighbor->connected); |
838 | neighbor->connected = GNUNET_YES; | 838 | neighbor->connected = GNUNET_YES; |
839 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 839 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -857,7 +857,7 @@ handle_core_connect (void *cls, | |||
857 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | 857 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); |
858 | neighbor->connected = GNUNET_YES; | 858 | neighbor->connected = GNUNET_YES; |
859 | neighbor->distance = 0; /* unknown */ | 859 | neighbor->distance = 0; /* unknown */ |
860 | neighbor->network = GNUNET_ATS_NET_UNSPECIFIED; | 860 | neighbor->network = GNUNET_NT_UNSPECIFIED; |
861 | return neighbor; | 861 | return neighbor; |
862 | } | 862 | } |
863 | 863 | ||
@@ -1123,7 +1123,7 @@ handle_ats_update (void *cls, | |||
1123 | { | 1123 | { |
1124 | struct DirectNeighbor *neighbor; | 1124 | struct DirectNeighbor *neighbor; |
1125 | uint32_t distance; | 1125 | uint32_t distance; |
1126 | enum GNUNET_ATS_Network_Type network; | 1126 | enum GNUNET_NetworkType network; |
1127 | 1127 | ||
1128 | if (NULL == address) | 1128 | if (NULL == address) |
1129 | { | 1129 | { |
@@ -1138,7 +1138,7 @@ handle_ats_update (void *cls, | |||
1138 | } | 1138 | } |
1139 | distance = prop->distance; | 1139 | distance = prop->distance; |
1140 | network = prop->scope; | 1140 | network = prop->scope; |
1141 | GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network); | 1141 | GNUNET_break (GNUNET_NT_UNSPECIFIED != network); |
1142 | /* check if entry exists */ | 1142 | /* check if entry exists */ |
1143 | neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors, | 1143 | neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors, |
1144 | &address->peer); | 1144 | &address->peer); |