diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-11-11 12:06:05 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-11-11 12:06:05 +0000 |
commit | 0bc3d9e7ebc9a770653382a9de6dc079f8b27a75 (patch) | |
tree | 2bab1b9c0233c9b315dc19a9a47cc3cc8c994b9d /src/transport | |
parent | 087399c801b807c44e47e4d08723cce88df0a122 (diff) | |
download | gnunet-0bc3d9e7ebc9a770653382a9de6dc079f8b27a75.tar.gz gnunet-0bc3d9e7ebc9a770653382a9de6dc079f8b27a75.zip |
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 8e4a13683..f2cc3b4fd 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -1239,7 +1239,15 @@ send_switch_address_continuation (void *cls, | |||
1239 | /* Tell ATS that switching addresses was successful */ | 1239 | /* Tell ATS that switching addresses was successful */ |
1240 | switch (n->state) { | 1240 | switch (n->state) { |
1241 | case S_CONNECTED: | 1241 | case S_CONNECTED: |
1242 | GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES); | 1242 | if (n->address_state == FRESH) |
1243 | { | ||
1244 | GST_validation_set_address_use (&n->id, | ||
1245 | cc->address, | ||
1246 | cc->session, | ||
1247 | GNUNET_YES); | ||
1248 | GNUNET_ATS_address_in_use (GST_ats, cc->address, cc->session, GNUNET_YES); | ||
1249 | n->address_state = USED; | ||
1250 | } | ||
1243 | break; | 1251 | break; |
1244 | case S_FAST_RECONNECT: | 1252 | case S_FAST_RECONNECT: |
1245 | #if DEBUG_TRANSPORT | 1253 | #if DEBUG_TRANSPORT |
@@ -1257,9 +1265,9 @@ send_switch_address_continuation (void *cls, | |||
1257 | cc->address, | 1265 | cc->address, |
1258 | cc->session, | 1266 | cc->session, |
1259 | GNUNET_YES); | 1267 | GNUNET_YES); |
1268 | GNUNET_ATS_address_in_use (GST_ats, cc->address, cc->session, GNUNET_YES); | ||
1260 | n->address_state = USED; | 1269 | n->address_state = USED; |
1261 | } | 1270 | } |
1262 | GNUNET_ATS_address_in_use (GST_ats, cc->address, cc->session, GNUNET_YES); | ||
1263 | 1271 | ||
1264 | if (n->keepalive_task == GNUNET_SCHEDULER_NO_TASK) | 1272 | if (n->keepalive_task == GNUNET_SCHEDULER_NO_TASK) |
1265 | n->keepalive_task = GNUNET_SCHEDULER_add_now (&neighbour_keepalive_task, n); | 1273 | n->keepalive_task = GNUNET_SCHEDULER_add_now (&neighbour_keepalive_task, n); |
@@ -2304,9 +2312,9 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, | |||
2304 | n->address, | 2312 | n->address, |
2305 | n->session, | 2313 | n->session, |
2306 | GNUNET_YES); | 2314 | GNUNET_YES); |
2315 | GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES); | ||
2307 | n->address_state = USED; | 2316 | n->address_state = USED; |
2308 | } | 2317 | } |
2309 | GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES); | ||
2310 | 2318 | ||
2311 | GST_neighbours_set_incoming_quota (&n->id, n->bandwidth_in); | 2319 | GST_neighbours_set_incoming_quota (&n->id, n->bandwidth_in); |
2312 | 2320 | ||
@@ -2392,10 +2400,8 @@ GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message, | |||
2392 | GNUNET_ATS_address_update (GST_ats, address, session, ats, ats_count); | 2400 | GNUNET_ATS_address_update (GST_ats, address, session, ats, ats_count); |
2393 | GNUNET_assert (n->address != NULL); | 2401 | GNUNET_assert (n->address != NULL); |
2394 | change_state (n, S_CONNECTED); | 2402 | change_state (n, S_CONNECTED); |
2395 | GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES); | ||
2396 | 2403 | ||
2397 | GST_neighbours_set_incoming_quota (&n->id, n->bandwidth_in); | 2404 | GST_neighbours_set_incoming_quota (&n->id, n->bandwidth_in); |
2398 | |||
2399 | if (n->keepalive_task == GNUNET_SCHEDULER_NO_TASK) | 2405 | if (n->keepalive_task == GNUNET_SCHEDULER_NO_TASK) |
2400 | n->keepalive_task = GNUNET_SCHEDULER_add_now (&neighbour_keepalive_task, n); | 2406 | n->keepalive_task = GNUNET_SCHEDULER_add_now (&neighbour_keepalive_task, n); |
2401 | if (n->address_state == FRESH) | 2407 | if (n->address_state == FRESH) |
@@ -2404,6 +2410,7 @@ GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message, | |||
2404 | n->address, | 2410 | n->address, |
2405 | n->session, | 2411 | n->session, |
2406 | GNUNET_YES); | 2412 | GNUNET_YES); |
2413 | GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES); | ||
2407 | n->address_state = USED; | 2414 | n->address_state = USED; |
2408 | } | 2415 | } |
2409 | neighbours_connected++; | 2416 | neighbours_connected++; |