summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2021-01-26 15:09:22 +0100
committerDaniel Stenberg <daniel@haxx.se>2021-01-27 09:19:15 +0100
commit62e0fe21561eab43837154d918f1e9676f10bb14 (patch)
treed8992df8d7e1ff25ee758b58f978bc0a026876bf
parente76b058f3c9a314edbc1a214e1eaf6ef21955bd9 (diff)
downloadcurl-62e0fe21561eab43837154d918f1e9676f10bb14.tar.gz
urldata: move 'ints' to the end of 'connectdata'
To optimize storage slightly. Closes #6534
-rw-r--r--lib/urldata.h29
1 files changed, 14 insertions, 15 deletions
diff --git a/lib/urldata.h b/lib/urldata.h
index 0d8703a4b..7b80a0797 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1101,31 +1101,30 @@ struct connectdata {
struct mqtt_conn mqtt;
} proto;
- int cselect_bits; /* bitmask of socket events */
- int waitfor; /* current READ/WRITE bits to wait for */
-
-#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
- int socks5_gssapi_enctype;
+ struct http_connect_state *connect_state; /* for HTTP CONNECT */
+ struct connectbundle *bundle; /* The bundle we are member of */
+#ifdef USE_UNIX_SOCKETS
+ char *unix_domain_socket;
+#endif
+#ifdef USE_HYPER
+ /* if set, an alternative data transfer function */
+ Curl_datastream datastream;
#endif
-
/* When this connection is created, store the conditions for the local end
bind. This is stored before the actual bind and before any connection is
made and will serve the purpose of being used for comparison reasons so
that subsequent bound-requested connections aren't accidentally re-using
wrong connections. */
char *localdev;
- unsigned short localport;
int localportrange;
- struct http_connect_state *connect_state; /* for HTTP CONNECT */
- struct connectbundle *bundle; /* The bundle we are member of */
+ int cselect_bits; /* bitmask of socket events */
+ int waitfor; /* current READ/WRITE bits to wait for */
int negnpn; /* APLN or NPN TLS negotiated protocol, CURL_HTTP_VERSION* */
-#ifdef USE_UNIX_SOCKETS
- char *unix_domain_socket;
-#endif
-#ifdef USE_HYPER
- /* if set, an alternative data transfer function */
- Curl_datastream datastream;
+
+#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
+ int socks5_gssapi_enctype;
#endif
+ unsigned short localport;
};
/* The end of connectdata. */