torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

old or skewed descriptor doesn't mean we failed to parse it

Browse Source 
svn:r1373
This commit is contained in:
Roger Dingledine
2004-03-29 23:23:01 +00:00
parent 10b360f188
commit 83c88c55fd
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/dirserv.c
+6 -6
View File
@@ -186,8 +186,8 @@ dirserv_free_descriptors()
}
/* Return 1 if descriptor is well-formed and accepted;
* 0 if well-formed and server is unapproved;
* -1 if not well-formed or if clock is skewed or other error.
* 0 if well-formed and server or descriptor is unapproved;
* -1 if not well-formed or other error.
*
* Update *desc to point after the descriptor if the
* descriptor is well-formed.
@@ -248,16 +248,16 @@ dirserv_add_descriptor(const char **desc)
/* Is there too much clock skew? */
now = time(NULL);
if (ri->published_on > now+ROUTER_ALLOW_SKEW) {
log_fn(LOG_WARN, "Publication time for nickname %s is too far in the future; possible clock skew. Not adding", ri->nickname);
log_fn(LOG_WARN, "Publication time for nickname %s is too far in the future; possible clock skew. Not adding.", ri->nickname);
routerinfo_free(ri);
*desc = end;
return -1;
return 0;
}
if (ri->published_on < now-ROUTER_MAX_AGE) {
log_fn(LOG_WARN, "Publication time for router with nickname %s is too far in the past. Not adding", ri->nickname);
log_fn(LOG_WARN, "Publication time for router with nickname %s is too far in the past. Not adding.", ri->nickname);
routerinfo_free(ri);
*desc = end;
return -1;
return 0;
}
/* Do we already have an entry for this router? */