diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-05-02 21:54:16 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-05-02 21:54:16 +0000 |
| commit | 15c1853bd6812f24bf3c9a21427be32569df4524 (patch) | |
| tree | 79d7694cb1ca2bae75afa0caf37b84e0448d59a9 | |
| parent | b341ced9b8a92fac8a9050fc51c1a3b72bff2575 (diff) | |
| download | tor-15c1853bd6812f24bf3c9a21427be32569df4524.tar.gz tor-15c1853bd6812f24bf3c9a21427be32569df4524.zip | |
don't print nulls
svn:r4159
| -rw-r--r-- | src/or/dirserv.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f91bd8c70a..3e3806215c 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -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; |