]>
Commit | Line | Data |
---|---|---|
f3a3214e LT |
1 | #include "cache.h" |
2 | #include "pkt-line.h" | |
fd89433d | 3 | #include "run-command.h" |
f3a3214e | 4 | |
74543a04 | 5 | char packet_buffer[LARGE_PACKET_MAX]; |
1e4cd68c | 6 | static const char *packet_trace_prefix = "git"; |
6aa30857 | 7 | static struct trace_key trace_packet = TRACE_KEY_INIT(PACKET); |
32359838 | 8 | static struct trace_key trace_pack = TRACE_KEY_INIT(PACKFILE); |
bbc30f99 JK |
9 | |
10 | void packet_trace_identity(const char *prog) | |
11 | { | |
12 | packet_trace_prefix = xstrdup(prog); | |
13 | } | |
14 | ||
fd89433d JK |
15 | static const char *get_trace_prefix(void) |
16 | { | |
17 | return in_async() ? "sideband" : packet_trace_prefix; | |
18 | } | |
19 | ||
32359838 JK |
20 | static int packet_trace_pack(const char *buf, unsigned int len, int sideband) |
21 | { | |
22 | if (!sideband) { | |
23 | trace_verbatim(&trace_pack, buf, len); | |
24 | return 1; | |
25 | } else if (len && *buf == '\1') { | |
26 | trace_verbatim(&trace_pack, buf + 1, len - 1); | |
27 | return 1; | |
28 | } else { | |
29 | /* it's another non-pack sideband */ | |
30 | return 0; | |
31 | } | |
32 | } | |
33 | ||
bbc30f99 JK |
34 | static void packet_trace(const char *buf, unsigned int len, int write) |
35 | { | |
36 | int i; | |
37 | struct strbuf out; | |
32359838 JK |
38 | static int in_pack, sideband; |
39 | ||
40 | if (!trace_want(&trace_packet) && !trace_want(&trace_pack)) | |
41 | return; | |
42 | ||
43 | if (in_pack) { | |
44 | if (packet_trace_pack(buf, len, sideband)) | |
45 | return; | |
46 | } else if (starts_with(buf, "PACK") || starts_with(buf, "\1PACK")) { | |
47 | in_pack = 1; | |
48 | sideband = *buf == '\1'; | |
49 | packet_trace_pack(buf, len, sideband); | |
50 | ||
51 | /* | |
52 | * Make a note in the human-readable trace that the pack data | |
53 | * started. | |
54 | */ | |
55 | buf = "PACK ..."; | |
56 | len = strlen(buf); | |
57 | } | |
bbc30f99 | 58 | |
6aa30857 | 59 | if (!trace_want(&trace_packet)) |
bbc30f99 JK |
60 | return; |
61 | ||
62 | /* +32 is just a guess for header + quoting */ | |
63 | strbuf_init(&out, len+32); | |
64 | ||
65 | strbuf_addf(&out, "packet: %12s%c ", | |
fd89433d | 66 | get_trace_prefix(), write ? '>' : '<'); |
bbc30f99 | 67 | |
32359838 JK |
68 | /* XXX we should really handle printable utf8 */ |
69 | for (i = 0; i < len; i++) { | |
70 | /* suppress newlines */ | |
71 | if (buf[i] == '\n') | |
72 | continue; | |
73 | if (buf[i] >= 0x20 && buf[i] <= 0x7e) | |
74 | strbuf_addch(&out, buf[i]); | |
75 | else | |
76 | strbuf_addf(&out, "\\%o", buf[i]); | |
bbc30f99 JK |
77 | } |
78 | ||
79 | strbuf_addch(&out, '\n'); | |
6aa30857 | 80 | trace_strbuf(&trace_packet, &out); |
bbc30f99 JK |
81 | strbuf_release(&out); |
82 | } | |
83 | ||
f3a3214e LT |
84 | /* |
85 | * If we buffered things up above (we don't, but we should), | |
86 | * we'd flush it here | |
87 | */ | |
88 | void packet_flush(int fd) | |
89 | { | |
bbc30f99 | 90 | packet_trace("0000", 4, 1); |
37c80012 JK |
91 | if (write_in_full(fd, "0000", 4) < 0) |
92 | die_errno(_("unable to write flush packet")); | |
f3a3214e LT |
93 | } |
94 | ||
a4cfd41c BW |
95 | void packet_delim(int fd) |
96 | { | |
97 | packet_trace("0001", 4, 1); | |
37c80012 JK |
98 | if (write_in_full(fd, "0001", 4) < 0) |
99 | die_errno(_("unable to write delim packet")); | |
a4cfd41c BW |
100 | } |
101 | ||
0181b600 DL |
102 | void packet_response_end(int fd) |
103 | { | |
104 | packet_trace("0002", 4, 1); | |
105 | if (write_in_full(fd, "0002", 4) < 0) | |
8232a0ff | 106 | die_errno(_("unable to write response end packet")); |
0181b600 DL |
107 | } |
108 | ||
038ce90f LS |
109 | int packet_flush_gently(int fd) |
110 | { | |
111 | packet_trace("0000", 4, 1); | |
4c95e3dd | 112 | if (write_in_full(fd, "0000", 4) < 0) |
c60d7697 | 113 | return error(_("flush packet write failed")); |
4c95e3dd | 114 | return 0; |
038ce90f LS |
115 | } |
116 | ||
f5615d24 SP |
117 | void packet_buf_flush(struct strbuf *buf) |
118 | { | |
bbc30f99 | 119 | packet_trace("0000", 4, 1); |
f5615d24 SP |
120 | strbuf_add(buf, "0000", 4); |
121 | } | |
122 | ||
a4cfd41c BW |
123 | void packet_buf_delim(struct strbuf *buf) |
124 | { | |
125 | packet_trace("0001", 4, 1); | |
126 | strbuf_add(buf, "0001", 4); | |
127 | } | |
128 | ||
56bea280 | 129 | void set_packet_header(char *buf, int size) |
f3a3214e | 130 | { |
f3a3214e | 131 | static char hexchar[] = "0123456789abcdef"; |
2f60bdd1 LS |
132 | |
133 | #define hex(a) (hexchar[(a) & 15]) | |
134 | buf[0] = hex(size >> 12); | |
135 | buf[1] = hex(size >> 8); | |
136 | buf[2] = hex(size >> 4); | |
137 | buf[3] = hex(size); | |
138 | #undef hex | |
139 | } | |
140 | ||
bc2e795c JT |
141 | static void format_packet(struct strbuf *out, const char *prefix, |
142 | const char *fmt, va_list args) | |
2f60bdd1 | 143 | { |
8e9faf27 | 144 | size_t orig_len, n; |
f3a3214e | 145 | |
8e9faf27 JK |
146 | orig_len = out->len; |
147 | strbuf_addstr(out, "0000"); | |
bc2e795c | 148 | strbuf_addstr(out, prefix); |
8e9faf27 JK |
149 | strbuf_vaddf(out, fmt, args); |
150 | n = out->len - orig_len; | |
151 | ||
152 | if (n > LARGE_PACKET_MAX) | |
c60d7697 | 153 | die(_("protocol error: impossibly long line")); |
8e9faf27 | 154 | |
2f60bdd1 | 155 | set_packet_header(&out->buf[orig_len], n); |
8e9faf27 | 156 | packet_trace(out->buf + orig_len + 4, n - 4, 1); |
f5615d24 SP |
157 | } |
158 | ||
bc2e795c | 159 | static int packet_write_fmt_1(int fd, int gently, const char *prefix, |
70428d1a LS |
160 | const char *fmt, va_list args) |
161 | { | |
150efef1 | 162 | static struct strbuf buf = STRBUF_INIT; |
70428d1a | 163 | |
150efef1 | 164 | strbuf_reset(&buf); |
bc2e795c | 165 | format_packet(&buf, prefix, fmt, args); |
4c95e3dd JK |
166 | if (write_in_full(fd, buf.buf, buf.len) < 0) { |
167 | if (!gently) { | |
168 | check_pipe(errno); | |
c60d7697 | 169 | die_errno(_("packet write with format failed")); |
4c95e3dd | 170 | } |
c60d7697 | 171 | return error(_("packet write with format failed")); |
70428d1a | 172 | } |
4c95e3dd JK |
173 | |
174 | return 0; | |
70428d1a LS |
175 | } |
176 | ||
81c634e9 | 177 | void packet_write_fmt(int fd, const char *fmt, ...) |
f5615d24 SP |
178 | { |
179 | va_list args; | |
f5615d24 SP |
180 | |
181 | va_start(args, fmt); | |
bc2e795c | 182 | packet_write_fmt_1(fd, 0, "", fmt, args); |
70428d1a LS |
183 | va_end(args); |
184 | } | |
185 | ||
186 | int packet_write_fmt_gently(int fd, const char *fmt, ...) | |
187 | { | |
188 | int status; | |
189 | va_list args; | |
190 | ||
191 | va_start(args, fmt); | |
bc2e795c | 192 | status = packet_write_fmt_1(fd, 1, "", fmt, args); |
f5615d24 | 193 | va_end(args); |
70428d1a | 194 | return status; |
f3a3214e LT |
195 | } |
196 | ||
332ec963 MT |
197 | static int do_packet_write(const int fd_out, const char *buf, size_t size, |
198 | struct strbuf *err) | |
edfb780c | 199 | { |
7455e05e | 200 | char header[4]; |
edfb780c LS |
201 | size_t packet_size; |
202 | ||
332ec963 MT |
203 | if (size > LARGE_PACKET_DATA_MAX) { |
204 | strbuf_addstr(err, _("packet write failed - data exceeds max packet size")); | |
205 | return -1; | |
206 | } | |
edfb780c LS |
207 | |
208 | packet_trace(buf, size, 1); | |
209 | packet_size = size + 4; | |
7455e05e JH |
210 | |
211 | set_packet_header(header, packet_size); | |
212 | ||
213 | /* | |
214 | * Write the header and the buffer in 2 parts so that we do | |
215 | * not need to allocate a buffer or rely on a static buffer. | |
216 | * This also avoids putting a large buffer on the stack which | |
217 | * might have multi-threading issues. | |
218 | */ | |
219 | ||
220 | if (write_in_full(fd_out, header, 4) < 0 || | |
332ec963 MT |
221 | write_in_full(fd_out, buf, size) < 0) { |
222 | strbuf_addf(err, _("packet write failed: %s"), strerror(errno)); | |
223 | return -1; | |
224 | } | |
225 | return 0; | |
226 | } | |
227 | ||
228 | static int packet_write_gently(const int fd_out, const char *buf, size_t size) | |
229 | { | |
230 | struct strbuf err = STRBUF_INIT; | |
231 | if (do_packet_write(fd_out, buf, size, &err)) { | |
232 | error("%s", err.buf); | |
233 | strbuf_release(&err); | |
234 | return -1; | |
235 | } | |
4c95e3dd | 236 | return 0; |
edfb780c LS |
237 | } |
238 | ||
5d2124b3 BW |
239 | void packet_write(int fd_out, const char *buf, size_t size) |
240 | { | |
332ec963 MT |
241 | struct strbuf err = STRBUF_INIT; |
242 | if (do_packet_write(fd_out, buf, size, &err)) | |
243 | die("%s", err.buf); | |
5d2124b3 BW |
244 | } |
245 | ||
96328398 JV |
246 | void packet_fwrite(FILE *f, const char *buf, size_t size) |
247 | { | |
248 | size_t packet_size; | |
249 | char header[4]; | |
250 | ||
251 | if (size > LARGE_PACKET_DATA_MAX) | |
252 | die(_("packet write failed - data exceeds max packet size")); | |
253 | ||
254 | packet_trace(buf, size, 1); | |
255 | packet_size = size + 4; | |
256 | ||
257 | set_packet_header(header, packet_size); | |
258 | fwrite_or_die(f, header, 4); | |
259 | fwrite_or_die(f, buf, size); | |
260 | } | |
261 | ||
262 | void packet_fwrite_fmt(FILE *fh, const char *fmt, ...) | |
263 | { | |
264 | static struct strbuf buf = STRBUF_INIT; | |
265 | va_list args; | |
266 | ||
267 | strbuf_reset(&buf); | |
268 | ||
269 | va_start(args, fmt); | |
270 | format_packet(&buf, "", fmt, args); | |
271 | va_end(args); | |
272 | ||
273 | fwrite_or_die(fh, buf.buf, buf.len); | |
274 | } | |
275 | ||
276 | void packet_fflush(FILE *f) | |
277 | { | |
278 | packet_trace("0000", 4, 1); | |
279 | fwrite_or_die(f, "0000", 4); | |
280 | fflush_or_die(f); | |
281 | } | |
282 | ||
f5615d24 SP |
283 | void packet_buf_write(struct strbuf *buf, const char *fmt, ...) |
284 | { | |
285 | va_list args; | |
f5615d24 SP |
286 | |
287 | va_start(args, fmt); | |
bc2e795c | 288 | format_packet(buf, "", fmt, args); |
f5615d24 | 289 | va_end(args); |
f5615d24 SP |
290 | } |
291 | ||
3a63c6a4 | 292 | int write_packetized_from_fd_no_flush(int fd_in, int fd_out) |
bb643d8b | 293 | { |
7455e05e | 294 | char *buf = xmalloc(LARGE_PACKET_DATA_MAX); |
bb643d8b LS |
295 | int err = 0; |
296 | ssize_t bytes_to_write; | |
297 | ||
298 | while (!err) { | |
7455e05e JH |
299 | bytes_to_write = xread(fd_in, buf, LARGE_PACKET_DATA_MAX); |
300 | if (bytes_to_write < 0) { | |
301 | free(buf); | |
bb643d8b | 302 | return COPY_READ_ERROR; |
7455e05e | 303 | } |
bb643d8b LS |
304 | if (bytes_to_write == 0) |
305 | break; | |
306 | err = packet_write_gently(fd_out, buf, bytes_to_write); | |
307 | } | |
7455e05e | 308 | free(buf); |
bb643d8b LS |
309 | return err; |
310 | } | |
311 | ||
52917a99 MT |
312 | int write_packetized_from_buf_no_flush_count(const char *src_in, size_t len, |
313 | int fd_out, int *packet_counter) | |
bb643d8b LS |
314 | { |
315 | int err = 0; | |
316 | size_t bytes_written = 0; | |
317 | size_t bytes_to_write; | |
318 | ||
319 | while (!err) { | |
320 | if ((len - bytes_written) > LARGE_PACKET_DATA_MAX) | |
321 | bytes_to_write = LARGE_PACKET_DATA_MAX; | |
322 | else | |
323 | bytes_to_write = len - bytes_written; | |
324 | if (bytes_to_write == 0) | |
325 | break; | |
326 | err = packet_write_gently(fd_out, src_in + bytes_written, bytes_to_write); | |
327 | bytes_written += bytes_to_write; | |
52917a99 MT |
328 | if (packet_counter) |
329 | (*packet_counter)++; | |
bb643d8b | 330 | } |
bb643d8b LS |
331 | return err; |
332 | } | |
333 | ||
4981fe75 JK |
334 | static int get_packet_data(int fd, char **src_buf, size_t *src_size, |
335 | void *dst, unsigned size, int options) | |
f3a3214e | 336 | { |
4981fe75 JK |
337 | ssize_t ret; |
338 | ||
339 | if (fd >= 0 && src_buf && *src_buf) | |
033abf97 | 340 | BUG("multiple sources given to packet_read"); |
4981fe75 JK |
341 | |
342 | /* Read up to "size" bytes from our source, whatever it is. */ | |
343 | if (src_buf && *src_buf) { | |
344 | ret = size < *src_size ? size : *src_size; | |
345 | memcpy(dst, *src_buf, ret); | |
346 | *src_buf += ret; | |
347 | *src_size -= ret; | |
348 | } else { | |
349 | ret = read_in_full(fd, dst, size); | |
c4ba5793 JS |
350 | if (ret < 0) { |
351 | if (options & PACKET_READ_GENTLE_ON_READ_ERROR) | |
352 | return error_errno(_("read error")); | |
c60d7697 | 353 | die_errno(_("read error")); |
c4ba5793 | 354 | } |
4981fe75 JK |
355 | } |
356 | ||
357 | /* And complain if we didn't get enough bytes to satisfy the read. */ | |
61d36330 | 358 | if (ret != size) { |
03809429 | 359 | if (options & PACKET_READ_GENTLE_ON_EOF) |
46284dd1 HV |
360 | return -1; |
361 | ||
c4ba5793 JS |
362 | if (options & PACKET_READ_GENTLE_ON_READ_ERROR) |
363 | return error(_("the remote end hung up unexpectedly")); | |
c60d7697 | 364 | die(_("the remote end hung up unexpectedly")); |
46284dd1 HV |
365 | } |
366 | ||
367 | return ret; | |
f3a3214e LT |
368 | } |
369 | ||
101736a1 | 370 | int packet_length(const char lenbuf_hex[4]) |
f3a3214e | 371 | { |
101736a1 DL |
372 | int val = hex2chr(lenbuf_hex); |
373 | return (val < 0) ? val : (val << 8) | hex2chr(lenbuf_hex + 2); | |
f5615d24 SP |
374 | } |
375 | ||
88e9b1e3 IF |
376 | static char *find_packfile_uri_path(const char *buffer) |
377 | { | |
378 | const char *URI_MARK = "://"; | |
379 | char *path; | |
380 | int len; | |
381 | ||
382 | /* First char is sideband mark */ | |
383 | buffer += 1; | |
384 | ||
385 | len = strspn(buffer, "0123456789abcdefABCDEF"); | |
386 | /* size of SHA1 and SHA256 hash */ | |
387 | if (!(len == 40 || len == 64) || buffer[len] != ' ') | |
388 | return NULL; /* required "<hash>SP" not seen */ | |
389 | ||
390 | path = strstr(buffer + len + 1, URI_MARK); | |
391 | if (!path) | |
392 | return NULL; | |
393 | ||
394 | path = strchr(path + strlen(URI_MARK), '/'); | |
395 | if (!path || !*(path + 1)) | |
396 | return NULL; | |
397 | ||
398 | /* position after '/' */ | |
399 | return ++path; | |
400 | } | |
401 | ||
2153d478 BW |
402 | enum packet_read_status packet_read_with_status(int fd, char **src_buffer, |
403 | size_t *src_len, char *buffer, | |
404 | unsigned size, int *pktlen, | |
405 | int options) | |
f5615d24 | 406 | { |
2153d478 | 407 | int len; |
f5615d24 | 408 | char linelen[4]; |
88e9b1e3 | 409 | char *uri_path_start; |
f5615d24 | 410 | |
2153d478 BW |
411 | if (get_packet_data(fd, src_buffer, src_len, linelen, 4, options) < 0) { |
412 | *pktlen = -1; | |
413 | return PACKET_READ_EOF; | |
414 | } | |
415 | ||
f5615d24 | 416 | len = packet_length(linelen); |
2153d478 BW |
417 | |
418 | if (len < 0) { | |
c4ba5793 JS |
419 | if (options & PACKET_READ_GENTLE_ON_READ_ERROR) |
420 | return error(_("protocol error: bad line length " | |
421 | "character: %.4s"), linelen); | |
c60d7697 | 422 | die(_("protocol error: bad line length character: %.4s"), linelen); |
2153d478 | 423 | } else if (!len) { |
bbc30f99 | 424 | packet_trace("0000", 4, 0); |
2153d478 BW |
425 | *pktlen = 0; |
426 | return PACKET_READ_FLUSH; | |
a4cfd41c BW |
427 | } else if (len == 1) { |
428 | packet_trace("0001", 4, 0); | |
429 | *pktlen = 0; | |
430 | return PACKET_READ_DELIM; | |
0181b600 DL |
431 | } else if (len == 2) { |
432 | packet_trace("0002", 4, 0); | |
433 | *pktlen = 0; | |
434 | return PACKET_READ_RESPONSE_END; | |
2153d478 | 435 | } else if (len < 4) { |
c4ba5793 JS |
436 | if (options & PACKET_READ_GENTLE_ON_READ_ERROR) |
437 | return error(_("protocol error: bad line length %d"), | |
438 | len); | |
c60d7697 | 439 | die(_("protocol error: bad line length %d"), len); |
bbc30f99 | 440 | } |
2153d478 | 441 | |
f3a3214e | 442 | len -= 4; |
c4ba5793 JS |
443 | if ((unsigned)len >= size) { |
444 | if (options & PACKET_READ_GENTLE_ON_READ_ERROR) | |
445 | return error(_("protocol error: bad line length %d"), | |
446 | len); | |
c60d7697 | 447 | die(_("protocol error: bad line length %d"), len); |
c4ba5793 | 448 | } |
2153d478 BW |
449 | |
450 | if (get_packet_data(fd, src_buffer, src_len, buffer, len, options) < 0) { | |
451 | *pktlen = -1; | |
452 | return PACKET_READ_EOF; | |
453 | } | |
819b929d JK |
454 | |
455 | if ((options & PACKET_READ_CHOMP_NEWLINE) && | |
456 | len && buffer[len-1] == '\n') | |
457 | len--; | |
458 | ||
f3a3214e | 459 | buffer[len] = 0; |
88e9b1e3 IF |
460 | if (options & PACKET_READ_REDACT_URI_PATH && |
461 | (uri_path_start = find_packfile_uri_path(buffer))) { | |
462 | const char *redacted = "<redacted>"; | |
463 | struct strbuf tracebuf = STRBUF_INIT; | |
464 | strbuf_insert(&tracebuf, 0, buffer, len); | |
465 | strbuf_splice(&tracebuf, uri_path_start - buffer, | |
466 | strlen(uri_path_start), redacted, strlen(redacted)); | |
467 | packet_trace(tracebuf.buf, tracebuf.len, 0); | |
468 | strbuf_release(&tracebuf); | |
469 | } else { | |
470 | packet_trace(buffer, len, 0); | |
471 | } | |
533ddba4 JK |
472 | |
473 | if ((options & PACKET_READ_DIE_ON_ERR_PACKET) && | |
474 | starts_with(buffer, "ERR ")) | |
475 | die(_("remote error: %s"), buffer + 4); | |
476 | ||
2153d478 BW |
477 | *pktlen = len; |
478 | return PACKET_READ_NORMAL; | |
479 | } | |
480 | ||
ec9a37d6 | 481 | int packet_read(int fd, char *buffer, unsigned size, int options) |
2153d478 BW |
482 | { |
483 | int pktlen = -1; | |
484 | ||
ec9a37d6 ÆAB |
485 | packet_read_with_status(fd, NULL, NULL, buffer, size, &pktlen, |
486 | options); | |
2153d478 BW |
487 | |
488 | return pktlen; | |
f3a3214e | 489 | } |
f5615d24 | 490 | |
ec9a37d6 | 491 | char *packet_read_line(int fd, int *dst_len) |
46284dd1 | 492 | { |
ec9a37d6 | 493 | int len = packet_read(fd, packet_buffer, sizeof(packet_buffer), |
74543a04 | 494 | PACKET_READ_CHOMP_NEWLINE); |
4981fe75 JK |
495 | if (dst_len) |
496 | *dst_len = len; | |
974b50c5 | 497 | return (len > 0) ? packet_buffer : NULL; |
46284dd1 HV |
498 | } |
499 | ||
825b9226 BP |
500 | int packet_read_line_gently(int fd, int *dst_len, char **dst_line) |
501 | { | |
ec9a37d6 | 502 | int len = packet_read(fd, packet_buffer, sizeof(packet_buffer), |
825b9226 BP |
503 | PACKET_READ_CHOMP_NEWLINE|PACKET_READ_GENTLE_ON_EOF); |
504 | if (dst_len) | |
505 | *dst_len = len; | |
506 | if (dst_line) | |
507 | *dst_line = (len > 0) ? packet_buffer : NULL; | |
508 | return len; | |
509 | } | |
510 | ||
8c2efa5d | 511 | ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options) |
bb643d8b LS |
512 | { |
513 | int packet_len; | |
514 | ||
515 | size_t orig_len = sb_out->len; | |
516 | size_t orig_alloc = sb_out->alloc; | |
517 | ||
518 | for (;;) { | |
519 | strbuf_grow(sb_out, LARGE_PACKET_DATA_MAX); | |
ec9a37d6 | 520 | packet_len = packet_read(fd_in, |
bb643d8b LS |
521 | /* strbuf_grow() above always allocates one extra byte to |
522 | * store a '\0' at the end of the string. packet_read() | |
523 | * writes a '\0' extra byte at the end, too. Let it know | |
524 | * that there is already room for the extra byte. | |
525 | */ | |
526 | sb_out->buf + sb_out->len, LARGE_PACKET_DATA_MAX+1, | |
8c2efa5d | 527 | options); |
bb643d8b LS |
528 | if (packet_len <= 0) |
529 | break; | |
530 | sb_out->len += packet_len; | |
531 | } | |
532 | ||
533 | if (packet_len < 0) { | |
534 | if (orig_alloc == 0) | |
535 | strbuf_release(sb_out); | |
536 | else | |
537 | strbuf_setlen(sb_out, orig_len); | |
538 | return packet_len; | |
539 | } | |
540 | return sb_out->len - orig_len; | |
541 | } | |
77dabc14 | 542 | |
fbd76cd4 JT |
543 | int recv_sideband(const char *me, int in_stream, int out) |
544 | { | |
545 | char buf[LARGE_PACKET_MAX + 1]; | |
546 | int len; | |
547 | struct strbuf scratch = STRBUF_INIT; | |
548 | enum sideband_type sideband_type; | |
549 | ||
550 | while (1) { | |
af22a63c JK |
551 | int status = packet_read_with_status(in_stream, NULL, NULL, |
552 | buf, LARGE_PACKET_MAX, | |
553 | &len, | |
554 | PACKET_READ_GENTLE_ON_EOF); | |
555 | if (!demultiplex_sideband(me, status, buf, len, 0, &scratch, | |
fbd76cd4 JT |
556 | &sideband_type)) |
557 | continue; | |
558 | switch (sideband_type) { | |
559 | case SIDEBAND_PRIMARY: | |
560 | write_or_die(out, buf + 1, len - 1); | |
561 | break; | |
562 | default: /* errors: message already written */ | |
8e86cf65 JS |
563 | if (scratch.len > 0) |
564 | BUG("unhandled incomplete sideband: '%s'", | |
565 | scratch.buf); | |
fbd76cd4 JT |
566 | return sideband_type; |
567 | } | |
568 | } | |
569 | } | |
570 | ||
77dabc14 BW |
571 | /* Packet Reader Functions */ |
572 | void packet_reader_init(struct packet_reader *reader, int fd, | |
573 | char *src_buffer, size_t src_len, | |
574 | int options) | |
575 | { | |
576 | memset(reader, 0, sizeof(*reader)); | |
577 | ||
578 | reader->fd = fd; | |
579 | reader->src_buffer = src_buffer; | |
580 | reader->src_len = src_len; | |
581 | reader->buffer = packet_buffer; | |
582 | reader->buffer_size = sizeof(packet_buffer); | |
583 | reader->options = options; | |
0bbc0bc5 | 584 | reader->me = "git"; |
9a9f0d3f | 585 | reader->hash_algo = &hash_algos[GIT_HASH_SHA1]; |
77dabc14 BW |
586 | } |
587 | ||
588 | enum packet_read_status packet_reader_read(struct packet_reader *reader) | |
589 | { | |
0bbc0bc5 JT |
590 | struct strbuf scratch = STRBUF_INIT; |
591 | ||
77dabc14 BW |
592 | if (reader->line_peeked) { |
593 | reader->line_peeked = 0; | |
594 | return reader->status; | |
595 | } | |
596 | ||
0bbc0bc5 JT |
597 | /* |
598 | * Consume all progress packets until a primary payload packet is | |
599 | * received | |
600 | */ | |
601 | while (1) { | |
602 | enum sideband_type sideband_type; | |
603 | reader->status = packet_read_with_status(reader->fd, | |
604 | &reader->src_buffer, | |
605 | &reader->src_len, | |
606 | reader->buffer, | |
607 | reader->buffer_size, | |
608 | &reader->pktlen, | |
609 | reader->options); | |
610 | if (!reader->use_sideband) | |
611 | break; | |
af22a63c JK |
612 | if (demultiplex_sideband(reader->me, reader->status, |
613 | reader->buffer, reader->pktlen, 1, | |
614 | &scratch, &sideband_type)) | |
0bbc0bc5 JT |
615 | break; |
616 | } | |
77dabc14 BW |
617 | |
618 | if (reader->status == PACKET_READ_NORMAL) | |
0bbc0bc5 JT |
619 | /* Skip the sideband designator if sideband is used */ |
620 | reader->line = reader->use_sideband ? | |
621 | reader->buffer + 1 : reader->buffer; | |
77dabc14 BW |
622 | else |
623 | reader->line = NULL; | |
624 | ||
625 | return reader->status; | |
626 | } | |
627 | ||
628 | enum packet_read_status packet_reader_peek(struct packet_reader *reader) | |
629 | { | |
630 | /* Only allow peeking a single line */ | |
631 | if (reader->line_peeked) | |
632 | return reader->status; | |
633 | ||
634 | /* Peek a line by reading it and setting peeked flag */ | |
635 | packet_reader_read(reader); | |
636 | reader->line_peeked = 1; | |
637 | return reader->status; | |
638 | } | |
bc2e795c JT |
639 | |
640 | void packet_writer_init(struct packet_writer *writer, int dest_fd) | |
641 | { | |
642 | writer->dest_fd = dest_fd; | |
0bbc0bc5 | 643 | writer->use_sideband = 0; |
bc2e795c JT |
644 | } |
645 | ||
646 | void packet_writer_write(struct packet_writer *writer, const char *fmt, ...) | |
647 | { | |
648 | va_list args; | |
649 | ||
650 | va_start(args, fmt); | |
0bbc0bc5 JT |
651 | packet_write_fmt_1(writer->dest_fd, 0, |
652 | writer->use_sideband ? "\001" : "", fmt, args); | |
bc2e795c JT |
653 | va_end(args); |
654 | } | |
655 | ||
656 | void packet_writer_error(struct packet_writer *writer, const char *fmt, ...) | |
657 | { | |
658 | va_list args; | |
659 | ||
660 | va_start(args, fmt); | |
0bbc0bc5 JT |
661 | packet_write_fmt_1(writer->dest_fd, 0, |
662 | writer->use_sideband ? "\003" : "ERR ", fmt, args); | |
bc2e795c JT |
663 | va_end(args); |
664 | } | |
665 | ||
666 | void packet_writer_delim(struct packet_writer *writer) | |
667 | { | |
668 | packet_delim(writer->dest_fd); | |
669 | } | |
670 | ||
671 | void packet_writer_flush(struct packet_writer *writer) | |
672 | { | |
673 | packet_flush(writer->dest_fd); | |
674 | } |