diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-01-19 19:52:16 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-20 09:13:01 +1100 |
commit | 091c302829210c41e7f57c3f094c7b9c054306f0 (patch) | |
tree | 800de5dc85b877a85d1f269ae5bb09b0dc3fa7a7 /monitor.h | |
parent | 4e62cc68ce4ba20245d208b252e74e91d3785b74 (diff) |
upstream commit
update packet.c & isolate, introduce struct ssh a) switch
packet.c to buffer api and isolate per-connection info into struct ssh b)
(de)serialization of the state is moved from monitor to packet.c c) the old
packet.c API is implemented in opacket.[ch] d) compress.c/h is removed and
integrated into packet.c with and ok djm@
Diffstat (limited to 'monitor.h')
-rw-r--r-- | monitor.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.h,v 1.18 2014/01/29 06:18:35 djm Exp $ */ | 1 | /* $OpenBSD: monitor.h,v 1.19 2015/01/19 19:52:16 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -75,7 +75,7 @@ struct monitor { | |||
75 | int m_log_sendfd; | 75 | int m_log_sendfd; |
76 | struct mm_master *m_zback; | 76 | struct mm_master *m_zback; |
77 | struct mm_master *m_zlib; | 77 | struct mm_master *m_zlib; |
78 | struct Kex **m_pkex; | 78 | struct kex **m_pkex; |
79 | pid_t m_pid; | 79 | pid_t m_pid; |
80 | }; | 80 | }; |
81 | 81 | ||