[or-cvs] cleanup now that 0.0.9pre1 is obsolete

[Roger Dingledine]

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

Modified Files:
	directory.c 
Log Message:
cleanup now that 0.0.9pre1 is obsolete


Index: directory.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- directory.c	2 May 2005 21:48:54 -0000	1.225
+++ directory.c	3 May 2005 10:12:08 -0000	1.226
@@ -366,15 +366,11 @@
   char proxystring[128];
   char hoststring[128];
   char url[128];
-  int use_newer = 0;
   const char *httpcommand = NULL;
 
   tor_assert(conn);
   tor_assert(conn->type == CONN_TYPE_DIR);
 
-  /* If we don't know the platform, assume it's up-to-date. */
-  use_newer = platform ? tor_version_as_new_as(platform, "0.0.9pre1"):1;
-
   if (conn->port == 80) {
     strlcpy(hoststring, conn->address, sizeof(hoststring));
   } else {
@@ -390,22 +386,22 @@
     case DIR_PURPOSE_FETCH_DIR:
       tor_assert(!resource);
       tor_assert(!payload);
-      log_fn(LOG_DEBUG, "Asking for %scompressed directory from server running %s",
-             use_newer?"":"un", platform?platform:"<unknown version>");
+      log_fn(LOG_DEBUG, "Asking for compressed directory from server running %s",
+             platform?platform:"<unknown version>");
       httpcommand = "GET";
-      strlcpy(url, use_newer ? "/tor/dir.z" : "/", sizeof(url));
+      strlcpy(url, "/tor/dir.z", sizeof(url));
       break;
     case DIR_PURPOSE_FETCH_RUNNING_LIST:
       tor_assert(!resource);
       tor_assert(!payload);
       httpcommand = "GET";
-      strlcpy(url, use_newer ? "/tor/running-routers" : "/running-routers", sizeof(url));
+      strlcpy(url, "/tor/running-routers", sizeof(url));
       break;
     case DIR_PURPOSE_UPLOAD_DIR:
       tor_assert(!resource);
       tor_assert(payload);
       httpcommand = "POST";
-      strlcpy(url, use_newer ? "/tor/" : "/", sizeof(url));
+      strlcpy(url, "/tor/", sizeof(url));
       break;
     case DIR_PURPOSE_FETCH_RENDDESC:
       tor_assert(resource);
@@ -417,14 +413,14 @@
       strlcpy(conn->rend_query, resource, sizeof(conn->rend_query));
 
       httpcommand = "GET";
-      tor_snprintf(url, sizeof(url), "%s/rendezvous/%s", use_newer ? "/tor" : "", resource);
+      tor_snprintf(url, sizeof(url), "/tor/rendezvous/%s", resource);
 
       break;
     case DIR_PURPOSE_UPLOAD_RENDDESC:
       tor_assert(!resource);
       tor_assert(payload);
       httpcommand = "POST";
-      tor_snprintf(url, sizeof(url), "%s/rendezvous/publish", use_newer ? "/tor" : "");
+      tor_snprintf(url, sizeof(url), "/tor/rendezvous/publish");
       break;
   }