From ee5627ebbab8237f8f3c5d9225d3e9c230016ded Mon Sep 17 00:00:00 2001 From: damien Date: Fri, 14 Jan 2000 04:45:46 +0000 Subject: - Merged OpenBSD IPv6 patch: - [sshd.c sshd.8 sshconnect.c ssh.h ssh.c servconf.h servconf.c scp.1] [scp.c packet.h packet.c login.c log.c canohost.c channels.c] [hostfile.c sshd_config] ipv6 support: mostly gethostbyname->getaddrinfo/getnameinfo, new features: sshd allows multiple ListenAddress and Port options. note that libwrap is not IPv6-ready. (based on patches from fujiwara@rcac.tdi.co.jp) - [ssh.c canohost.c] more hints (hints.ai_socktype=SOCK_STREAM) for getaddrinfo, from itojun@ - [channels.c] listen on _all_ interfaces for X11-Fwd (hints.ai_flags = AI_PASSIVE) - [packet.h] allow auth-kerberos for IPv4 only - [scp.1 sshd.8 servconf.h scp.c] document -4, -6, and 'ssh -L 2022/::1/22' - [ssh.c] 'ssh @host' is illegal (null user name), from karsten@gedankenpolizei.de - [sshconnect.c] better error message - [sshd.c] allow auth-kerberos for IPv4 only - Big IPv6 merge: - Cleanup overrun in sockaddr copying on RHL 6.1 - Replacements for getaddrinfo, getnameinfo, etc based on versions from patch from KIKUCHI Takahiro - Replacement for missing structures on systems that lack IPv6 - record_login needed to know about AF_INET6 addresses - Borrowed more code from OpenBSD: rresvport_af and requisites --- nchan.ms | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'nchan.ms') diff --git a/nchan.ms b/nchan.ms index 7b6c1617..eb49cd3b 100644 --- a/nchan.ms +++ b/nchan.ms @@ -52,6 +52,9 @@ arrow from S3.n to S4.s box invis "rcvd OCLOSE/" "-" with .w at last arrow.c ellipse wid .9*ellipsewid ht .9*ellipseht at S4 arrow "start" "" from S1.w+(-0.5,0) to S1.w +arrow from S2.ne to S4.sw +box invis "rcvd OCLOSE/ " with .e at last arrow.c +box invis " send IEOF" with .w at last arrow.c .PE .SH Channel Output State Diagram @@ -76,7 +79,7 @@ arrow "start" "" from S1.w+(-0.5,0) to S1.w Notes .PP The input buffer is filled with data from the socket -(the socket represents the local comsumer/producer of the +(the socket represents the local consumer/producer of the forwarded channel). The data is then sent over the INPUT-end (transmit-end) of the channel to the remote peer. @@ -85,7 +88,7 @@ saved in the output buffer and written to the socket. .PP If the local protocol instance has forwarded all data on the INPUT-end of the channel, it sends an IEOF message to the peer. -If the peer receives the IEOF and has comsumed all +If the peer receives the IEOF and has consumed all data he replies with an OCLOSE. When the local instance receives the OCLOSE he considers the INPUT-half of the channel closed. @@ -94,6 +97,6 @@ The peer has his OUTOUT-half closed. A channel can be deallocated by a protocol instance if both the INPUT- and the OUTOUT-half on his side of the channel are closed. -Note that when an instance is unable to comsume the +Note that when an instance is unable to consume the received data, he is permitted to send an OCLOSE before the matching IEOF is received. -- cgit v1.2.1