Reorg variables for clarity

src/he/he_internal.h

@@ -144,42 +144,13 @@ struct he_ssl_ctx {
 typedef struct he_fragment_table he_fragment_table_t;
 
 struct he_conn {
+  // -------------- Configs (Immutable) -----------------
+
   /// Internal Structure Member for client/server determination
   /// No explicit setter or getter, we internally set this in
   /// either client or server connect functions
   bool is_server;
 
-  /// Client State
-  _Atomic he_conn_state_t state;
-
-  /// Pointer to incoming data buffer
-  uint8_t *incoming_data;
-  /// Length of the data in the
-  size_t incoming_data_length;
-  // WolfSSL stuff
-  WOLFSSL *wolf_ssl;
-  /// Wolf Timeout
-  _Atomic int wolf_timeout;
-  /// Write buffer
-  uint8_t write_buffer[HE_MAX_WIRE_MTU];
-  /// Packet seen
-  bool packet_seen;
-  /// Session ID
-  _Atomic uint64_t session_id;
-  _Atomic uint64_t pending_session_id;
-  /// Has the first message been received?
-  _Atomic bool first_message_received;
-  /// Bytes left to read in the packet buffer (Streaming only)
-  size_t incoming_data_left_to_read;
-  /// Index into the incoming data buffer
-  uint8_t *incoming_data_read_offset_ptr;
-
-  bool renegotiation_in_progress;
-  bool renegotiation_due;
-
-  /// Do we already have a timer running? If so, we don't want to generate new callbacks
-  _Atomic bool is_nudge_timer_running;
-
   he_plugin_chain_t *inside_plugins;
   he_plugin_chain_t *outside_plugins;
 
@@ -244,6 +215,44 @@ struct he_conn {
   /// Random number generator
   RNG wolf_rng;
 
+  /// WolfSSL stuff
+  WOLFSSL *wolf_ssl;
+
+  // -------------- State (Mutable) -----------------
+
+  /// Client State
+  _Atomic he_conn_state_t state;
+
+  /// Wolf Timeout
+  _Atomic int wolf_timeout;
+
+  /// Pointer to incoming data buffer
+  uint8_t *incoming_data;
+  /// Length of the data in the
+  size_t incoming_data_length;
+  /// Packet seen
+  bool packet_seen;
+  /// Bytes left to read in the packet buffer (Streaming only)
+  size_t incoming_data_left_to_read;
+  /// Index into the incoming data buffer
+  uint8_t *incoming_data_read_offset_ptr;
+
+  /// Write buffer
+  uint8_t write_buffer[HE_MAX_WIRE_MTU];
+
+  /// Session ID
+  _Atomic uint64_t session_id;
+  _Atomic uint64_t pending_session_id;
+
+  /// Has the first message been received?
+  _Atomic bool first_message_received;
+
+  /// Do we already have a timer running? If so, we don't want to generate new callbacks
+  _Atomic bool is_nudge_timer_running;
+
+  bool renegotiation_in_progress;
+  bool renegotiation_due;
+
   /// Identifier of the next ping message
   uint16_t ping_next_id;
   /// Identifier of the ping message pending reply