neocturne/ffd
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up announcement handling

Browse source
This commit is contained in:
Matthias Schiffer 2012-08-30 04:02:34 +02:00
parent da750868b5
commit 5998b096b9
1 changed files with 31 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
ffvisd/ffvisd.c
View file

@ -509,6 +509,34 @@ static void send_announcements() {
ffvisd_iface_foreach(send_announcement, packet); ffvisd_iface_foreach(send_announcement, packet);
} }
static void handle_announcement(const ffvisd_packet_server_announce_t *server) {
ffvisd_announce_t *announce;
for(announce = announcements; announce; announce = announce->next) {
if (!are_announcements_equal(server, &announce->announce))
continue;
if (is_announcement_local(announce))
return;
uint16_t seqno_diff = ntohs(server->seqno) - ntohs(announce->announce.seqno);
if (seqno_diff > 0 && seqno_diff < 0x8000) {
announce->received = now;
announce->announce = *server;
}
return;
}
/* no matching annouce was found */
announce = calloc(1, sizeof(ffvisd_announce_t));
announce->received = now;
announce->announce = *server;
announce->next = announcements;
announcements = announce;
}
static void receive_announcement() { static void receive_announcement() {
ffvisd_packet_announce_t *packet = alloca(sizeof(ffvisd_packet_announce_t) + 75*sizeof(ffvisd_packet_server_announce_t)); ffvisd_packet_announce_t *packet = alloca(sizeof(ffvisd_packet_announce_t) + 75*sizeof(ffvisd_packet_server_announce_t));
@ -536,43 +564,11 @@ static void receive_announcement() {
return; return;
} }
puts("Received announcements:");
int i;
for(i = 0; i < n_servers; i++)
pr_announcement_packet(&packet->servers[i]);
puts("");
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
for(i = 0; i < n_servers; i++) { int i;
ffvisd_announce_t *announce; for(i = 0; i < n_servers; i++)
for(announce = announcements; announce; announce = announce->next) { handle_announcement(&packet->servers[i]);
if (!are_announcements_equal(&packet->servers[i], &announce->announce))
continue;
if (is_announcement_local(announce))
break;
uint16_t seqno_diff = ntohs(packet->servers[i].seqno) - ntohs(announce->announce.seqno);
if (seqno_diff > 0 && seqno_diff < 0x8000) {
announce->received = now;
announce->announce = packet->servers[i];
}
break;
}
if (!announce) { /* no matching annouce was found */
announce = calloc(1, sizeof(ffvisd_announce_t));
announce->received = now;
announce->announce = packet->servers[i];
announce->next = announcements;
announcements = announce;
}
}
} }
int main() { int main() {