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/transport/plugin_transport_xt.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/transport/plugin_transport_xt.c')
-rw-r--r-- | src/transport/plugin_transport_xt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/transport/plugin_transport_xt.c b/src/transport/plugin_transport_xt.c index 0f517dd0c..08f59bd70 100644 --- a/src/transport/plugin_transport_xt.c +++ b/src/transport/plugin_transport_xt.c | |||
@@ -859,7 +859,7 @@ struct GNUNET_ATS_Session | |||
859 | /** | 859 | /** |
860 | * Network type of the address. | 860 | * Network type of the address. |
861 | */ | 861 | */ |
862 | enum GNUNET_ATS_Network_Type scope; | 862 | enum GNUNET_NetworkType scope; |
863 | 863 | ||
864 | /** | 864 | /** |
865 | * Are we still expecting the welcome message? (#GNUNET_YES/#GNUNET_NO) | 865 | * Are we still expecting the welcome message? (#GNUNET_YES/#GNUNET_NO) |
@@ -1896,7 +1896,7 @@ reschedule_session_timeout (struct GNUNET_ATS_Session *s) | |||
1896 | static struct GNUNET_ATS_Session * | 1896 | static struct GNUNET_ATS_Session * |
1897 | create_session (struct Plugin *plugin, | 1897 | create_session (struct Plugin *plugin, |
1898 | const struct GNUNET_HELLO_Address *address, | 1898 | const struct GNUNET_HELLO_Address *address, |
1899 | enum GNUNET_ATS_Network_Type scope, | 1899 | enum GNUNET_NetworkType scope, |
1900 | struct GNUNET_SERVER_Client *client, | 1900 | struct GNUNET_SERVER_Client *client, |
1901 | int is_nat) | 1901 | int is_nat) |
1902 | { | 1902 | { |
@@ -2442,7 +2442,7 @@ tcp_plugin_get_session (void *cls, | |||
2442 | const struct IPv4TcpAddress *t4; | 2442 | const struct IPv4TcpAddress *t4; |
2443 | const struct IPv6TcpAddress *t6; | 2443 | const struct IPv6TcpAddress *t6; |
2444 | unsigned int options; | 2444 | unsigned int options; |
2445 | enum GNUNET_ATS_Network_Type net_type; | 2445 | enum GNUNET_NetworkType net_type; |
2446 | unsigned int is_natd = GNUNET_NO; | 2446 | unsigned int is_natd = GNUNET_NO; |
2447 | size_t addrlen; | 2447 | size_t addrlen; |
2448 | #ifdef TCP_STEALTH | 2448 | #ifdef TCP_STEALTH |
@@ -2545,7 +2545,7 @@ tcp_plugin_get_session (void *cls, | |||
2545 | net_type = plugin->env->get_address_type (plugin->env->cls, | 2545 | net_type = plugin->env->get_address_type (plugin->env->cls, |
2546 | sb, | 2546 | sb, |
2547 | sbs); | 2547 | sbs); |
2548 | GNUNET_break (net_type != GNUNET_ATS_NET_UNSPECIFIED); | 2548 | GNUNET_break (net_type != GNUNET_NT_UNSPECIFIED); |
2549 | 2549 | ||
2550 | if ( (is_natd == GNUNET_YES) && | 2550 | if ( (is_natd == GNUNET_YES) && |
2551 | (addrlen == sizeof(struct IPv6TcpAddress)) ) | 2551 | (addrlen == sizeof(struct IPv6TcpAddress)) ) |
@@ -3269,7 +3269,7 @@ handle_tcp_welcome (void *cls, | |||
3269 | alen), | 3269 | alen), |
3270 | client, | 3270 | client, |
3271 | GNUNET_NO); | 3271 | GNUNET_NO); |
3272 | GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != session->scope); | 3272 | GNUNET_break (GNUNET_NT_UNSPECIFIED != session->scope); |
3273 | GNUNET_HELLO_address_free (address); | 3273 | GNUNET_HELLO_address_free (address); |
3274 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 3274 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
3275 | "Creating new%s session %p for peer `%s' client %p\n", | 3275 | "Creating new%s session %p for peer `%s' client %p\n", |
@@ -3629,7 +3629,7 @@ try_connection_reversal (void *cls, | |||
3629 | * @param session the session | 3629 | * @param session the session |
3630 | * @return the network type in HBO or #GNUNET_SYSERR | 3630 | * @return the network type in HBO or #GNUNET_SYSERR |
3631 | */ | 3631 | */ |
3632 | static enum GNUNET_ATS_Network_Type | 3632 | static enum GNUNET_NetworkType |
3633 | tcp_plugin_get_network (void *cls, | 3633 | tcp_plugin_get_network (void *cls, |
3634 | struct GNUNET_ATS_Session *session) | 3634 | struct GNUNET_ATS_Session *session) |
3635 | { | 3635 | { |
@@ -3644,7 +3644,7 @@ tcp_plugin_get_network (void *cls, | |||
3644 | * @param address the address | 3644 | * @param address the address |
3645 | * @return the network type | 3645 | * @return the network type |
3646 | */ | 3646 | */ |
3647 | static enum GNUNET_ATS_Network_Type | 3647 | static enum GNUNET_NetworkType |
3648 | tcp_plugin_get_network_for_address (void *cls, | 3648 | tcp_plugin_get_network_for_address (void *cls, |
3649 | const struct GNUNET_HELLO_Address *address) | 3649 | const struct GNUNET_HELLO_Address *address) |
3650 | { | 3650 | { |
@@ -3689,7 +3689,7 @@ tcp_plugin_get_network_for_address (void *cls, | |||
3689 | else | 3689 | else |
3690 | { | 3690 | { |
3691 | GNUNET_break (0); | 3691 | GNUNET_break (0); |
3692 | return GNUNET_ATS_NET_UNSPECIFIED; | 3692 | return GNUNET_NT_UNSPECIFIED; |
3693 | } | 3693 | } |
3694 | return plugin->env->get_address_type (plugin->env->cls, | 3694 | return plugin->env->get_address_type (plugin->env->cls, |
3695 | sb, | 3695 | sb, |