~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Retired the #ifdef DUMP_PACKETS stuff in ssh.c because I'm utterly
[sgt/putty]
/
putty.h
diff --git
a/putty.h
b/putty.h
index
cee5ae9
..
27a6564
100644
(file)
--- a/
putty.h
+++ b/
putty.h
@@
-109,6
+109,9
@@
GLOBAL int session_closed;
GLOBAL int big_cursor;
GLOBAL int big_cursor;
+GLOBAL char *help_path;
+GLOBAL int help_has_contents;
+
GLOBAL int utf;
GLOBAL int dbcs_screenfont;
GLOBAL int font_codepage;
GLOBAL int utf;
GLOBAL int dbcs_screenfont;
GLOBAL int font_codepage;
@@
-127,7
+130,8
@@
GLOBAL unsigned char unitab_ctrl[256];
#define LGXF_ASK -1 /* existing logfile ask */
#define LGTYP_NONE 0 /* logmode: no logging */
#define LGTYP_ASCII 1 /* logmode: pure ascii */
#define LGXF_ASK -1 /* existing logfile ask */
#define LGTYP_NONE 0 /* logmode: no logging */
#define LGTYP_ASCII 1 /* logmode: pure ascii */
-#define LGTYP_DEBUG 2 /* logmode: all chars of taffic */
+#define LGTYP_DEBUG 2 /* logmode: all chars of traffic */
+#define LGTYP_PACKETS 3 /* logmode: SSH data packets */
GLOBAL char *logfile;
/*
GLOBAL char *logfile;
/*
@@
-202,7
+206,7
@@
enum {
};
typedef struct {
};
typedef struct {
- char *(*init) (char *host, int port, char **realhost);
+ char *(*init) (char *host, int port, char **realhost
, int nodelay
);
/* 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 */
/* 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 */
@@
-236,6
+240,7
@@
typedef struct {
int close_on_exit;
int warn_on_close;
int ping_interval; /* in seconds */
int close_on_exit;
int warn_on_close;
int ping_interval; /* in seconds */
+ int tcp_nodelay;
/* SSH options */
char remote_cmd[512];
char remote_cmd2[512]; /* fallback if the first fails
/* SSH options */
char remote_cmd[512];
char remote_cmd2[512]; /* fallback if the first fails
@@
-247,11
+252,14
@@
typedef struct {
int nopty;
int compression;
int agentfwd;
int nopty;
int compression;
int agentfwd;
+ int change_username; /* allow username switching in SSH2 */
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 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 ssh2_des_cbc; /* "des-cbc" nonstandard SSH2 cipher */
int try_tis_auth;
int try_tis_auth;
+ int try_ki_auth;
int ssh_subsys; /* run a subsystem rather than a command */
int ssh_subsys2; /* fallback to go with remote_cmd2 */
/* Telnet options */
int ssh_subsys; /* run a subsystem rather than a command */
int ssh_subsys2; /* fallback to go with remote_cmd2 */
/* Telnet options */
@@
-479,6
+487,13
@@
void logfclose(void);
void term_copyall(void);
/*
void term_copyall(void);
/*
+ * Exports from logging.c.
+ */
+void logtraffic(unsigned char c, int logmode);
+enum { PKT_INCOMING, PKT_OUTGOING };
+void log_packet(int direction, int type, char *texttype, void *data, int len);
+
+/*
* Exports from raw.c.
*/
* Exports from raw.c.
*/