diff options
Diffstat (limited to 'src/transport/plugin_transport_http_client.c')
-rw-r--r-- | src/transport/plugin_transport_http_client.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index 0afb54943..e88e2c69f 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c | |||
@@ -266,7 +266,7 @@ struct GNUNET_ATS_Session | |||
266 | /** | 266 | /** |
267 | * ATS network type. | 267 | * ATS network type. |
268 | */ | 268 | */ |
269 | enum GNUNET_ATS_Network_Type scope; | 269 | enum GNUNET_NetworkType scope; |
270 | }; | 270 | }; |
271 | 271 | ||
272 | 272 | ||
@@ -1920,7 +1920,7 @@ client_connect (struct GNUNET_ATS_Session *s) | |||
1920 | * @param session the session | 1920 | * @param session the session |
1921 | * @return the network type | 1921 | * @return the network type |
1922 | */ | 1922 | */ |
1923 | static enum GNUNET_ATS_Network_Type | 1923 | static enum GNUNET_NetworkType |
1924 | http_client_plugin_get_network (void *cls, | 1924 | http_client_plugin_get_network (void *cls, |
1925 | struct GNUNET_ATS_Session *session) | 1925 | struct GNUNET_ATS_Session *session) |
1926 | { | 1926 | { |
@@ -1935,7 +1935,7 @@ http_client_plugin_get_network (void *cls, | |||
1935 | * @param address the address | 1935 | * @param address the address |
1936 | * @return the network type | 1936 | * @return the network type |
1937 | */ | 1937 | */ |
1938 | static enum GNUNET_ATS_Network_Type | 1938 | static enum GNUNET_NetworkType |
1939 | http_client_plugin_get_network_for_address (void *cls, | 1939 | http_client_plugin_get_network_for_address (void *cls, |
1940 | const struct GNUNET_HELLO_Address *address) | 1940 | const struct GNUNET_HELLO_Address *address) |
1941 | { | 1941 | { |
@@ -1997,7 +1997,7 @@ http_client_plugin_get_session (void *cls, | |||
1997 | struct HTTP_Client_Plugin *plugin = cls; | 1997 | struct HTTP_Client_Plugin *plugin = cls; |
1998 | struct GNUNET_ATS_Session *s; | 1998 | struct GNUNET_ATS_Session *s; |
1999 | struct sockaddr *sa; | 1999 | struct sockaddr *sa; |
2000 | enum GNUNET_ATS_Network_Type net_type; | 2000 | enum GNUNET_NetworkType net_type; |
2001 | size_t salen = 0; | 2001 | size_t salen = 0; |
2002 | int res; | 2002 | int res; |
2003 | 2003 | ||
@@ -2020,7 +2020,7 @@ http_client_plugin_get_session (void *cls, | |||
2020 | } | 2020 | } |
2021 | 2021 | ||
2022 | /* Determine network location */ | 2022 | /* Determine network location */ |
2023 | net_type = GNUNET_ATS_NET_UNSPECIFIED; | 2023 | net_type = GNUNET_NT_UNSPECIFIED; |
2024 | sa = http_common_socket_from_address (address->address, | 2024 | sa = http_common_socket_from_address (address->address, |
2025 | address->address_length, | 2025 | address->address_length, |
2026 | &res); | 2026 | &res); |
@@ -2043,9 +2043,9 @@ http_client_plugin_get_session (void *cls, | |||
2043 | else if (GNUNET_NO == res) | 2043 | else if (GNUNET_NO == res) |
2044 | { | 2044 | { |
2045 | /* Cannot convert to sockaddr -> is external hostname */ | 2045 | /* Cannot convert to sockaddr -> is external hostname */ |
2046 | net_type = GNUNET_ATS_NET_WAN; | 2046 | net_type = GNUNET_NT_WAN; |
2047 | } | 2047 | } |
2048 | if (GNUNET_ATS_NET_UNSPECIFIED == net_type) | 2048 | if (GNUNET_NT_UNSPECIFIED == net_type) |
2049 | { | 2049 | { |
2050 | GNUNET_break (0); | 2050 | GNUNET_break (0); |
2051 | return NULL; | 2051 | return NULL; |