|
@@ -92,31 +92,33 @@
|
|
|
#define CIRCUIT_PURPOSE_C_HS_MAX_ 13
|
|
|
/** This circuit is used for build time measurement only */
|
|
|
#define CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT 14
|
|
|
-#define CIRCUIT_PURPOSE_C_MAX_ 14
|
|
|
+/** This circuit is being held open by circuit padding */
|
|
|
+#define CIRCUIT_PURPOSE_C_CIRCUIT_PADDING 15
|
|
|
+#define CIRCUIT_PURPOSE_C_MAX_ 15
|
|
|
|
|
|
-#define CIRCUIT_PURPOSE_S_HS_MIN_ 15
|
|
|
+#define CIRCUIT_PURPOSE_S_HS_MIN_ 16
|
|
|
/** Hidden-service-side circuit purpose: at the service, waiting for
|
|
|
* introductions. */
|
|
|
-#define CIRCUIT_PURPOSE_S_ESTABLISH_INTRO 15
|
|
|
+#define CIRCUIT_PURPOSE_S_ESTABLISH_INTRO 16
|
|
|
/** Hidden-service-side circuit purpose: at the service, successfully
|
|
|
* established intro. */
|
|
|
-#define CIRCUIT_PURPOSE_S_INTRO 16
|
|
|
+#define CIRCUIT_PURPOSE_S_INTRO 17
|
|
|
/** Hidden-service-side circuit purpose: at the service, connecting to rend
|
|
|
* point. */
|
|
|
-#define CIRCUIT_PURPOSE_S_CONNECT_REND 17
|
|
|
+#define CIRCUIT_PURPOSE_S_CONNECT_REND 18
|
|
|
/** Hidden-service-side circuit purpose: at the service, rendezvous
|
|
|
* established. */
|
|
|
-#define CIRCUIT_PURPOSE_S_REND_JOINED 18
|
|
|
+#define CIRCUIT_PURPOSE_S_REND_JOINED 19
|
|
|
/** This circuit is used for uploading hsdirs */
|
|
|
-#define CIRCUIT_PURPOSE_S_HSDIR_POST 19
|
|
|
-#define CIRCUIT_PURPOSE_S_HS_MAX_ 19
|
|
|
+#define CIRCUIT_PURPOSE_S_HSDIR_POST 20
|
|
|
+#define CIRCUIT_PURPOSE_S_HS_MAX_ 20
|
|
|
|
|
|
/** A testing circuit; not meant to be used for actual traffic. */
|
|
|
-#define CIRCUIT_PURPOSE_TESTING 20
|
|
|
+#define CIRCUIT_PURPOSE_TESTING 21
|
|
|
/** A controller made this circuit and Tor should not use it. */
|
|
|
-#define CIRCUIT_PURPOSE_CONTROLLER 21
|
|
|
+#define CIRCUIT_PURPOSE_CONTROLLER 22
|
|
|
/** This circuit is used for path bias probing only */
|
|
|
-#define CIRCUIT_PURPOSE_PATH_BIAS_TESTING 22
|
|
|
+#define CIRCUIT_PURPOSE_PATH_BIAS_TESTING 23
|
|
|
|
|
|
/** This circuit is used for vanguards/restricted paths.
|
|
|
*
|
|
@@ -124,9 +126,9 @@
|
|
|
* on-demand. When an HS operation needs to take place (e.g. connect to an
|
|
|
* intro point), these circuits are then cannibalized and repurposed to the
|
|
|
* actual needed HS purpose. */
|
|
|
-#define CIRCUIT_PURPOSE_HS_VANGUARDS 23
|
|
|
+#define CIRCUIT_PURPOSE_HS_VANGUARDS 24
|
|
|
|
|
|
-#define CIRCUIT_PURPOSE_MAX_ 23
|
|
|
+#define CIRCUIT_PURPOSE_MAX_ 24
|
|
|
/** A catch-all for unrecognized purposes. Currently we don't expect
|
|
|
* to make or see any circuits with this purpose. */
|
|
|
#define CIRCUIT_PURPOSE_UNKNOWN 255
|