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/plugin_transport_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/plugin_transport_dv.c')
-rw-r--r-- | src/dv/plugin_transport_dv.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c index 6c815735e..ca4908e95 100644 --- a/src/dv/plugin_transport_dv.c +++ b/src/dv/plugin_transport_dv.c | |||
@@ -82,7 +82,7 @@ struct GNUNET_ATS_Session | |||
82 | /** | 82 | /** |
83 | * Current network the next hop peer is located in | 83 | * Current network the next hop peer is located in |
84 | */ | 84 | */ |
85 | enum GNUNET_ATS_Network_Type network; | 85 | enum GNUNET_NetworkType network; |
86 | 86 | ||
87 | /** | 87 | /** |
88 | * Does the transport service know about this session (and we thus | 88 | * Does the transport service know about this session (and we thus |
@@ -288,12 +288,12 @@ static void | |||
288 | handle_dv_connect (void *cls, | 288 | handle_dv_connect (void *cls, |
289 | const struct GNUNET_PeerIdentity *peer, | 289 | const struct GNUNET_PeerIdentity *peer, |
290 | uint32_t distance, | 290 | uint32_t distance, |
291 | enum GNUNET_ATS_Network_Type network) | 291 | enum GNUNET_NetworkType network) |
292 | { | 292 | { |
293 | struct Plugin *plugin = cls; | 293 | struct Plugin *plugin = cls; |
294 | struct GNUNET_ATS_Session *session; | 294 | struct GNUNET_ATS_Session *session; |
295 | 295 | ||
296 | GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network); | 296 | GNUNET_break (GNUNET_NT_UNSPECIFIED != network); |
297 | /** | 297 | /** |
298 | * This requires transport plugin to be linked to libgnunetats. | 298 | * This requires transport plugin to be linked to libgnunetats. |
299 | * If you remove it, also remove libgnunetats linkage from Makefile.am | 299 | * If you remove it, also remove libgnunetats linkage from Makefile.am |
@@ -301,7 +301,7 @@ handle_dv_connect (void *cls, | |||
301 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 301 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
302 | "Received DV_CONNECT message for peer `%s' with next hop in network %s\n", | 302 | "Received DV_CONNECT message for peer `%s' with next hop in network %s\n", |
303 | GNUNET_i2s (peer), | 303 | GNUNET_i2s (peer), |
304 | GNUNET_ATS_print_network_type (network)); | 304 | GNUNET_NT_to_string (network)); |
305 | 305 | ||
306 | session = GNUNET_CONTAINER_multipeermap_get (plugin->sessions, | 306 | session = GNUNET_CONTAINER_multipeermap_get (plugin->sessions, |
307 | peer); | 307 | peer); |
@@ -359,12 +359,12 @@ static void | |||
359 | handle_dv_distance_changed (void *cls, | 359 | handle_dv_distance_changed (void *cls, |
360 | const struct GNUNET_PeerIdentity *peer, | 360 | const struct GNUNET_PeerIdentity *peer, |
361 | uint32_t distance, | 361 | uint32_t distance, |
362 | enum GNUNET_ATS_Network_Type network) | 362 | enum GNUNET_NetworkType network) |
363 | { | 363 | { |
364 | struct Plugin *plugin = cls; | 364 | struct Plugin *plugin = cls; |
365 | struct GNUNET_ATS_Session *session; | 365 | struct GNUNET_ATS_Session *session; |
366 | 366 | ||
367 | GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network); | 367 | GNUNET_break (GNUNET_NT_UNSPECIFIED != network); |
368 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 368 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
369 | "Received `%s' message for peer `%s': new distance %u\n", | 369 | "Received `%s' message for peer `%s': new distance %u\n", |
370 | "DV_DISTANCE_CHANGED", | 370 | "DV_DISTANCE_CHANGED", |
@@ -715,7 +715,7 @@ dv_plugin_update_session_timeout (void *cls, | |||
715 | * @param session the session | 715 | * @param session the session |
716 | * @return the network type | 716 | * @return the network type |
717 | */ | 717 | */ |
718 | static enum GNUNET_ATS_Network_Type | 718 | static enum GNUNET_NetworkType |
719 | dv_get_network (void *cls, | 719 | dv_get_network (void *cls, |
720 | struct GNUNET_ATS_Session *session) | 720 | struct GNUNET_ATS_Session *session) |
721 | { | 721 | { |
@@ -731,11 +731,11 @@ dv_get_network (void *cls, | |||
731 | * @param address the address | 731 | * @param address the address |
732 | * @return the network type | 732 | * @return the network type |
733 | */ | 733 | */ |
734 | static enum GNUNET_ATS_Network_Type | 734 | static enum GNUNET_NetworkType |
735 | dv_plugin_get_network_for_address (void *cls, | 735 | dv_plugin_get_network_for_address (void *cls, |
736 | const struct GNUNET_HELLO_Address *address) | 736 | const struct GNUNET_HELLO_Address *address) |
737 | { | 737 | { |
738 | return GNUNET_ATS_NET_WAN; /* FOR NOW */ | 738 | return GNUNET_NT_WAN; /* FOR NOW */ |
739 | } | 739 | } |
740 | 740 | ||
741 | 741 | ||