diff options
Diffstat (limited to 'src/transport/plugin_transport_http_client.c')
-rw-r--r-- | src/transport/plugin_transport_http_client.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index 6e994d467..165045a8a 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c | |||
@@ -264,7 +264,7 @@ struct Session | |||
264 | /** | 264 | /** |
265 | * ATS network type. | 265 | * ATS network type. |
266 | */ | 266 | */ |
267 | enum GNUNET_ATS_Network_Type ats_address_network_type; | 267 | enum GNUNET_ATS_Network_Type scope; |
268 | }; | 268 | }; |
269 | 269 | ||
270 | 270 | ||
@@ -1169,23 +1169,13 @@ client_receive_mst_cb (void *cls, | |||
1169 | struct Session *s = cls; | 1169 | struct Session *s = cls; |
1170 | struct HTTP_Client_Plugin *plugin; | 1170 | struct HTTP_Client_Plugin *plugin; |
1171 | struct GNUNET_TIME_Relative delay; | 1171 | struct GNUNET_TIME_Relative delay; |
1172 | struct GNUNET_ATS_Information atsi; | ||
1173 | char *stat_txt; | 1172 | char *stat_txt; |
1174 | 1173 | ||
1175 | plugin = s->plugin; | 1174 | plugin = s->plugin; |
1176 | GNUNET_break (s->ats_address_network_type != GNUNET_ATS_NET_UNSPECIFIED); | ||
1177 | atsi.type = htonl (GNUNET_ATS_NETWORK_TYPE); | ||
1178 | atsi.value = htonl (s->ats_address_network_type); | ||
1179 | |||
1180 | delay = s->plugin->env->receive (plugin->env->cls, | 1175 | delay = s->plugin->env->receive (plugin->env->cls, |
1181 | s->address, | 1176 | s->address, |
1182 | s, | 1177 | s, |
1183 | message); | 1178 | message); |
1184 | plugin->env->update_address_metrics (plugin->env->cls, | ||
1185 | s->address, | ||
1186 | s, | ||
1187 | &atsi, 1); | ||
1188 | |||
1189 | GNUNET_asprintf (&stat_txt, | 1179 | GNUNET_asprintf (&stat_txt, |
1190 | "# bytes received via %s_client", | 1180 | "# bytes received via %s_client", |
1191 | plugin->protocol); | 1181 | plugin->protocol); |
@@ -1943,7 +1933,7 @@ static enum GNUNET_ATS_Network_Type | |||
1943 | http_client_plugin_get_network (void *cls, | 1933 | http_client_plugin_get_network (void *cls, |
1944 | struct Session *session) | 1934 | struct Session *session) |
1945 | { | 1935 | { |
1946 | return session->ats_address_network_type; | 1936 | return session->scope; |
1947 | } | 1937 | } |
1948 | 1938 | ||
1949 | 1939 | ||
@@ -2057,7 +2047,7 @@ http_client_plugin_get_session (void *cls, | |||
2057 | s = GNUNET_new (struct Session); | 2047 | s = GNUNET_new (struct Session); |
2058 | s->plugin = plugin; | 2048 | s->plugin = plugin; |
2059 | s->address = GNUNET_HELLO_address_copy (address); | 2049 | s->address = GNUNET_HELLO_address_copy (address); |
2060 | s->ats_address_network_type = net_type; | 2050 | s->scope = net_type; |
2061 | 2051 | ||
2062 | s->put.state = H_NOT_CONNECTED; | 2052 | s->put.state = H_NOT_CONNECTED; |
2063 | s->timeout = GNUNET_TIME_relative_to_absolute (HTTP_CLIENT_SESSION_TIMEOUT); | 2053 | s->timeout = GNUNET_TIME_relative_to_absolute (HTTP_CLIENT_SESSION_TIMEOUT); |