mirror of
https://github.com/tmate-io/tmate.git
synced 2024-11-24 00:53:31 +01:00
d637cb33da
Make all messages sent between the client and server fixed size. This is the first of two changes to make the protocol more resilient and less sensitive to other changes in the code, particularly with commands. The client now packs argv into a buffer and sends it to the server for parsing, rather than doing it itself and sending the parsed command data. As a side-effect this also removes a lot of now-unused command marshalling code. Mixing a server without this change and a client with or vice versa will cause tmux to hang or crash, please ensure that tmux is entirely killed before upgrading.
77 lines
1.9 KiB
C
77 lines
1.9 KiB
C
/* $Id: client-fn.c,v 1.7 2009-07-28 22:12:16 tcunha Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
|
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "tmux.h"
|
|
|
|
void
|
|
client_fill_session(struct msg_command_data *data)
|
|
{
|
|
char *env, *ptr1, *ptr2, buf[256];
|
|
size_t len;
|
|
const char *errstr;
|
|
long long ll;
|
|
|
|
data->pid = -1;
|
|
if ((env = getenv("TMUX")) == NULL)
|
|
return;
|
|
|
|
if ((ptr2 = strrchr(env, ',')) == NULL || ptr2 == env)
|
|
return;
|
|
for (ptr1 = ptr2 - 1; ptr1 > env && *ptr1 != ','; ptr1--)
|
|
;
|
|
if (*ptr1 != ',')
|
|
return;
|
|
ptr1++;
|
|
ptr2++;
|
|
|
|
len = ptr2 - ptr1 - 1;
|
|
if (len > (sizeof buf) - 1)
|
|
return;
|
|
memcpy(buf, ptr1, len);
|
|
buf[len] = '\0';
|
|
|
|
ll = strtonum(buf, 0, LONG_MAX, &errstr);
|
|
if (errstr != NULL)
|
|
return;
|
|
data->pid = ll;
|
|
|
|
ll = strtonum(ptr2, 0, UINT_MAX, &errstr);
|
|
if (errstr != NULL)
|
|
return;
|
|
data->idx = ll;
|
|
}
|
|
|
|
void
|
|
client_write_server(
|
|
struct client_ctx *cctx, enum hdrtype type, void *buf, size_t len)
|
|
{
|
|
struct hdr hdr;
|
|
|
|
hdr.type = type;
|
|
hdr.size = len;
|
|
buffer_write(cctx->srv_out, &hdr, sizeof hdr);
|
|
|
|
if (buf != NULL && len > 0)
|
|
buffer_write(cctx->srv_out, buf, len);
|
|
}
|