projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable better build-time flexibility over which WinSock to include
[u/mdw/putty]
/
ssh.c
diff --git
a/ssh.c
b/ssh.c
index
fddb68d
..
97c6839
100644
(file)
--- a/
ssh.c
+++ b/
ssh.c
@@
-2,7
+2,13
@@
#include <stdlib.h>
#include <stdarg.h>
#include <assert.h>
#include <stdlib.h>
#include <stdarg.h>
#include <assert.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
#include <winsock.h>
#include <winsock.h>
+#endif
+#endif
#include "putty.h"
#include "tree234.h"
#include "putty.h"
#include "tree234.h"
@@
-1628,6
+1634,7
@@
static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) {
ssh_send_ok = 1;
ssh_channels = newtree234(ssh_channelcmp);
ssh_send_ok = 1;
ssh_channels = newtree234(ssh_channelcmp);
+ begin_session();
while (1) {
crReturnV;
if (ispkt) {
while (1) {
crReturnV;
if (ispkt) {
@@
-2335,6
+2342,7
@@
static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
* Transfer data!
*/
ssh_send_ok = 1;
* Transfer data!
*/
ssh_send_ok = 1;
+ begin_session();
while (1) {
static int try_send;
crReturnV;
while (1) {
static int try_send;
crReturnV;