nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix two compile warnings when using clang

Browse Source 
Issue found by Steven Murdoch
This commit is contained in:
Sebastian Hahn 2011-03-10 01:47:00 +01:00
parent 6426cd14f3
commit 473ff26563
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/geoip.c
View File

@ -278,6 +278,8 @@ geoip_is_loaded(void)
return geoip_countries != NULL && geoip_entries != NULL; return geoip_countries != NULL && geoip_entries != NULL;
} }
#define MAX_LAST_SEEN_IN_MINUTES 0x3FFFFFFFu
/** Entry in a map from IP address to the last time we've seen an incoming /** Entry in a map from IP address to the last time we've seen an incoming
* connection from that IP address. Used by bridges only, to track which * connection from that IP address. Used by bridges only, to track which
* countries have them blocked. */ * countries have them blocked. */
@ -413,12 +415,13 @@ geoip_note_client_seen(geoip_client_action_t action,
lookup.ipaddr = addr; lookup.ipaddr = addr;
lookup.action = (int)action; lookup.action = (int)action;
ent = HT_FIND(clientmap, &client_history, &lookup); ent = HT_FIND(clientmap, &client_history, &lookup);
tor_assert(now / 60 <= MAX_LAST_SEEN_IN_MINUTES);
if (ent) { if (ent) {
ent->last_seen_in_minutes = now / 60; ent->last_seen_in_minutes = (unsigned)(now/60);
} else { } else {
ent = tor_malloc_zero(sizeof(clientmap_entry_t)); ent = tor_malloc_zero(sizeof(clientmap_entry_t));
ent->ipaddr = addr; ent->ipaddr = addr;
ent->last_seen_in_minutes = now / 60; ent->last_seen_in_minutes = (unsigned)(now/60);
ent->action = (int)action; ent->action = (int)action;
HT_INSERT(clientmap, &client_history, ent); HT_INSERT(clientmap, &client_history, ent);
} }