← Back to branch summary

~rhansen/ubuntu/utopic/dropbear/bug1409798

« back to all changes in this revision

Viewing changes to channel.h

  • Committer: Package Import Robot
  • Author(s): Mattia Rizzolo
  • Date: 2014-01-29 17:44:42 UTC
  • mfrom: (1.3.9) (14.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20140129174442-966g9n5pa58m0b1s
Tags: 2013.60-1ubuntu1
https://launchpad.net/bugs/1274195
* Merge from Debian unstable.  Remaining changes: (LP: #1274195)
  - debian/initrmfs/premount-devpts: if /dev/pts is already mounted, don't
    re-mount it.
* debian/diff/autoconfupdate.diff: dropped, not needed anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
channel.h
61
61
        int readfd; /* read from insecure side, written to wire */
62
62
        int errfd; /* used like writefd or readfd, depending if it's client or server.
63
63
                                  Doesn't exactly belong here, but is cleaner here */
64
 
        circbuffer *writebuf; /* data from the wire, for local consumption */
 
64
        circbuffer *writebuf; /* data from the wire, for local consumption. Can be
 
65
                                                         initially NULL */
65
66
        circbuffer *extrabuf; /* extended-data for the program - used like writebuf
66
67
                                             but for stderr */
67
68
 
82
83
 
83
84
        int flushing;
84
85
 
 
86
        /* Used by client chansession to handle ~ escaping, NULL ignored otherwise */
 
87
        void (*read_mangler)(struct Channel*, unsigned char* bytes, int *len);
 
88
 
85
89
        const struct ChanType* type;
86
 
 
87
90
};
88
91
 
89
92
struct ChanType {
102
105
void setchannelfds(fd_set *readfd, fd_set *writefd);
103
106
void channelio(fd_set *readfd, fd_set *writefd);
104
107
struct Channel* getchannel();
105
 
struct Channel* newchannel(unsigned int remotechan, 
106
 
                const struct ChanType *type, 
107
 
                unsigned int transwindow, unsigned int transmaxpacket);
108
108
 
109
109
void recv_msg_channel_open();
110
110
void recv_msg_channel_request();