Reorder TCPRequest and UDPRequest fields to save space due to alignment

cofyc · Jan 5, 2015 · 52e4c67 · 52e4c67
1 parent 951d9b8
commit 52e4c67
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/tcp_request.h b/tcp_request.h
@@ -19,17 +19,17 @@ typedef struct TCPRequestStatus_ {
 } TCPRequestStatus;
 
 typedef struct TCPRequest_ {
-    uint8_t client_nonce[crypto_box_HALF_NONCEBYTES];
-    uint8_t nmkey[crypto_box_BEFORENMBYTES];
-            TAILQ_ENTRY(TCPRequest_) queue;
+    TAILQ_ENTRY(TCPRequest_) queue;
     struct bufferevent *client_proxy_bev;
     struct bufferevent *proxy_resolver_bev;
     struct evbuffer *proxy_resolver_query_evbuf;
     struct context *context;
     struct event *timeout_timer;
-    TCPRequestStatus status;
+    uint8_t client_nonce[crypto_box_HALF_NONCEBYTES];
+    uint8_t nmkey[crypto_box_BEFORENMBYTES];
     size_t dns_query_len;
     size_t dns_reply_len;
+    TCPRequestStatus status;
     bool is_dnscrypted;
 } TCPRequest;
 

diff --git a/udp_request.h b/udp_request.h
@@ -11,20 +11,20 @@ typedef struct UDPRequestStatus_ {
 } UDPRequestStatus;
 
 typedef struct UDPRequest_ {
-    uint16_t id;
-    uint64_t hash;
     RB_ENTRY(UDPRequest_) queue;
-    uint8_t client_nonce[crypto_box_HALF_NONCEBYTES];
-    uint8_t nmkey[crypto_box_BEFORENMBYTES];
-    bool is_dnscrypted;
-    struct sockaddr_storage client_sockaddr;
     struct context *context;
     struct event *sendto_retry_timer;
     struct event *timeout_timer;
+    uint64_t hash;
+    uint16_t id;
+    uint8_t client_nonce[crypto_box_HALF_NONCEBYTES];
+    uint8_t nmkey[crypto_box_BEFORENMBYTES];
+    struct sockaddr_storage client_sockaddr;
     evutil_socket_t client_proxy_handle;
     ev_socklen_t client_sockaddr_len;
     UDPRequestStatus status;
     unsigned char retries;
+    bool is_dnscrypted;
 } UDPRequest;
 
 typedef TAILQ_HEAD(TCPRequestQueue_, TCPRequest_) TCPRequestQueue;