[or-cvs] be quieter about hidserv descriptors that are too old or to...

[arma@xxxxxxxx]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	directory.c rendcommon.c 
Log Message:
be quieter about hidserv descriptors that are too old or too new.
we can't do anything about them anyway.


Index: directory.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -p -d -r1.358 -r1.359
--- directory.c	19 Feb 2006 22:02:02 -0000	1.358
+++ directory.c	21 Feb 2006 06:23:57 -0000	1.359
@@ -1722,8 +1722,9 @@ directory_handle_command_post(connection
     /* rendezvous descriptor post */
     if (rend_cache_store(body, body_len) < 0) {
 //      char tmp[1024*2+1];
-      log_notice(LD_DIRSERV,"Rejected rend descriptor (length %d) from %s.",
-                 (int)body_len, origin);
+      log_fn(LOG_PROTOCOL_WARN, LD_DIRSERV,
+             "Rejected rend descriptor (length %d) from %s.",
+             (int)body_len, origin);
 #if 0
       if (body_len <= 1024) {
         base16_encode(tmp, sizeof(tmp), body, body_len);

Index: rendcommon.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/rendcommon.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -d -r1.65 -r1.66
--- rendcommon.c	13 Feb 2006 10:32:59 -0000	1.65
+++ rendcommon.c	21 Feb 2006 06:23:57 -0000	1.66
@@ -379,13 +379,14 @@ rend_cache_store(const char *desc, size_
   tor_snprintf(key, sizeof(key), "%c%s", parsed->version?'1':'0', query);
   now = time(NULL);
   if (parsed->timestamp < now-REND_CACHE_MAX_AGE-REND_CACHE_MAX_SKEW) {
-    log_warn(LD_REND,"Service descriptor %s is too old.", safe_str(query));
+    log_fn(LOG_PROTOCOL_WARN, LD_REND,
+           "Service descriptor %s is too old.", safe_str(query));
     rend_service_descriptor_free(parsed);
     return -1;
   }
   if (parsed->timestamp > now+REND_CACHE_MAX_SKEW) {
-    log_warn(LD_REND,"Service descriptor %s is too far in the future.",
-             safe_str(query));
+    log_fn(LOG_PROTOCOL_WARN, LD_REND,
+           "Service descriptor %s is too far in the future.", safe_str(query));
     rend_service_descriptor_free(parsed);
     return -1;
   }