[or-cvs] warn on startup that we don"t provide anonymity

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	dns.c main.c 
Log Message:
warn on startup that we don't provide anonymity
make exit dns cache entries last 15 minutes


Index: dns.c
===================================================================
RCS file: /home/or/cvsroot/src/or/dns.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- dns.c	8 Nov 2003 04:02:05 -0000	1.37
+++ dns.c	13 Nov 2003 04:51:34 -0000	1.38
@@ -130,8 +130,7 @@
     resolve = tor_malloc(sizeof(struct cached_resolve));
     memset(resolve, 0, sizeof(struct cached_resolve));
     resolve->state = CACHE_STATE_PENDING;
-    resolve->expire = now + 100; /* XXX for testing. when we're confident, switch it back */
-//    resolve->expire = now + 86400; /* now + 1 day */
+    resolve->expire = now + 15*60; /* 15 minutes */
     strncpy(resolve->question, exitconn->address, MAX_ADDRESSLEN);
 
     /* add us to the pending list */

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- main.c	25 Oct 2003 12:01:09 -0000	1.142
+++ main.c	13 Nov 2003 04:51:34 -0000	1.143
@@ -751,6 +751,7 @@
 
   /* give it somewhere to log to initially */
   add_stream_log(LOG_INFO, "<stdout>", stdout);
+  log_fn(LOG_WARN,"Tor v%s. This is experimental software. Do not use it if you need anonymity.",VERSION);
 
   if(getconfig(argc,argv,&options)) {
     log_fn(LOG_ERR,"Reading config failed. For usage, try -h.");