[or-cvs] [puppetor/master] Fix ALICE_SENDING_FETCH_DESC event.

[karsten@xxxxxxxx]

Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date: Fri, 12 Jun 2009 14:24:53 +0200
Subject: Fix ALICE_SENDING_FETCH_DESC event.
Commit: 570df3c3e1155ab833f0282a403cf75040750624

Fire the ALICE_SENDING_FETCH_DESC event when fetching a v2 descriptor,
too, not only for v0 descriptors. Clarify that this event is fired before
starting to build a circuit to a directory.
---
 .../puppetor/HiddenServiceEventType.java           |   10 ++++++----
 .../torproject/puppetor/impl/EventManagerImpl.java |    3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/org/torproject/puppetor/HiddenServiceEventType.java b/src/org/torproject/puppetor/HiddenServiceEventType.java
index 20e83ec..2c7b77f 100644
--- a/src/org/torproject/puppetor/HiddenServiceEventType.java
+++ b/src/org/torproject/puppetor/HiddenServiceEventType.java
@@ -39,9 +39,10 @@ public class HiddenServiceEventType implements EventType {
             "ALICE_ONION_REQUEST_RECEIVED");
 
     /**
-     * Alice sends a fetch request for a hidden service descriptor to a
-     * directory server; this event is parsed from a log statement in
-     * rend_client_refetch_renddesc().
+     * Alice builds a circuit to a hidden service directory and sends a fetch
+     * request for a hidden descriptor; this event is parsed from log
+     * statements in rend_client_refetch_renddesc() for v0 descriptors and
+     * directory_get_from_hs_dir() for v2 descriptors.
      */
     public static final HiddenServiceEventType ALICE_SENDING_FETCH_DESC = new HiddenServiceEventType(
             "ALICE_SENDING_FETCH_DESC");
@@ -204,4 +205,5 @@ public class HiddenServiceEventType implements EventType {
     public static final HiddenServiceEventType RPO_RECEIVING_RENDEZVOUS1_SENDING_RENDEZVOUS2 = new HiddenServiceEventType(
             "RPO_RECEIVING_RENDEZVOUS1_SENDING_RENDEZVOUS2");
 
-}
\ No newline at end of file
+}
+
diff --git a/src/org/torproject/puppetor/impl/EventManagerImpl.java b/src/org/torproject/puppetor/impl/EventManagerImpl.java
index c6e1c03..34bd96b 100644
--- a/src/org/torproject/puppetor/impl/EventManagerImpl.java
+++ b/src/org/torproject/puppetor/impl/EventManagerImpl.java
@@ -402,6 +402,9 @@ public class EventManagerImpl extends UnicastRemoteObject implements
                 HiddenServiceEventType.ALICE_ONION_REQUEST_RECEIVED);
         registerEventTypePattern("Fetching rendezvous descriptor for "
                 + "service .*", HiddenServiceEventType.ALICE_SENDING_FETCH_DESC);
+        registerEventTypePattern("Sending fetch request for v2 descriptor "
+                + "for service",
+                HiddenServiceEventType.ALICE_SENDING_FETCH_DESC);
         registerEventTypePattern("Received rendezvous descriptor",
                 HiddenServiceEventType.ALICE_DESC_FETCHED_RECEIVED);
         registerEventTypePattern(
-- 
1.5.6.5