[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] start using new renddesc code
Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv9777/src/or
Modified Files:
directory.c rendservice.c
Log Message:
start using new renddesc code
Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- directory.c 8 Aug 2005 21:58:48 -0000 1.242
+++ directory.c 12 Aug 2005 15:05:05 -0000 1.243
@@ -433,11 +433,9 @@
strlcpy(conn->rend_query, resource, sizeof(conn->rend_query));
httpcommand = "GET";
- tor_snprintf(url, sizeof(url), "/tor/rendezvous/%s", resource);
- /* XXXX011 Once directories understand versioned descriptors, switch to this
- * URL in order to get the most recent version */
- // tor_snprintf(url, sizeof(url), "/tor/rendezvous1/%s", resource);
-
+ /* Request the most recent versioned descriptor. */
+ 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: /home/or/cvsroot/tor/src/or/rendservice.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- rendservice.c 12 Aug 2005 01:26:21 -0000 1.132
+++ rendservice.c 12 Aug 2005 15:05:05 -0000 1.133
@@ -1017,11 +1017,9 @@
service->desc_is_dirty < now-5)) {
/* if it's time, or if the directory servers have a wrong service
* descriptor and ours has been stable for 5 seconds, upload a
- * new one. */
+ * new one of each format. */
upload_service_descriptor(service, 0);
- /* XXXX011 NM Once directories understand versioned descriptors, enable
- * this. */
- // upload_service_descriptor(service, 1);
+ upload_service_descriptor(service, 1);
service->next_upload_time = now + rendpostperiod;
}
}