- jmc@cvs.openbsd.org 2010/01/13 12:48:34

[openssh.git] / session.h

diff --git a/session.h b/session.h
index e525066520d33099d1c9cb01689591fb2e3e08c9..cbb8e3a32d183abbfa35506c5943bfe3fd11f67c 100644 (file)
--- a/session.h
+++ b/session.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: session.h,v 1.22 2004/04/27 09:46:37 djm Exp $        */
+/* $OpenBSD: session.h,v 1.30 2008/05/08 12:21:16 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -31,17 +31,17 @@ typedef struct Session Session;
 struct Session {
        int     used;
        int     self;
+       int     next_unused;
        struct passwd *pw;
        Authctxt *authctxt;
        pid_t   pid;
+
        /* tty */
        char    *term;
        int     ptyfd, ttyfd, ptymaster;
        u_int   row, col, xpixel, ypixel;
        char    tty[TTYSZ];
-       /* last login */
-       char    hostname[MAXHOSTNAMELEN];
-       time_t  last_login_time;
+
        /* X11 */
        u_int   display_number;
        char    *display;
@@ -50,20 +50,23 @@ struct Session {
        char    *auth_proto;
        char    *auth_data;
        int     single_connection;
+
        /* proto 2 */
        int     chanid;
+       int     *x11_chanids;
        int     is_subsystem;
-       int     num_env;
+       u_int   num_env;
        struct {
                char    *name;
                char    *val;
-       }       *env;
+       } *env;
 };
 
 void    do_authenticated(Authctxt *);
 void    do_cleanup(Authctxt *);
 
 int     session_open(Authctxt *, int);
+void    session_unused(int);
 int     session_input_channel_req(Channel *, const char *);
 void    session_close_by_pid(pid_t, int);
 void    session_close_by_channel(int, void *);