#include <windows.h>
#include <stdio.h>
#include <stdlib.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
+#endif
#include "putty.h"
static SOCKET s = INVALID_SOCKET;
-#define iswritable(x) ( (x) != IAC && (x) != CR )
-
static void raw_size(void);
static int sb_opt, sb_len;
}
static void c_write (char *buf, int len) {
- while (len--) {
- int new_head = (inbuf_head + 1) & INBUF_MASK;
- if (new_head != inbuf_reap) {
- inbuf[inbuf_head] = *buf++;
- inbuf_head = new_head;
- } else {
- term_out();
- if( inbuf_head == inbuf_reap ) len++; else break;
- }
- }
+ from_backend(0, buf, len);
}
/*
default: return "connect(): unknown error";
}
- if (WSAAsyncSelect (s, hwnd, WM_NETEVENT, FD_READ |
+ if (hwnd && WSAAsyncSelect (s, hwnd, WM_NETEVENT, FD_READ |
FD_WRITE | FD_OOB | FD_CLOSE) == SOCKET_ERROR)
switch (WSAGetLastError()) {
case WSAENETDOWN: return "Network is down";
default: return "WSAAsyncSelect(): unknown error";
}
+ /*
+ * We have no pre-session phase.
+ */
+ begin_session();
+
return NULL;
}
* the queue; so it's possible that we can get here even with s
* invalid. If so, we return 1 and don't worry about it.
*/
- if (s == INVALID_SOCKET)
+ if (s == INVALID_SOCKET) {
+ closesocket(s);
+ s = INVALID_SOCKET;
return 1;
+ }
if (WSAGETSELECTERROR(lParam) != 0)
return -WSAGETSELECTERROR(lParam);
ret = recv(s, buf, sizeof(buf), 0);
if (ret < 0 && WSAGetLastError() == WSAEWOULDBLOCK)
return 1;
- if (ret < 0) /* any _other_ error */
+ if (ret < 0) { /* any _other_ error */
+ closesocket(s);
+ s = INVALID_SOCKET;
return -10000-WSAGetLastError();
+ }
if (ret == 0) {
s = INVALID_SOCKET;
return 0;
return;
}
+static SOCKET raw_socket(void) { return s; }
+
+static int raw_sendok(void) { return 1; }
+
Backend raw_backend = {
raw_init,
raw_msg,
raw_send,
raw_size,
- raw_special
+ raw_special,
+ raw_socket,
+ raw_sendok,
+ 1
};