Browse Source

Some premature optimization lead to always only 8bytes of ot_peers being copied

dynamic-accesslists
erdgeist 16 years ago
parent
commit
4ced0484ab
  1. 2
      ot_clean.c
  2. 2
      ot_vector.c

2
ot_clean.c

@ -33,7 +33,7 @@ static ssize_t clean_single_bucket( ot_peer *peers, size_t peer_count, time_t ti
while( peers < last_peer ) while( peers < last_peer )
if( ( timediff = timedout + OT_PEERTIME( peers ) ) < OT_PEER_TIMEOUT ) { if( ( timediff = timedout + OT_PEERTIME( peers ) ) < OT_PEER_TIMEOUT ) {
OT_PEERTIME( peers ) = timediff; OT_PEERTIME( peers ) = timediff;
*(uint64_t*)(insert_point++) = *(uint64_t*)(peers++); memcpy( insert_point++, peers++, sizeof(ot_peer));
} else } else
if( OT_PEERFLAG( peers++ ) & PEER_FLAG_SEEDING ) if( OT_PEERFLAG( peers++ ) & PEER_FLAG_SEEDING )
(*removed_seeders)++; (*removed_seeders)++;

2
ot_vector.c

@ -244,7 +244,7 @@ void vector_redistribute_buckets( ot_peerlist * peer_list ) {
bucket_dest->space *= OT_VECTOR_GROW_RATIO; bucket_dest->space *= OT_VECTOR_GROW_RATIO;
} }
peers_new = (ot_peer*)bucket_dest->data; peers_new = (ot_peer*)bucket_dest->data;
*(uint64_t*)(peers_new + bucket_dest->size++) = *(uint64_t*)(peers_old++); memcpy(peers_new + bucket_dest->size++, peers_old++, sizeof(ot_peer));
} }
} }

Loading…
Cancel
Save