comparison chansession.h @ 579:8c737cd7c1af

merge of '48fdaa8706d1acda35e9d564adc9a1fbc96c18c8' and '658fd03abd21e0da7c4c89b9fff9dc693c72daae'
author Matt Johnston <matt@ucc.asn.au>
date Sat, 27 Feb 2010 11:53:18 +0000
parents 6f472dc54da7
children 818108bf7749
comparison
equal deleted inserted replaced
577:69e98c45db7c 579:8c737cd7c1af
48 unsigned char * tty; 48 unsigned char * tty;
49 unsigned char * term; 49 unsigned char * term;
50 50
51 /* exit details */ 51 /* exit details */
52 struct exitinfo exit; 52 struct exitinfo exit;
53
54 /* Used to set $SSH_CONNECTION in the child session.
55 Is only set temporarily before forking */
56 char *connection_string;
53 57
54 #ifndef DISABLE_X11FWD 58 #ifndef DISABLE_X11FWD
55 struct Listener * x11listener; 59 struct Listener * x11listener;
56 int x11port; 60 int x11port;
57 char * x11authprot; 61 char * x11authprot;
58 char * x11authcookie; 62 char * x11authcookie;
59 unsigned int x11screennum; 63 unsigned int x11screennum;
60 unsigned char x11singleconn; 64 unsigned char x11singleconn;
61 #endif 65 #endif
62 66
63 #ifndef DISABLE_AGENTFWD 67 #ifdef ENABLE_SVR_AGENTFWD
64 struct Listener * agentlistener; 68 struct Listener * agentlistener;
65 char * agentfile; 69 char * agentfile;
66 char * agentdir; 70 char * agentdir;
67 #endif 71 #endif
68 }; 72 };
79 void cli_tty_cleanup(); 83 void cli_tty_cleanup();
80 void cli_chansess_winchange(); 84 void cli_chansess_winchange();
81 #ifdef ENABLE_CLI_NETCAT 85 #ifdef ENABLE_CLI_NETCAT
82 void cli_send_netcat_request(); 86 void cli_send_netcat_request();
83 #endif 87 #endif
88 void cli_start_send_channel_request(struct Channel *channel, unsigned char *type);
84 89
85 void svr_chansessinitialise(); 90 void svr_chansessinitialise();
86 extern const struct ChanType svrchansess; 91 extern const struct ChanType svrchansess;
87 92
88 struct SigMap { 93 struct SigMap {