diff options
Diffstat (limited to 'src/transport/plugin_transport_tcp.c')
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 75a885535..c056946b6 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.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) |
@@ -1890,7 +1890,7 @@ reschedule_session_timeout (struct GNUNET_ATS_Session *s) | |||
1890 | static struct GNUNET_ATS_Session * | 1890 | static struct GNUNET_ATS_Session * |
1891 | create_session (struct Plugin *plugin, | 1891 | create_session (struct Plugin *plugin, |
1892 | const struct GNUNET_HELLO_Address *address, | 1892 | const struct GNUNET_HELLO_Address *address, |
1893 | enum GNUNET_ATS_Network_Type scope, | 1893 | enum GNUNET_NetworkType scope, |
1894 | struct GNUNET_SERVER_Client *client, | 1894 | struct GNUNET_SERVER_Client *client, |
1895 | int is_nat) | 1895 | int is_nat) |
1896 | { | 1896 | { |
@@ -2436,7 +2436,7 @@ tcp_plugin_get_session (void *cls, | |||
2436 | const struct IPv4TcpAddress *t4; | 2436 | const struct IPv4TcpAddress *t4; |
2437 | const struct IPv6TcpAddress *t6; | 2437 | const struct IPv6TcpAddress *t6; |
2438 | unsigned int options; | 2438 | unsigned int options; |
2439 | enum GNUNET_ATS_Network_Type net_type; | 2439 | enum GNUNET_NetworkType net_type; |
2440 | unsigned int is_natd = GNUNET_NO; | 2440 | unsigned int is_natd = GNUNET_NO; |
2441 | size_t addrlen; | 2441 | size_t addrlen; |
2442 | #ifdef TCP_STEALTH | 2442 | #ifdef TCP_STEALTH |
@@ -2539,7 +2539,7 @@ tcp_plugin_get_session (void *cls, | |||
2539 | net_type = plugin->env->get_address_type (plugin->env->cls, | 2539 | net_type = plugin->env->get_address_type (plugin->env->cls, |
2540 | sb, | 2540 | sb, |
2541 | sbs); | 2541 | sbs); |
2542 | GNUNET_break (net_type != GNUNET_ATS_NET_UNSPECIFIED); | 2542 | GNUNET_break (net_type != GNUNET_NT_UNSPECIFIED); |
2543 | 2543 | ||
2544 | if ( (is_natd == GNUNET_YES) && | 2544 | if ( (is_natd == GNUNET_YES) && |
2545 | (addrlen == sizeof(struct IPv6TcpAddress)) ) | 2545 | (addrlen == sizeof(struct IPv6TcpAddress)) ) |
@@ -3263,7 +3263,7 @@ handle_tcp_welcome (void *cls, | |||
3263 | alen), | 3263 | alen), |
3264 | client, | 3264 | client, |
3265 | GNUNET_NO); | 3265 | GNUNET_NO); |
3266 | GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != session->scope); | 3266 | GNUNET_break (GNUNET_NT_UNSPECIFIED != session->scope); |
3267 | GNUNET_HELLO_address_free (address); | 3267 | GNUNET_HELLO_address_free (address); |
3268 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 3268 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
3269 | "Creating new%s session %p for peer `%s' client %p\n", | 3269 | "Creating new%s session %p for peer `%s' client %p\n", |
@@ -3623,7 +3623,7 @@ try_connection_reversal (void *cls, | |||
3623 | * @param session the session | 3623 | * @param session the session |
3624 | * @return the network type in HBO or #GNUNET_SYSERR | 3624 | * @return the network type in HBO or #GNUNET_SYSERR |
3625 | */ | 3625 | */ |
3626 | static enum GNUNET_ATS_Network_Type | 3626 | static enum GNUNET_NetworkType |
3627 | tcp_plugin_get_network (void *cls, | 3627 | tcp_plugin_get_network (void *cls, |
3628 | struct GNUNET_ATS_Session *session) | 3628 | struct GNUNET_ATS_Session *session) |
3629 | { | 3629 | { |
@@ -3638,7 +3638,7 @@ tcp_plugin_get_network (void *cls, | |||
3638 | * @param address the address | 3638 | * @param address the address |
3639 | * @return the network type | 3639 | * @return the network type |
3640 | */ | 3640 | */ |
3641 | static enum GNUNET_ATS_Network_Type | 3641 | static enum GNUNET_NetworkType |
3642 | tcp_plugin_get_network_for_address (void *cls, | 3642 | tcp_plugin_get_network_for_address (void *cls, |
3643 | const struct GNUNET_HELLO_Address *address) | 3643 | const struct GNUNET_HELLO_Address *address) |
3644 | { | 3644 | { |
@@ -3683,7 +3683,7 @@ tcp_plugin_get_network_for_address (void *cls, | |||
3683 | else | 3683 | else |
3684 | { | 3684 | { |
3685 | GNUNET_break (0); | 3685 | GNUNET_break (0); |
3686 | return GNUNET_ATS_NET_UNSPECIFIED; | 3686 | return GNUNET_NT_UNSPECIFIED; |
3687 | } | 3687 | } |
3688 | return plugin->env->get_address_type (plugin->env->cls, | 3688 | return plugin->env->get_address_type (plugin->env->cls, |
3689 | sb, | 3689 | sb, |