@matheusbsbs / matheus-bagliano / commits / 0181b600a6

Fork 0

pkt-line: define PACKET_READ_RESPONSE_END

In a future commit, we will use PACKET_READ_RESPONSE_END to separate messages proxied by remote-curl. To prepare for this, add the PACKET_READ_RESPONSE_END enum value. In switch statements that need a case added, die() or BUG() when a PACKET_READ_RESPONSE_END is unexpected. Otherwise, mirror how PACKET_READ_DELIM is implemented (especially in cases where packets are being forwarded). Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Denton Liu committed May 19, 2020 at 06:53 UTC 0181b600a6deb66a346dbcbe8300cf9e2467ebbb

6 files changed +23

connect.c

@@ -127,6 +127,7 @@ enum protocol_version discover_version(struct packet_reader *reader)

127 die_initial_contact(0);

128 case PACKET_READ_FLUSH:

129 case PACKET_READ_DELIM:

130 + case PACKET_READ_RESPONSE_END:

131 version = protocol_v0;

132 break;

133 case PACKET_READ_NORMAL:

@@ -310,6 +311,7 @@ struct ref **get_remote_heads(struct packet_reader *reader,

311 state = EXPECTING_DONE;

312 break;

313 case PACKET_READ_DELIM:

314 + case PACKET_READ_RESPONSE_END:

315 die(_("invalid packet"));

316 }

317

pkt-line.c

+11

@@ -99,6 +99,13 @@ void packet_delim(int fd)

99 die_errno(_("unable to write delim packet"));

100 }

101

102 +void packet_response_end(int fd)

103 +{

104 + packet_trace("0002", 4, 1);

105 + if (write_in_full(fd, "0002", 4) < 0)

106 + die_errno(_("unable to write stateless separator packet"));

107 +}

108 +

109 int packet_flush_gently(int fd)

110 {

111 packet_trace("0000", 4, 1);

@@ -337,6 +344,10 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,

344 packet_trace("0001", 4, 0);

345 *pktlen = 0;

346 return PACKET_READ_DELIM;

347 + } else if (len == 2) {

348 + packet_trace("0002", 4, 0);

349 + *pktlen = 0;

350 + return PACKET_READ_RESPONSE_END;

351 } else if (len < 4) {

352 die(_("protocol error: bad line length %d"), len);

353 }

pkt-line.h

@@ -22,6 +22,7 @@

22 */

23 void packet_flush(int fd);

24 void packet_delim(int fd);

25 +void packet_response_end(int fd);

26 void packet_write_fmt(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));

27 void packet_buf_flush(struct strbuf *buf);

28 void packet_buf_delim(struct strbuf *buf);

@@ -94,6 +95,7 @@ enum packet_read_status {

95 PACKET_READ_NORMAL,

96 PACKET_READ_FLUSH,

97 PACKET_READ_DELIM,

98 + PACKET_READ_RESPONSE_END,

99 };

100 enum packet_read_status packet_read_with_status(int fd, char **src_buffer,

101 size_t *src_len, char *buffer,

remote-curl.c

@@ -601,6 +601,8 @@ static int rpc_read_from_out(struct rpc_state *rpc, int options,

601 case PACKET_READ_FLUSH:

602 memcpy(buf - 4, "0000", 4);

603 break;

604 + case PACKET_READ_RESPONSE_END:

605 + die(_("remote server sent stateless separator"));

606 }

607 }

608

serve.c

@@ -217,6 +217,8 @@ static int process_request(void)

217

218 state = PROCESS_REQUEST_DONE;

219 break;

220 + case PACKET_READ_RESPONSE_END:

221 + BUG("unexpected stateless separator packet");

222 }

223 }

224

t/helper/test-pkt-line.c

@@ -46,6 +46,9 @@ static void unpack(void)

46 case PACKET_READ_DELIM:

47 printf("0001\n");

48 break;

49 + case PACKET_READ_RESPONSE_END:

50 + printf("0002\n");

51 + break;

52 }

53 }

54 }

@@ -75,6 +78,7 @@ static void unpack_sideband(void)

78 case PACKET_READ_FLUSH:

79 return;

80 case PACKET_READ_DELIM:

81 + case PACKET_READ_RESPONSE_END:

82 break;

83 }

84 }