Commit e6f1931aae5a2349b6eeb11968f7e6a54df75397
2018-10-22T00:09:24
http: rename http subtransport's `io` to `gitserver_stream` Rename `http_subtransport->io` to `http_subtransport->gitserver_stream` to clarify its use, especially as we might have additional streams (eg for a proxy) in the future.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195
diff --git a/src/transports/http.c b/src/transports/http.c
index 3d67ab4..82b9388 100644
--- a/src/transports/http.c
+++ b/src/transports/http.c
@@ -69,7 +69,7 @@ typedef struct {
typedef struct {
git_smart_subtransport parent;
transport_smart *owner;
- git_stream *io;
+ git_stream *gitserver_stream;
gitno_connection_data gitserver_data;
bool connected;
@@ -508,7 +508,7 @@ static int on_body_fill_buffer(http_parser *parser, const char *str, size_t len)
static void clear_parser_state(http_subtransport *t)
{
http_parser_init(&t->parser, HTTP_RESPONSE);
- gitno_buffer_setup_fromstream(t->io,
+ gitno_buffer_setup_fromstream(t->gitserver_stream,
&t->parse_buffer,
t->parse_buffer_data,
sizeof(t->parse_buffer_data));
@@ -565,7 +565,7 @@ static int apply_proxy_config(http_subtransport *t)
int error;
git_proxy_t proxy_type;
- if (!git_stream_supports_proxy(t->io))
+ if (!git_stream_supports_proxy(t->gitserver_stream))
return 0;
proxy_type = t->owner->proxy.type;
@@ -585,13 +585,13 @@ static int apply_proxy_config(http_subtransport *t)
opts.payload = t->owner->proxy.payload;
opts.type = GIT_PROXY_SPECIFIED;
opts.url = url;
- error = git_stream_set_proxy(t->io, &opts);
+ error = git_stream_set_proxy(t->gitserver_stream, &opts);
git__free(url);
return error;
}
- return git_stream_set_proxy(t->io, &t->owner->proxy);
+ return git_stream_set_proxy(t->gitserver_stream, &t->owner->proxy);
}
static int http_connect(http_subtransport *t)
@@ -603,39 +603,42 @@ static int http_connect(http_subtransport *t)
t->parse_finished)
return 0;
- if (t->io) {
- git_stream_close(t->io);
- git_stream_free(t->io);
- t->io = NULL;
+ if (t->gitserver_stream) {
+ git_stream_close(t->gitserver_stream);
+ git_stream_free(t->gitserver_stream);
+ t->gitserver_stream = NULL;
t->connected = 0;
}
if (t->gitserver_data.use_ssl) {
- error = git_tls_stream_new(&t->io, t->gitserver_data.host, t->gitserver_data.port);
+ error = git_tls_stream_new(&t->gitserver_stream,
+ t->gitserver_data.host, t->gitserver_data.port);
} else {
#ifdef GIT_CURL
- error = git_curl_stream_new(&t->io, t->gitserver_data.host, t->gitserver_data.port);
+ error = git_curl_stream_new(&t->gitserver_stream,
+ t->gitserver_data.host, t->gitserver_data.port);
#else
- error = git_socket_stream_new(&t->io, t->gitserver_data.host, t->gitserver_data.port);
+ error = git_socket_stream_new(&t->gitserver_stream,
+ t->gitserver_data.host, t->gitserver_data.port);
#endif
}
if (error < 0)
return error;
- GITERR_CHECK_VERSION(t->io, GIT_STREAM_VERSION, "git_stream");
+ GITERR_CHECK_VERSION(t->gitserver_stream, GIT_STREAM_VERSION, "git_stream");
if ((error = apply_proxy_config(t)) < 0)
return error;
- error = git_stream_connect(t->io);
+ error = git_stream_connect(t->gitserver_stream);
if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL &&
- git_stream_is_encrypted(t->io)) {
+ git_stream_is_encrypted(t->gitserver_stream)) {
git_cert *cert;
int is_valid = (error == GIT_OK);
- if ((error = git_stream_certificate(&cert, t->io)) < 0)
+ if ((error = git_stream_certificate(&cert, t->gitserver_stream)) < 0)
return error;
giterr_clear();
@@ -683,7 +686,8 @@ replay:
if (gen_request(&request, s, 0) < 0)
return -1;
- if (git_stream_write(t->io, request.ptr, request.size, 0) < 0) {
+ if (git_stream_write(t->gitserver_stream,
+ request.ptr, request.size, 0) < 0) {
git_buf_dispose(&request);
return -1;
}
@@ -699,13 +703,14 @@ replay:
/* Flush, if necessary */
if (s->chunk_buffer_len > 0 &&
- write_chunk(t->io, s->chunk_buffer, s->chunk_buffer_len) < 0)
+ write_chunk(t->gitserver_stream,
+ s->chunk_buffer, s->chunk_buffer_len) < 0)
return -1;
s->chunk_buffer_len = 0;
/* Write the final chunk. */
- if (git_stream_write(t->io, "0\r\n\r\n", 5, 0) < 0)
+ if (git_stream_write(t->gitserver_stream, "0\r\n\r\n", 5, 0) < 0)
return -1;
}
@@ -804,7 +809,8 @@ static int http_stream_write_chunked(
if (gen_request(&request, s, 0) < 0)
return -1;
- if (git_stream_write(t->io, request.ptr, request.size, 0) < 0) {
+ if (git_stream_write(t->gitserver_stream,
+ request.ptr, request.size, 0) < 0) {
git_buf_dispose(&request);
return -1;
}
@@ -817,14 +823,15 @@ static int http_stream_write_chunked(
if (len > CHUNK_SIZE) {
/* Flush, if necessary */
if (s->chunk_buffer_len > 0) {
- if (write_chunk(t->io, s->chunk_buffer, s->chunk_buffer_len) < 0)
+ if (write_chunk(t->gitserver_stream,
+ s->chunk_buffer, s->chunk_buffer_len) < 0)
return -1;
s->chunk_buffer_len = 0;
}
/* Write chunk directly */
- if (write_chunk(t->io, buffer, len) < 0)
+ if (write_chunk(t->gitserver_stream, buffer, len) < 0)
return -1;
}
else {
@@ -841,7 +848,8 @@ static int http_stream_write_chunked(
/* Is the buffer full? If so, then flush */
if (CHUNK_SIZE == s->chunk_buffer_len) {
- if (write_chunk(t->io, s->chunk_buffer, s->chunk_buffer_len) < 0)
+ if (write_chunk(t->gitserver_stream,
+ s->chunk_buffer, s->chunk_buffer_len) < 0)
return -1;
s->chunk_buffer_len = 0;
@@ -877,10 +885,11 @@ static int http_stream_write_single(
if (gen_request(&request, s, len) < 0)
return -1;
- if (git_stream_write(t->io, request.ptr, request.size, 0) < 0)
+ if (git_stream_write(t->gitserver_stream,
+ request.ptr, request.size, 0) < 0)
goto on_error;
- if (len && git_stream_write(t->io, buffer, len, 0) < 0)
+ if (len && git_stream_write(t->gitserver_stream, buffer, len, 0) < 0)
goto on_error;
git_buf_dispose(&request);
@@ -1049,10 +1058,10 @@ static int http_close(git_smart_subtransport *subtransport)
t->connected = 0;
- if (t->io) {
- git_stream_close(t->io);
- git_stream_free(t->io);
- t->io = NULL;
+ if (t->gitserver_stream) {
+ git_stream_close(t->gitserver_stream);
+ git_stream_free(t->gitserver_stream);
+ t->gitserver_stream = NULL;
}
if (t->cred) {