From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 24 Apr 2025 18:20:02 +0000 (-0400)
Subject: Renumber OR_CONN_STATE_*
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d868e3c27a4a1e1250fba8eb7f7e8836dbed55a;p=thirdparty%2Ftor.git

Renumber OR_CONN_STATE_*
---

diff --git a/src/core/or/orconn_event.h b/src/core/or/orconn_event.h
index e500a8363d..4afe9d91b5 100644
--- a/src/core/or/orconn_event.h
+++ b/src/core/or/orconn_event.h
@@ -36,14 +36,14 @@
 #define OR_CONN_STATE_TLS_HANDSHAKING 3
 /** State for a connection at an OR: We're waiting for the client to
  * send a versions cell (to indicate a v3+ handshake) */
-#define OR_CONN_STATE_SERVER_VERSIONS_WAIT 5
+#define OR_CONN_STATE_SERVER_VERSIONS_WAIT 4
 /** State for an OR connection: We're done with our SSL handshake, but we
  * haven't yet negotiated link protocol versions, done a V3 handshake, and
  * sent a netinfo cell. */
-#define OR_CONN_STATE_OR_HANDSHAKING_V3 7
+#define OR_CONN_STATE_OR_HANDSHAKING_V3 5
 /** State for an OR connection: Ready to send/receive cells. */
-#define OR_CONN_STATE_OPEN 8
-#define OR_CONN_STATE_MAX_ 8
+#define OR_CONN_STATE_OPEN 6
+#define OR_CONN_STATE_MAX_ 6
 /** @} */
 
 /** Used to indicate the type of an OR connection event passed to the