cel
/
sbotc
mirror of https://git.scuttlebot.io/%25133ulDgs%2FoC1DXjoK04vDFy6DgVBB%2FZok15YJmuhD5Q%3D.sha256
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

End duplex stream when output ends

Browse Source
main
cel 6 years ago
parent 1412c8b5f9
commit 7c6272311b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File

10
sbotc.c
Unescape View File

@ -685,8 +685,7 @@ static int bs_passthrough(struct boxs *bs, int infd, int outfd) {
enum stream_state in = stream_state_open; enum stream_state in = stream_state_open;
enum stream_state out = stream_state_open; enum stream_state out = stream_state_open;
while (out == stream_state_open while (out == stream_state_open) {
|| (in == stream_state_open && out != stream_state_ended_error)) {
FD_ZERO(&rd); FD_ZERO(&rd);
if (in == stream_state_open) FD_SET(infd, &rd); if (in == stream_state_open) FD_SET(infd, &rd);
if (out == stream_state_open) FD_SET(sfd, &rd); if (out == stream_state_open) FD_SET(sfd, &rd);
@ -864,7 +863,7 @@ static int muxrpc_write_blob_add(struct boxs *bs, int infd, int outfd, int req_i
in == stream_state_ended_error || out == stream_state_ended_error ? 2 : 1; in == stream_state_ended_error || out == stream_state_ended_error ? 2 : 1;
} }
static int muxrpc_duplex(struct boxs *bs, int infd, int outfd, enum pkt_type in_ptype, int req_id, bool no_newline, bool raw) { static int muxrpc_duplex(struct boxs *bs, int infd, int outfd, enum pkt_type in_ptype, int req_id, bool no_newline) {
int rc; int rc;
fd_set rd; fd_set rd;
int sfd = bs->s; int sfd = bs->s;
@ -872,8 +871,7 @@ static int muxrpc_duplex(struct boxs *bs, int infd, int outfd, enum pkt_type in_
enum stream_state in = stream_state_open; enum stream_state in = stream_state_open;
enum stream_state out = stream_state_open; enum stream_state out = stream_state_open;
while (out == stream_state_open while (out == stream_state_open) {
|| (!raw && in == stream_state_open && out != stream_state_ended_error)) {
FD_ZERO(&rd); FD_ZERO(&rd);
if (in == stream_state_open) FD_SET(infd, &rd); if (in == stream_state_open) FD_SET(infd, &rd);
if (out == stream_state_open) FD_SET(sfd, &rd); if (out == stream_state_open) FD_SET(sfd, &rd);
@ -1201,7 +1199,7 @@ do_tcp_connect:
} }
break; break;
case muxrpc_type_duplex: case muxrpc_type_duplex:
rc = muxrpc_duplex(&bs, STDIN_FILENO, STDOUT_FILENO, ptype, 1, no_newline, raw); rc = muxrpc_duplex(&bs, STDIN_FILENO, STDOUT_FILENO, ptype, 1, no_newline);
break; break;
} }

Write Preview
Loading…
Cancel
Save