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

don't print nulls

Browse Source 
svn:r4159
This commit is contained in:
Roger Dingledine 2005-05-02 21:54:16 +00:00
parent b341ced9b8
commit 15c1853bd6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/dirserv.c
View File

@ -338,7 +338,8 @@ dirserv_add_descriptor(const char **desc, const char **msg)
/* Okay. Now check whether the fingerprint is recognized. */
r = dirserv_router_fingerprint_is_known(ri);
if (r==-1) {
log_fn(LOG_WARN, "Known nickname '%s', wrong fingerprint. Not adding (ContactInfo '%s').", ri->nickname, ri->contact_info);
log_fn(LOG_WARN, "Known nickname '%s', wrong fingerprint. Not adding (ContactInfo '%s').",
ri->nickname, ri->contact_info ? ri->contact_info : "");
*msg = "Rejected: There is already a verified server with this nickname and a different fingerprint.";
routerinfo_free(ri);
*desc = end;
@ -358,7 +359,8 @@ dirserv_add_descriptor(const char **desc, const char **msg)
now = time(NULL);
if (ri->published_on > now+ROUTER_ALLOW_SKEW) {
log_fn(LOG_NOTICE, "Publication time for nickname '%s' is too far (%d minutes) in the future; possible clock skew. Not adding (ContactInfo '%s').",
ri->nickname, (int)((ri->published_on-now)/60), ri->contact_info);
ri->nickname, (int)((ri->published_on-now)/60),
ri->contact_info ? ri->contact_info : "");
*msg = "Rejected: Your clock is set too far in the future, or your timezone is not correct.";
routerinfo_free(ri);
*desc = end;
@ -366,14 +368,16 @@ dirserv_add_descriptor(const char **desc, const char **msg)
}
if (ri->published_on < now-ROUTER_MAX_AGE) {
log_fn(LOG_NOTICE, "Publication time for router with nickname '%s' is too far (%d minutes) in the past. Not adding (ContactInfo '%s').",
ri->nickname, (int)((now-ri->published_on)/60), ri->contact_info);
ri->nickname, (int)((now-ri->published_on)/60),
ri->contact_info ? ri->contact_info : "");
*msg = "Rejected: Server is expired, or your clock is too far in the past, or your timezone is not correct.";
routerinfo_free(ri);
*desc = end;
return -1;
}
if (dirserv_router_has_valid_address(ri) < 0) {
log_fn(LOG_NOTICE, "Router with nickname '%s' has invalid address '%s'. Not adding (ContactInfo '%s').", ri->nickname, ri->address, ri->contact_info);
log_fn(LOG_NOTICE, "Router with nickname '%s' has invalid address '%s'. Not adding (ContactInfo '%s').",
ri->nickname, ri->address, ri->contact_info ? ri->contact_info : "");
*msg = "Rejected: Address is not an IP, or IP is a private address.";
routerinfo_free(ri);
*desc = end;