circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Instead of using large buffers in imsgs, add the data or path onto the end.

pull/2020/head
nicm 2019-12-16 15:48:50 +00:00
parent 21f9b39f06
commit eaa58d28dc
4 changed files with 73 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
client.c
View File

@ -486,14 +486,19 @@ static void
client_write_open(void *data, size_t datalen) client_write_open(void *data, size_t datalen)
{ {
struct msg_write_open *msg = data; struct msg_write_open *msg = data;
const char *path;
struct msg_write_ready reply; struct msg_write_ready reply;
struct client_file find, *cf; struct client_file find, *cf;
const int flags = O_NONBLOCK|O_WRONLY|O_CREAT; const int flags = O_NONBLOCK|O_WRONLY|O_CREAT;
int error = 0; int error = 0;
if (datalen != sizeof *msg) if (datalen < sizeof *msg)
fatalx("bad MSG_WRITE_OPEN size"); fatalx("bad MSG_WRITE_OPEN size");
log_debug("open write file %d %s", msg->stream, msg->path); if (datalen == sizeof *msg)
path = "-";
else
path = (const char *)(msg + 1);
log_debug("open write file %d %s", msg->stream, path);
find.stream = msg->stream; find.stream = msg->stream;
if ((cf = RB_FIND(client_files, &client_files, &find)) == NULL) { if ((cf = RB_FIND(client_files, &client_files, &find)) == NULL) {
@ -510,7 +515,7 @@ client_write_open(void *data, size_t datalen)
cf->fd = -1; cf->fd = -1;
if (msg->fd == -1) if (msg->fd == -1)
cf->fd = open(msg->path, msg->flags|flags, 0644); cf->fd = open(path, msg->flags|flags, 0644);
else { else {
if (msg->fd != STDOUT_FILENO && msg->fd != STDERR_FILENO) if (msg->fd != STDOUT_FILENO && msg->fd != STDERR_FILENO)
errno = EBADF; errno = EBADF;
@ -542,16 +547,17 @@ client_write_data(void *data, size_t datalen)
{ {
struct msg_write_data *msg = data; struct msg_write_data *msg = data;
struct client_file find, *cf; struct client_file find, *cf;
size_t size = datalen - sizeof *msg;
if (datalen != sizeof *msg) if (datalen < sizeof *msg)
fatalx("bad MSG_WRITE size"); fatalx("bad MSG_WRITE size");
find.stream = msg->stream; find.stream = msg->stream;
if ((cf = RB_FIND(client_files, &client_files, &find)) == NULL) if ((cf = RB_FIND(client_files, &client_files, &find)) == NULL)
fatalx("unknown stream number"); fatalx("unknown stream number");
log_debug("write %zu to file %d", msg->size, cf->stream); log_debug("write %zu to file %d", size, cf->stream);
if (cf->event != NULL) if (cf->event != NULL)
bufferevent_write(cf->event, msg->data, msg->size); bufferevent_write(cf->event, msg + 1, size);
} }
/* Close client file. */ /* Close client file. */
@ -585,26 +591,29 @@ client_read_callback(__unused struct bufferevent *bev, void *arg)
struct client_file *cf = arg; struct client_file *cf = arg;
void *bdata; void *bdata;
size_t bsize; size_t bsize;
struct msg_read_data msg; struct msg_read_data *msg;
size_t msglen;
msg = xmalloc(sizeof *msg);
for (;;) { for (;;) {
bdata = EVBUFFER_DATA(cf->event->input); bdata = EVBUFFER_DATA(cf->event->input);
bsize = EVBUFFER_LENGTH(cf->event->input); bsize = EVBUFFER_LENGTH(cf->event->input);
if (bsize == 0) if (bsize == 0)
break; break;
if (bsize > sizeof msg.data) if (bsize > MAX_IMSGSIZE - IMSG_HEADER_SIZE)
bsize = sizeof msg.data; bsize = MAX_IMSGSIZE - IMSG_HEADER_SIZE;
log_debug("read %zu from file %d", bsize, cf->stream); log_debug("read %zu from file %d", bsize, cf->stream);
memcpy(msg.data, bdata, bsize); msglen = (sizeof *msg) + bsize;
msg.size = bsize; msg = xrealloc(msg, msglen);
msg->stream = cf->stream;
msg.stream = cf->stream; memcpy(msg + 1, bdata, bsize);
proc_send(client_peer, MSG_READ, -1, &msg, sizeof msg); proc_send(client_peer, MSG_READ, -1, msg, msglen);
evbuffer_drain(cf->event->input, bsize); evbuffer_drain(cf->event->input, bsize);
} }
free(msg);
} }
/* File read error callback. */ /* File read error callback. */
@ -632,14 +641,19 @@ static void
client_read_open(void *data, size_t datalen) client_read_open(void *data, size_t datalen)
{ {
struct msg_read_open *msg = data; struct msg_read_open *msg = data;
const char *path;
struct msg_read_done reply; struct msg_read_done reply;
struct client_file find, *cf; struct client_file find, *cf;
const int flags = O_NONBLOCK|O_RDONLY; const int flags = O_NONBLOCK|O_RDONLY;
int error = 0; int error = 0;
if (datalen != sizeof *msg) if (datalen < sizeof *msg)
fatalx("bad MSG_READ_OPEN size"); fatalx("bad MSG_READ_OPEN size");
log_debug("open read file %d %s", msg->stream, msg->path); if (datalen == sizeof *msg)
path = "-";
else
path = (const char *)(msg + 1);
log_debug("open read file %d %s", msg->stream, path);
find.stream = msg->stream; find.stream = msg->stream;
if ((cf = RB_FIND(client_files, &client_files, &find)) == NULL) { if ((cf = RB_FIND(client_files, &client_files, &find)) == NULL) {
@ -656,7 +670,7 @@ client_read_open(void *data, size_t datalen)
cf->fd = -1; cf->fd = -1;
if (msg->fd == -1) if (msg->fd == -1)
cf->fd = open(msg->path, flags); cf->fd = open(path, flags);
else { else {
if (msg->fd != STDIN_FILENO) if (msg->fd != STDIN_FILENO)
errno = EBADF; errno = EBADF;

59
file.c
View File

@ -17,9 +17,11 @@
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <sys/queue.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <imsg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -147,7 +149,6 @@ file_vprint(struct client *c, const char *fmt, va_list ap)
msg.stream = 1; msg.stream = 1;
msg.fd = STDOUT_FILENO; msg.fd = STDOUT_FILENO;
msg.flags = 0; msg.flags = 0;
strlcpy(msg.path, "-", sizeof msg.path);
proc_send(c->peer, MSG_WRITE_OPEN, -1, &msg, sizeof msg); proc_send(c->peer, MSG_WRITE_OPEN, -1, &msg, sizeof msg);
} else { } else {
evbuffer_add_vprintf(cf->buffer, fmt, ap); evbuffer_add_vprintf(cf->buffer, fmt, ap);
@ -174,7 +175,6 @@ file_print_buffer(struct client *c, void *data, size_t size)
msg.stream = 1; msg.stream = 1;
msg.fd = STDOUT_FILENO; msg.fd = STDOUT_FILENO;
msg.flags = 0; msg.flags = 0;
strlcpy(msg.path, "-", sizeof msg.path);
proc_send(c->peer, MSG_WRITE_OPEN, -1, &msg, sizeof msg); proc_send(c->peer, MSG_WRITE_OPEN, -1, &msg, sizeof msg);
} else { } else {
evbuffer_add(cf->buffer, data, size); evbuffer_add(cf->buffer, data, size);
@ -204,7 +204,6 @@ file_error(struct client *c, const char *fmt, ...)
msg.stream = 2; msg.stream = 2;
msg.fd = STDERR_FILENO; msg.fd = STDERR_FILENO;
msg.flags = 0; msg.flags = 0;
strlcpy(msg.path, "-", sizeof msg.path);
proc_send(c->peer, MSG_WRITE_OPEN, -1, &msg, sizeof msg); proc_send(c->peer, MSG_WRITE_OPEN, -1, &msg, sizeof msg);
} else { } else {
evbuffer_add_vprintf(cf->buffer, fmt, ap); evbuffer_add_vprintf(cf->buffer, fmt, ap);
@ -220,7 +219,8 @@ file_write(struct client *c, const char *path, int flags, const void *bdata,
{ {
struct client_file *cf; struct client_file *cf;
FILE *f; FILE *f;
struct msg_write_open msg; struct msg_write_open *msg;
size_t msglen;
int fd = -1; int fd = -1;
const char *mode; const char *mode;
@ -261,17 +261,22 @@ file_write(struct client *c, const char *path, int flags, const void *bdata,
skip: skip:
evbuffer_add(cf->buffer, bdata, bsize); evbuffer_add(cf->buffer, bdata, bsize);
msg.stream = cf->stream; msglen = strlen(cf->path) + 1 + sizeof *msg;
msg.fd = fd; if (msglen > MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
msg.flags = flags;
if (strlcpy(msg.path, cf->path, sizeof msg.path) >= sizeof msg.path) {
cf->error = E2BIG; cf->error = E2BIG;
goto done; goto done;
} }
if (proc_send(c->peer, MSG_WRITE_OPEN, -1, &msg, sizeof msg) != 0) { msg = xmalloc(msglen);
msg->stream = cf->stream;
msg->fd = fd;
msg->flags = flags;
memcpy(msg + 1, cf->path, msglen - sizeof *msg);
if (proc_send(c->peer, MSG_WRITE_OPEN, -1, msg, msglen) != 0) {
free(msg);
cf->error = EINVAL; cf->error = EINVAL;
goto done; goto done;
} }
free(msg);
return; return;
done: done:
@ -283,10 +288,10 @@ file_read(struct client *c, const char *path, client_file_cb cb, void *cbdata)
{ {
struct client_file *cf; struct client_file *cf;
FILE *f; FILE *f;
struct msg_read_open msg; struct msg_read_open *msg;
size_t msglen, size;
int fd = -1; int fd = -1;
char buffer[BUFSIZ]; char buffer[BUFSIZ];
size_t size;
if (strcmp(path, "-") == 0) { if (strcmp(path, "-") == 0) {
cf = file_create(c, file_next_stream++, cb, cbdata); cf = file_create(c, file_next_stream++, cb, cbdata);
@ -327,16 +332,21 @@ file_read(struct client *c, const char *path, client_file_cb cb, void *cbdata)
} }
skip: skip:
msg.stream = cf->stream; msglen = strlen(cf->path) + 1 + sizeof *msg;
msg.fd = fd; if (msglen > MAX_IMSGSIZE - IMSG_HEADER_SIZE) {
if (strlcpy(msg.path, cf->path, sizeof msg.path) >= sizeof msg.path) {
cf->error = E2BIG; cf->error = E2BIG;
goto done; goto done;
} }
if (proc_send(c->peer, MSG_READ_OPEN, -1, &msg, sizeof msg) != 0) { msg = xmalloc(msglen);
msg->stream = cf->stream;
msg->fd = fd;
memcpy(msg + 1, cf->path, msglen - sizeof *msg);
if (proc_send(c->peer, MSG_READ_OPEN, -1, msg, msglen) != 0) {
free(msg);
cf->error = EINVAL; cf->error = EINVAL;
goto done; goto done;
} }
free(msg);
return; return;
done: done:
@ -358,20 +368,22 @@ void
file_push(struct client_file *cf) file_push(struct client_file *cf)
{ {
struct client *c = cf->c; struct client *c = cf->c;
struct msg_write_data msg; struct msg_write_data *msg;
size_t msglen, sent, left;
struct msg_write_close close; struct msg_write_close close;
size_t sent, left;
msg = xmalloc(sizeof *msg);
left = EVBUFFER_LENGTH(cf->buffer); left = EVBUFFER_LENGTH(cf->buffer);
while (left != 0) { while (left != 0) {
sent = left; sent = left;
if (sent > sizeof msg.data) if (sent > MAX_IMSGSIZE - IMSG_HEADER_SIZE)
sent = sizeof msg.data; sent = MAX_IMSGSIZE - IMSG_HEADER_SIZE;
memcpy(msg.data, EVBUFFER_DATA(cf->buffer), sent);
msg.size = sent;
msg.stream = cf->stream; msglen = (sizeof *msg) + sent;
if (proc_send(c->peer, MSG_WRITE, -1, &msg, sizeof msg) != 0) msg = xrealloc(msg, msglen);
msg->stream = cf->stream;
memcpy(msg + 1, EVBUFFER_DATA(cf->buffer), sent);
if (proc_send(c->peer, MSG_WRITE, -1, msg, msglen) != 0)
break; break;
evbuffer_drain(cf->buffer, sent); evbuffer_drain(cf->buffer, sent);
@ -387,4 +399,5 @@ file_push(struct client_file *cf)
proc_send(c->peer, MSG_WRITE_CLOSE, -1, &close, sizeof close); proc_send(c->peer, MSG_WRITE_CLOSE, -1, &close, sizeof close);
file_fire_done(cf); file_fire_done(cf);
} }
free(msg);
} }

6
server-client.c
View File

@ -2024,10 +2024,10 @@ server_client_dispatch_read_data(struct client *c, struct imsg *imsg)
struct msg_read_data *msg = imsg->data; struct msg_read_data *msg = imsg->data;
size_t msglen = imsg->hdr.len - IMSG_HEADER_SIZE; size_t msglen = imsg->hdr.len - IMSG_HEADER_SIZE;
struct client_file find, *cf; struct client_file find, *cf;
void *bdata = msg->data; void *bdata = msg + 1;
size_t bsize = msg->size; size_t bsize = msglen - sizeof *msg;
if (msglen != sizeof *msg) if (msglen < sizeof *msg)
fatalx("bad MSG_READ_DATA size"); fatalx("bad MSG_READ_DATA size");
find.stream = msg->stream; find.stream = msg->stream;
if ((cf = RB_FIND(client_files, &c->files, &find)) == NULL) if ((cf = RB_FIND(client_files, &c->files, &find)) == NULL)

12
tmux.h
View File

@ -507,13 +507,10 @@ struct msg_command {
struct msg_read_open { struct msg_read_open {
int stream; int stream;
int fd; int fd;
char path[PATH_MAX]; }; /* followed by path */
};
struct msg_read_data { struct msg_read_data {
int stream; int stream;
size_t size;
char data[BUFSIZ];
}; };
struct msg_read_done { struct msg_read_done {
@ -524,15 +521,12 @@ struct msg_read_done {
struct msg_write_open { struct msg_write_open {
int stream; int stream;
int fd; int fd;
char path[PATH_MAX];
int flags; int flags;
}; }; /* followed by path */
struct msg_write_data { struct msg_write_data {
int stream; int stream;
size_t size; }; /* followed by data */
char data[BUFSIZ];
};
struct msg_write_ready { struct msg_write_ready {
int stream; int stream;