90164c34a9
- Update the Agent to use separate control and data pipes and to receive arbitrary-sized packets. Handle child process creation in the agent. - Fix bugs in libpconsole: - Insert a space between the pipe names on the agent command line. - Don't close the desktop and window station until after connecting to the agent's pipes. - Change the format of the pconsole_start_process env parameter from an array of wide-character-string pointers to a single contiguous block of memory, like that accepted by CreateProcess.
255 lines
6.3 KiB
C++
255 lines
6.3 KiB
C++
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <termios.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/select.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <pconsole.h>
|
|
#include "../Shared/DebugClient.h"
|
|
|
|
|
|
static int signalWriteFd;
|
|
|
|
|
|
// Put the input terminal into non-blocking non-canonical mode.
|
|
static termios setRawTerminalMode()
|
|
{
|
|
if (!isatty(STDIN_FILENO)) {
|
|
fprintf(stderr, "input is not a tty\n");
|
|
exit(1);
|
|
}
|
|
if (!isatty(STDOUT_FILENO)) {
|
|
fprintf(stderr, "output is not a tty\n");
|
|
exit(1);
|
|
}
|
|
|
|
/*
|
|
// This code makes the terminal output non-blocking.
|
|
int flags = fcntl(STDOUT_FILENO, F_GETFL, 0);
|
|
if (flags == -1) {
|
|
perror("fcntl F_GETFL on stdout failed");
|
|
exit(1);
|
|
}
|
|
if (fcntl(STDOUT_FILENO, F_SETFL, flags | O_NONBLOCK) == -1) {
|
|
perror("fcntl F_SETFL on stdout failed");
|
|
exit(1);
|
|
}
|
|
*/
|
|
|
|
termios buf;
|
|
if (tcgetattr(STDIN_FILENO, &buf) < 0) {
|
|
perror("tcgetattr failed");
|
|
exit(1);
|
|
}
|
|
termios saved = buf;
|
|
buf.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG);
|
|
buf.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON);
|
|
buf.c_cflag &= ~(CSIZE | PARENB);
|
|
buf.c_cflag |= CS8;
|
|
buf.c_oflag &= ~OPOST;
|
|
buf.c_cc[VMIN] = 1; // blocking read
|
|
buf.c_cc[VTIME] = 0;
|
|
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &buf) < 0) {
|
|
fprintf(stderr, "tcsetattr failed\n");
|
|
exit(1);
|
|
}
|
|
return saved;
|
|
}
|
|
|
|
static void restoreTerminalMode(termios original)
|
|
{
|
|
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &original) < 0) {
|
|
perror("error restoring terminal mode");
|
|
exit(1);
|
|
}
|
|
}
|
|
|
|
static void writeToSignalFd()
|
|
{
|
|
char dummy = 0;
|
|
write(signalWriteFd, &dummy, 1);
|
|
}
|
|
|
|
static void terminalResized(int signo)
|
|
{
|
|
writeToSignalFd();
|
|
}
|
|
|
|
// Create a manual reset, initially unset event.
|
|
static HANDLE createEvent()
|
|
{
|
|
return CreateEvent(NULL, TRUE, FALSE, NULL);
|
|
}
|
|
|
|
|
|
// Connect pconsole overlapped I/O to Cygwin blocking STDOUT_FILENO.
|
|
class OutputHandler {
|
|
public:
|
|
OutputHandler(HANDLE pconsole);
|
|
pthread_t getThread() { return thread; }
|
|
private:
|
|
static void *threadProc(void *pvthis);
|
|
HANDLE pconsole;
|
|
pthread_t thread;
|
|
};
|
|
|
|
OutputHandler::OutputHandler(HANDLE pconsole) : pconsole(pconsole)
|
|
{
|
|
pthread_create(&thread, NULL, OutputHandler::threadProc, this);
|
|
}
|
|
|
|
// TODO: See whether we can make the pipe non-overlapped if we still use
|
|
// an OVERLAPPED structure in the ReadFile/WriteFile calls.
|
|
void *OutputHandler::threadProc(void *pvthis)
|
|
{
|
|
OutputHandler *pthis = (OutputHandler*)pvthis;
|
|
HANDLE event = createEvent();
|
|
OVERLAPPED over;
|
|
const int bufferSize = 4096;
|
|
char *buffer = new char[bufferSize];
|
|
while (true) {
|
|
DWORD amount;
|
|
memset(&over, 0, sizeof(over));
|
|
over.hEvent = event;
|
|
BOOL ret = ReadFile(pthis->pconsole,
|
|
buffer, bufferSize,
|
|
&amount,
|
|
&over);
|
|
if (!ret && GetLastError() == ERROR_IO_PENDING)
|
|
ret = GetOverlappedResult(pthis->pconsole, &over, &amount, TRUE);
|
|
if (!ret || amount == 0)
|
|
break;
|
|
// TODO: partial writes?
|
|
int written = write(STDOUT_FILENO, buffer, amount);
|
|
if (written != amount)
|
|
break;
|
|
}
|
|
delete [] buffer;
|
|
CloseHandle(event);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
// Connect Cygwin non-blocking STDIN_FILENO to pconsole overlapped I/O.
|
|
class InputHandler {
|
|
public:
|
|
InputHandler(HANDLE pconsole);
|
|
pthread_t getThread() { return thread; }
|
|
private:
|
|
static void *threadProc(void *pvthis);
|
|
HANDLE pconsole;
|
|
pthread_t thread;
|
|
};
|
|
|
|
InputHandler::InputHandler(HANDLE pconsole) : pconsole(pconsole)
|
|
{
|
|
pthread_create(&thread, NULL, InputHandler::threadProc, this);
|
|
}
|
|
|
|
void *InputHandler::threadProc(void *pvthis)
|
|
{
|
|
InputHandler *pthis = (InputHandler*)pvthis;
|
|
HANDLE event = createEvent();
|
|
const int bufferSize = 4096;
|
|
char *buffer = new char[bufferSize];
|
|
while (true) {
|
|
int amount = read(STDIN_FILENO, buffer, bufferSize);
|
|
if (amount <= 0)
|
|
break;
|
|
DWORD written;
|
|
OVERLAPPED over;
|
|
memset(&over, 0, sizeof(over));
|
|
over.hEvent = event;
|
|
BOOL ret = WriteFile(pthis->pconsole,
|
|
buffer, amount,
|
|
&written,
|
|
&over);
|
|
if (!ret && GetLastError() == ERROR_IO_PENDING)
|
|
ret = GetOverlappedResult(pthis->pconsole, &over, &written, TRUE);
|
|
// TODO: partial writes?
|
|
if (!ret || written != amount)
|
|
break;
|
|
}
|
|
delete [] buffer;
|
|
CloseHandle(event);
|
|
return NULL;
|
|
}
|
|
|
|
|
|
int main()
|
|
{
|
|
winsize sz;
|
|
ioctl(STDIN_FILENO, TIOCGWINSZ, &sz);
|
|
|
|
pconsole_t *pconsole = pconsole_open(sz.ws_col, sz.ws_row);
|
|
if (pconsole == NULL) {
|
|
fprintf(stderr, "Error creating pconsole.\n");
|
|
exit(1);
|
|
}
|
|
|
|
// TODO: start the appropriate child process...
|
|
pconsole_start_process(pconsole, L"c:\\cygwin\\bin\\bash.exe", NULL, NULL, NULL);
|
|
|
|
{
|
|
struct sigaction resizeSigAct;
|
|
memset(&resizeSigAct, 0, sizeof(resizeSigAct));
|
|
resizeSigAct.sa_handler = terminalResized;
|
|
resizeSigAct.sa_flags = SA_RESTART;
|
|
sigaction(SIGWINCH, &resizeSigAct, NULL);
|
|
}
|
|
|
|
termios mode = setRawTerminalMode();
|
|
int signalReadFd;
|
|
|
|
{
|
|
int pipeFd[2];
|
|
if (pipe2(pipeFd, O_NONBLOCK) != 0) {
|
|
perror("Could not create pipe");
|
|
exit(1);
|
|
}
|
|
signalReadFd = pipeFd[0];
|
|
signalWriteFd = pipeFd[1];
|
|
}
|
|
|
|
OutputHandler outputHandler(pconsole_get_data_pipe(pconsole));
|
|
InputHandler inputHandler(pconsole_get_data_pipe(pconsole));
|
|
|
|
while (true) {
|
|
fd_set readfds;
|
|
FD_ZERO(&readfds);
|
|
FD_SET(signalReadFd, &readfds);
|
|
if (select(signalReadFd + 1, &readfds, NULL, NULL, NULL) < 0) {
|
|
perror("select failed");
|
|
exit(1);
|
|
}
|
|
|
|
// Check for terminal resize.
|
|
{
|
|
winsize sz2;
|
|
ioctl(STDIN_FILENO, TIOCGWINSZ, &sz2);
|
|
if (memcmp(&sz, &sz2, sizeof(sz)) != 0) {
|
|
sz = sz2;
|
|
pconsole_set_size(pconsole, sz.ws_col, sz.ws_row);
|
|
}
|
|
}
|
|
|
|
// Discard any data in the signal pipe.
|
|
char tmpBuf[256];
|
|
int amount = read(signalReadFd, tmpBuf, sizeof(tmpBuf));
|
|
if (amount == 0 || amount < 0 && errno != EAGAIN) {
|
|
perror("error reading internal signal fd");
|
|
exit(1);
|
|
}
|
|
}
|
|
|
|
// TODO: Get the pconsole child exit code and exit with it.
|
|
|
|
restoreTerminalMode(mode);
|
|
return 0;
|
|
}
|