[or-cvs] stop using the v1 rend desc format. we"re going to change v1

[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 rendservice.c 
Log Message:
stop using the v1 rend desc format. we're going to change v1
some more before we switch to it.


Index: directory.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- directory.c	31 Aug 2005 06:14:37 -0000	1.252
+++ directory.c	6 Sep 2005 06:14:38 -0000	1.253
@@ -436,8 +436,9 @@
 
       httpcommand = "GET";
       /* Request the most recent versioned descriptor. */
-      tor_snprintf(url, sizeof(url), "/tor/rendezvous1/%s", resource);
-      //tor_snprintf(url, sizeof(url), "/tor/rendezvous/%s", resource);
+      // XXXX011
+      //tor_snprintf(url, sizeof(url), "/tor/rendezvous1/%s", resource);
+      tor_snprintf(url, sizeof(url), "/tor/rendezvous/%s", resource);
       break;
     case DIR_PURPOSE_UPLOAD_RENDDESC:
       tor_assert(!resource);

Index: rendservice.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/rendservice.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- rendservice.c	26 Aug 2005 18:44:26 -0000	1.135
+++ rendservice.c	6 Sep 2005 06:14:38 -0000	1.136
@@ -1026,7 +1026,7 @@
        * descriptor and ours has been stable for 5 seconds, upload a
        * new one of each format. */
       upload_service_descriptor(service, 0);
-      upload_service_descriptor(service, 1);
+      // XXXX011 upload_service_descriptor(service, 1);
       service->next_upload_time = now + rendpostperiod;
     }
   }