summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-05-19 16:08:20 +1000
committerDamien Miller <djm@mindrot.org>2008-05-19 16:08:20 +1000
commit5159bdd0ecce2c9b5fd2f6a606609e7172e14039 (patch)
treea715c4cc634e4a7d1cafd4f204ccb00466459a91
parent0f30c87c45030005ed79d0c83c176d7abc91265f (diff)
- djm@cvs.openbsd.org 2008/05/15 23:52:24
[nchan2.ms] document eow message in ssh protocol 2 channel state machine; feedback and ok markus@
-rw-r--r--ChangeLog6
-rw-r--r--nchan2.ms6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index dceb42f2a..49caf7c08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -144,6 +144,10 @@
144 [umac.c] 144 [umac.c]
145 Ensure nh_result lies on a 64-bit boundary (fixes warnings observed 145 Ensure nh_result lies on a 64-bit boundary (fixes warnings observed
146 on Itanium on Linux); from Dale Talcott (bug #1462); ok djm@ 146 on Itanium on Linux); from Dale Talcott (bug #1462); ok djm@
147 - djm@cvs.openbsd.org 2008/05/15 23:52:24
148 [nchan2.ms]
149 document eow message in ssh protocol 2 channel state machine;
150 feedback and ok markus@
147 151
14820080403 15220080403
149 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile- 153 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
@@ -4004,4 +4008,4 @@
4004 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4008 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4005 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4009 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4006 4010
4007$Id: ChangeLog,v 1.4931 2008/05/19 06:07:45 djm Exp $ 4011$Id: ChangeLog,v 1.4932 2008/05/19 06:08:20 djm Exp $
diff --git a/nchan2.ms b/nchan2.ms
index a7a67b127..700150450 100644
--- a/nchan2.ms
+++ b/nchan2.ms
@@ -1,4 +1,4 @@
1.\" $OpenBSD: nchan2.ms,v 1.3 2003/11/21 11:57:03 djm Exp $ 1.\" $OpenBSD: nchan2.ms,v 1.4 2008/05/15 23:52:24 djm Exp $
2.\" 2.\"
3.\" Copyright (c) 2000 Markus Friedl. All rights reserved. 3.\" Copyright (c) 2000 Markus Friedl. All rights reserved.
4.\" 4.\"
@@ -44,7 +44,7 @@ arrow from S1.e to S4.n
44box invis "rcvd CLOSE/" "shutdown_read" with .sw at last arrow.c 44box invis "rcvd CLOSE/" "shutdown_read" with .sw at last arrow.c
45arrow "ibuf_empty ||" "rcvd CLOSE/" "send EOF" "" from S2.e to S4.w 45arrow "ibuf_empty ||" "rcvd CLOSE/" "send EOF" "" from S2.e to S4.w
46arrow from S1.s to S2.n 46arrow from S1.s to S2.n
47box invis "read_failed/" "shutdown_read" with .e at last arrow.c 47box invis "read_failed ||" "rcvd EOW/" "shutdown_read" with .e at last arrow.c
48ellipse wid .9*ellipsewid ht .9*ellipseht at S4 48ellipse wid .9*ellipsewid ht .9*ellipseht at S4
49arrow "start" "" from S1.w+(-0.5,0) to S1.w 49arrow "start" "" from S1.w+(-0.5,0) to S1.w
50.PE 50.PE
@@ -59,7 +59,7 @@ S4: ellipse "OUTPUT" "CLOSED"
59move down l from 1st ellipse.s 59move down l from 1st ellipse.s
60S2: ellipse "OUTPUT" "WAIT" "DRAIN" 60S2: ellipse "OUTPUT" "WAIT" "DRAIN"
61arrow from S1.e to S4.n 61arrow from S1.e to S4.n
62box invis "write_failed/" "shutdown_write" with .sw at last arrow.c 62box invis "write_failed/" "shutdown_write" "send EOW" with .sw at last arrow.c
63arrow "obuf_empty ||" "write_failed/" "shutdown_write" "" from S2.e to S4.w 63arrow "obuf_empty ||" "write_failed/" "shutdown_write" "" from S2.e to S4.w
64arrow from S1.s to S2.n 64arrow from S1.s to S2.n
65box invis "rcvd EOF ||" "rcvd CLOSE/" "-" with .e at last arrow.c 65box invis "rcvd EOF ||" "rcvd CLOSE/" "-" with .e at last arrow.c