comparison chansession.h @ 1342:8747c2b19152

merge 2017.75
author Matt Johnston <matt@ucc.asn.au>
date Thu, 18 May 2017 22:59:38 +0800
parents 750ec4ec4cbe
children 0c16b4ccbd54
comparison
equal deleted inserted replaced
1341:ab35a9ccc2eb 1342:8747c2b19152
56 /* Used to set $SSH_CONNECTION in the child session. */ 56 /* Used to set $SSH_CONNECTION in the child session. */
57 char *connection_string; 57 char *connection_string;
58 /* Used to set $SSH_CLIENT in the child session. */ 58 /* Used to set $SSH_CLIENT in the child session. */
59 char *client_string; 59 char *client_string;
60 60
61 #ifndef DISABLE_X11FWD 61 #if DROPBEAR_X11FWD
62 struct Listener * x11listener; 62 struct Listener * x11listener;
63 int x11port; 63 int x11port;
64 char * x11authprot; 64 char * x11authprot;
65 char * x11authcookie; 65 char * x11authcookie;
66 unsigned int x11screennum; 66 unsigned int x11screennum;
67 unsigned char x11singleconn; 67 unsigned char x11singleconn;
68 #endif 68 #endif
69 69
70 #ifdef ENABLE_SVR_AGENTFWD 70 #if DROPBEAR_SVR_AGENTFWD
71 struct Listener * agentlistener; 71 struct Listener * agentlistener;
72 char * agentfile; 72 char * agentfile;
73 char * agentdir; 73 char * agentdir;
74 #endif 74 #endif
75 75
76 #ifdef ENABLE_SVR_PUBKEY_OPTIONS 76 #if DROPBEAR_SVR_PUBKEY_OPTIONS_BUILT
77 char *original_command; 77 char *original_command;
78 #endif 78 #endif
79 }; 79 };
80 80
81 struct ChildPid { 81 struct ChildPid {
87 void addnewvar(const char* param, const char* var); 87 void addnewvar(const char* param, const char* var);
88 88
89 void cli_send_chansess_request(void); 89 void cli_send_chansess_request(void);
90 void cli_tty_cleanup(void); 90 void cli_tty_cleanup(void);
91 void cli_chansess_winchange(void); 91 void cli_chansess_winchange(void);
92 #ifdef ENABLE_CLI_NETCAT 92 #if DROPBEAR_CLI_NETCAT
93 void cli_send_netcat_request(void); 93 void cli_send_netcat_request(void);
94 #endif 94 #endif
95 95
96 void svr_chansessinitialise(void); 96 void svr_chansessinitialise(void);
97 extern const struct ChanType svrchansess; 97 extern const struct ChanType svrchansess;