projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Jacob's TIS / CCard authentication tweaks.
[u/mdw/putty]
/
putty.h
diff --git
a/putty.h
b/putty.h
index
3fbde4e
..
39dfc94
100644
(file)
--- a/
putty.h
+++ b/
putty.h
@@
-1,6
+1,8
@@
#ifndef PUTTY_PUTTY_H
#define PUTTY_PUTTY_H
#ifndef PUTTY_PUTTY_H
#define PUTTY_PUTTY_H
+#include <stdio.h> /* for FILENAME_MAX */
+
#include "network.h"
#define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
#include "network.h"
#define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
@@
-174,6
+176,18
@@
typedef enum {
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
* Line discipline option states: off, on, up to the backend.
*/
LD_YES, LD_NO, LD_BACKEND
@@
-198,12
+212,20
@@
enum {
typedef struct {
char *(*init) (char *host, int port, char **realhost);
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);
void (*size) (void);
void (*special) (Telnet_Special code);
-
Socket(*socket) (void);
+ Socket(*socket) (void);
int (*sendok) (void);
int (*ldisc) (int);
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;
int default_port;
} Backend;
@@
-225,17
+247,22
@@
typedef struct {
int ping_interval; /* in seconds */
/* SSH options */
char remote_cmd[512];
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_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;
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 */
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];
/* Telnet options */
char termtype[32];
char termspeed[32];
@@
-306,6
+333,7
@@
typedef struct {
/* Selection options */
int mouse_is_xterm;
int rawcnp;
/* Selection options */
int mouse_is_xterm;
int rawcnp;
+ int mouse_override;
short wordness[256];
/* translations */
VT_Mode vtmode;
short wordness[256];
/* translations */
VT_Mode vtmode;
@@
-313,6
+341,9
@@
typedef struct {
/* X11 forwarding */
int x11_forward;
char x11_display[128];
/* 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;
/*
} Config;
/*
@@
-399,6
+430,7
@@
void showeventlog(HWND);
void showabout(HWND);
void verify_ssh_host_key(char *host, int port, char *keytype,
char *keystr, char *fingerprint);
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);
int askappend(char *filename);
void registry_cleanup(void);
void force_normal(HWND hwnd);
@@
-433,7
+465,7
@@
void term_do_paste(void);
void term_paste(void);
void term_nopaste(void);
int term_ldisc(int option);
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);
void logfopen(void);
void logfclose(void);
void term_copyall(void);
@@
-507,6
+539,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);
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);
/*
char *cp_name(int codepage);
/*
@@
-523,5
+556,11
@@
void crypto_wrapup();
void agent_query(void *in, int inlen, void **out, int *outlen);
int agent_exists(void);
void agent_query(void *in, int inlen, void **out, int *outlen);
int agent_exists(void);
+/*
+ * Exports from wildcard.c
+ */
+const char *wc_error(int value);
+int wc_match(const char *wildcard, const char *target);
+int wc_unescape(char *output, const char *wildcard);
#endif
#endif