PSCP now uses the modern SFTP protocol if it can, and falls back to

[u/mdw/putty] / putty.h

diff --git a/putty.h b/putty.h
index cb77ac9..fce1ebc 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -1,6 +1,8 @@
 #ifndef PUTTY_PUTTY_H
 #define PUTTY_PUTTY_H
 
+#include <stdio.h>                    /* for FILENAME_MAX */
+
 #include "network.h"
 
 #define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
@@ -78,7 +80,7 @@
 #define ATTR_DEFAULT 0x00980000UL
 #define ATTR_DEFFG   0x00080000UL
 #define ATTR_DEFBG   0x00900000UL
-#define ERASE_CHAR   (ATTR_DEFAULT | ' ')
+#define ERASE_CHAR   (ATTR_DEFAULT | ATTR_ASCII | ' ')
 #define ATTR_MASK    0xFFFFFF00UL
 #define CHAR_MASK    0x000000FFUL
 
@@ -127,6 +129,7 @@ GLOBAL WCHAR unitab_font[256];
 GLOBAL WCHAR unitab_xterm[256];
 GLOBAL WCHAR unitab_oemcp[256];
 GLOBAL unsigned char unitab_ctrl[256];
+#define in_utf (utf || line_codepage==CP_UTF8)
 
 #define LGXF_OVR  1                   /* existing logfile overwrite */
 #define LGXF_APN  0                   /* existing logfile append */
@@ -173,6 +176,18 @@ typedef enum {
 
 enum {
     /*
+     * SSH ciphers (both SSH1 and SSH2)
+     */
+    CIPHER_WARN,                      /* pseudo 'cipher' */
+    CIPHER_3DES,
+    CIPHER_BLOWFISH,
+    CIPHER_AES,                               /* (SSH 2 only) */
+    CIPHER_DES,                               /* (SSH 1 only) */
+    CIPHER_MAX                        /* no. ciphers (inc warn) */
+};
+
+enum {
+    /*
      * Line discipline option states: off, on, up to the backend.
      */
     LD_YES, LD_NO, LD_BACKEND
@@ -197,12 +212,20 @@ enum {
 
 typedef struct {
     char *(*init) (char *host, int port, char **realhost);
-    void (*send) (char *buf, int len);
+    /* back->send() returns the current amount of buffered data. */
+    int (*send) (char *buf, int len);
+    /* back->sendbuffer() does the same thing but without attempting a send */
+    int (*sendbuffer) (void);
     void (*size) (void);
     void (*special) (Telnet_Special code);
-     Socket(*socket) (void);
+    Socket(*socket) (void);
     int (*sendok) (void);
     int (*ldisc) (int);
+    /*
+     * back->unthrottle() tells the back end that the front end
+     * buffer is clearing.
+     */
+    void (*unthrottle) (int);
     int default_port;
 } Backend;
 
@@ -224,17 +247,22 @@ typedef struct {
     int ping_interval;                /* in seconds */
     /* SSH options */
     char remote_cmd[512];
+    char remote_cmd2[512];            /* fallback if the first fails
+                                       * (used internally for scp) */
     char *remote_cmd_ptr;             /* might point to a larger command
                                        * but never for loading/saving */
+    char *remote_cmd_ptr2;            /* might point to a larger command
+                                       * but never for loading/saving */
     int nopty;
     int compression;
     int agentfwd;
-    enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES, CIPHER_AES } cipher;
+    int ssh_cipherlist[CIPHER_MAX];
     char keyfile[FILENAME_MAX];
     int sshprot;                      /* use v1 or v2 when both available */
     int buggymac;                     /* MAC bug commmercial <=v2.3.x SSH2 */
     int try_tis_auth;
     int ssh_subsys;                   /* run a subsystem rather than a command */
+    int ssh_subsys2;                  /* fallback to go with remote_cmd2 */
     /* Telnet options */
     char termtype[32];
     char termspeed[32];
@@ -312,6 +340,9 @@ typedef struct {
     /* X11 forwarding */
     int x11_forward;
     char x11_display[128];
+    /* port forwarding */
+    int lport_acceptall; /* accepts connection from hosts other than localhost */
+    char portfwd[1024]; /* [LR]localport\thost:port\000[LR]localport\thost:port\000\000 */
 } Config;
 
 /*
@@ -398,6 +429,7 @@ void showeventlog(HWND);
 void showabout(HWND);
 void verify_ssh_host_key(char *host, int port, char *keytype,
                         char *keystr, char *fingerprint);
+void askcipher(char *ciphername, int cs);
 int askappend(char *filename);
 void registry_cleanup(void);
 void force_normal(HWND hwnd);
@@ -432,7 +464,7 @@ void term_do_paste(void);
 void term_paste(void);
 void term_nopaste(void);
 int term_ldisc(int option);
-void from_backend(int is_stderr, char *data, int len);
+int from_backend(int is_stderr, char *data, int len);
 void logfopen(void);
 void logfclose(void);
 void term_copyall(void);
@@ -506,6 +538,7 @@ void lpage_send(int codepage, char *buf, int len);
 void luni_send(wchar_t * widebuf, int len);
 int check_compose(int first, int second);
 int decode_codepage(char *cp_name);
+char *cp_enumerate (int index);
 char *cp_name(int codepage);
 
 /*