OpenBSD CVS

CVS log for src/usr.bin/ssh/nchan.c


[BACK] Up to [local] / src / usr.bin / ssh

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.75 / (download) - annotate - [select for diffs], Thu Feb 1 02:37:33 2024 UTC (3 months, 2 weeks ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, HEAD
Changes since 1.74: +2 -2 lines
Diff to previous 1.74 (colored)

whitespace

Revision 1.74 / (download) - annotate - [select for diffs], Tue Feb 1 23:32:51 2022 UTC (2 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.73: +7 -3 lines
Diff to previous 1.73 (colored)

mark const string array contents const too, i.e.
static const char *array => static const char * const array
from Mike Frysinger

Revision 1.73 / (download) - annotate - [select for diffs], Wed May 19 01:24:05 2021 UTC (2 years, 11 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.72: +4 -4 lines
Diff to previous 1.72 (colored)

restore blocking status on stdio fds before close

ssh(1) needs to set file descriptors to non-blocking mode to operate
but it was not restoring the original state on exit. This could cause
problems with fds shared with other programs via the shell, e.g.

> $ cat > test.sh << _EOF
> #!/bin/sh
> {
>         ssh -Fnone -oLogLevel=verbose ::1 hostname
>         cat /usr/share/dict/words
> } | sleep 10
> _EOF
> $ ./test.sh
> Authenticated to ::1 ([::1]:22).
> Transferred: sent 2352, received 2928 bytes, in 0.1 seconds
> Bytes per second: sent 44338.9, received 55197.4
> cat: stdout: Resource temporarily unavailable

This restores the blocking status for fds 0,1,2 (stdio) before ssh(1)
abandons/closes them.

This was reported as bz3280 and GHPR246; ok dtucker@

Revision 1.72 / (download) - annotate - [select for diffs], Wed Jan 27 09:26:54 2021 UTC (3 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9
Changes since 1.71: +3 -3 lines
Diff to previous 1.71 (colored)

remove global variable used to stash compat flags and use the
purpose-built ssh->compat variable instead; feedback/ok markus@

Revision 1.71 / (download) - annotate - [select for diffs], Sun Oct 18 11:32:01 2020 UTC (3 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.70: +28 -35 lines
Diff to previous 1.70 (colored)

use the new variant log macros instead of prepending __func__ and
appending ssh_err(r) manually; ok markus@

Revision 1.70 / (download) - annotate - [select for diffs], Fri Jun 28 13:35:04 2019 UTC (4 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.69: +3 -3 lines
Diff to previous 1.69 (colored)

When system calls indicate an error they return -1, not some arbitrary
value < 0.  errno is only updated in this case.  Change all (most?)
callers of syscalls to follow this better, and let's see if this strictness
helps us in the future.

Revision 1.69 / (download) - annotate - [select for diffs], Thu Oct 4 07:47:35 2018 UTC (5 years, 7 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.68: +23 -1 lines
Diff to previous 1.68 (colored)

when the peer sends a channel-close message, make sure we close the
local extended read fd (stderr) along with the regular read fd (stdout).
Avoids weird stuck processed in multiplexing mode.

Report and analysis by Nelson Elhage and Geoffrey Thomas in bz#2863

ok dtucker@ markus@

Revision 1.68 / (download) - annotate - [select for diffs], Thu Oct 4 00:10:11 2018 UTC (5 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.67: +30 -19 lines
Diff to previous 1.67 (colored)

include a little more information about the status and disposition of
channel's extended (stderr) fd; makes debugging some things a bit easier.
No behaviour change.

Revision 1.67 / (download) - annotate - [select for diffs], Tue Sep 12 06:35:32 2017 UTC (6 years, 8 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.66: +9 -1 lines
Diff to previous 1.66 (colored)

Make remote channel ID a u_int

Previously we tracked the remote channel IDs in an int, but this is
strictly incorrect: the wire protocol uses uint32 and there is nothing
in-principle stopping a SSH implementation from sending, say, 0xffff0000.

In practice everyone numbers their channels sequentially, so this has
never been a problem.

ok markus@

Revision 1.66 / (download) - annotate - [select for diffs], Tue Sep 12 06:32:07 2017 UTC (6 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.65: +62 -52 lines
Diff to previous 1.65 (colored)

refactor channels.c

Move static state to a "struct ssh_channels" that is allocated at
runtime and tracked as a member of struct ssh.

Explicitly pass "struct ssh" to all channels functions.

Replace use of the legacy packet APIs in channels.c.

Rework sshd_config PermitOpen handling: previously the configuration
parser would call directly into the channels layer. After the refactor
this is not possible, as the channels structures are allocated at
connection time and aren't available when the configuration is parsed.
The server config parser now tracks PermitOpen itself and explicitly
configures the channels code later.

ok markus@

Revision 1.65 / (download) - annotate - [select for diffs], Sun Apr 30 23:28:42 2017 UTC (7 years ago) by djm
Branch: MAIN
Changes since 1.64: +1 -2 lines
Diff to previous 1.64 (colored)

obliterate ssh1.h and some dead code that used it

ok markus@

Revision 1.64 / (download) - annotate - [select for diffs], Sun Apr 30 23:13:25 2017 UTC (7 years ago) by djm
Branch: MAIN
Changes since 1.63: +66 -200 lines
Diff to previous 1.63 (colored)

remove compat20/compat13/compat15 variables

ok markus@

Revision 1.63 / (download) - annotate - [select for diffs], Tue Jan 26 01:28:35 2010 UTC (14 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9, OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7, OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.62: +15 -6 lines
Diff to previous 1.62 (colored)

rewrite ssh(1) multiplexing code to a more sensible protocol.

The new multiplexing code uses channels for the listener and
accepted control sockets to make the mux master non-blocking, so
no stalls when processing messages from a slave.

avoid use of fatal() in mux master protocol parsing so an errant slave
process cannot take down a running master.

implement requesting of port-forwards over multiplexed sessions. Any
port forwards requested by the slave are added to those the master has
established.

add support for stdio forwarding ("ssh -W host:port ...") in mux slaves.

document master/slave mux protocol so that other tools can use it to
control a running ssh(1). Note: there are no guarantees that this
protocol won't be incompatibly changed (though it is versioned).

feedback Salvador Fandino, dtucker@
channel changes ok markus@

Revision 1.62 / (download) - annotate - [select for diffs], Fri Nov 7 18:50:18 2008 UTC (15 years, 6 months ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.61: +5 -5 lines
Diff to previous 1.61 (colored)

add space to some log/debug messages for readability; ok djm@ markus@

Revision 1.61 / (download) - annotate - [select for diffs], Thu Sep 11 14:22:37 2008 UTC (15 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.60: +3 -1 lines
Diff to previous 1.60 (colored)

only send eow and no-more-sessions requests to openssh 5 and newer;
fixes interop problems with broken ssh v2 implementations; ok djm@

Revision 1.60 / (download) - annotate - [select for diffs], Mon Jun 30 12:16:02 2008 UTC (15 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.59: +3 -2 lines
Diff to previous 1.59 (colored)

only send eow@openssh.com notifications for session channels; ok! markus@

Revision 1.59 / (download) - annotate - [select for diffs], Fri May 9 16:21:13 2008 UTC (16 years ago) by markus
Branch: MAIN
Changes since 1.58: +29 -1 lines
Diff to previous 1.58 (colored)

unbreak
	ssh -2 localhost od /bin/ls | true
ignoring SIGPIPE by adding a new channel message (EOW) that signals
the peer that we're not interested in any data it might send.
fixes bz #85; discussion, debugging and ok djm@

Revision 1.58 / (download) - annotate - [select for diffs], Thu May 8 12:02:23 2008 UTC (16 years ago) by djm
Branch: MAIN
Changes since 1.57: +2 -1 lines
Diff to previous 1.57 (colored)

Implement a channel success/failure status confirmation callback
mechanism. Each channel maintains a queue of callbacks, which will
be drained in order (RFC4253 guarantees confirm messages are not
reordered within an channel).

Also includes a abandonment callback to clean up if a channel is
closed without sending confirmation messages. This probably
shouldn't happen in compliant implementations, but it could be
abused to leak memory.

ok markus@ (as part of a larger diff)

Revision 1.51.6.1 / (download) - annotate - [select for diffs], Fri Oct 6 03:19:32 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.51: +7 -2 lines
Diff to previous 1.51 (colored) next main 1.52 (colored)

upgrade to OpenSSH 4.4

Revision 1.51.8.1 / (download) - annotate - [select for diffs], Sat Sep 30 04:06:50 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_9
Changes since 1.51: +7 -2 lines
Diff to previous 1.51 (colored) next main 1.52 (colored)

upgrade to OpenSSH 4.4

Revision 1.57 / (download) - annotate - [select for diffs], Thu Aug 3 03:34:42 2006 UTC (17 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3, OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.56: +2 -3 lines
Diff to previous 1.56 (colored)

almost entirely get rid of the culture of ".h files that include .h files"
ok djm, sort of ok stevesk
makes the pain stop in one easy step

Revision 1.56 / (download) - annotate - [select for diffs], Sat Jul 22 20:48:23 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.55: +2 -1 lines
Diff to previous 1.55 (colored)

move #include <string.h> out of includes.h

Revision 1.55 / (download) - annotate - [select for diffs], Tue Jul 11 20:07:25 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.54: +3 -1 lines
Diff to previous 1.54 (colored)

move #include <errno.h> out of includes.h; ok markus@

Revision 1.54 / (download) - annotate - [select for diffs], Sat Jul 8 21:47:12 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.53: +4 -1 lines
Diff to previous 1.53 (colored)

move #include <sys/socket.h> out of includes.h

Revision 1.53 / (download) - annotate - [select for diffs], Sat Mar 25 13:17:02 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.52: +1 -0 lines
Diff to previous 1.52 (colored)

Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
Theo nuked - our scripts to sync -portable need them in the files

Revision 1.52 / (download) - annotate - [select for diffs], Sun Mar 19 18:51:18 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.51: +0 -1 lines
Diff to previous 1.51 (colored)

RCSID() can die

Revision 1.49.2.1 / (download) - annotate - [select for diffs], Thu Aug 19 22:37:31 2004 UTC (19 years, 9 months ago) by brad
Branch: OPENBSD_3_4
Changes since 1.49: +10 -10 lines
Diff to previous 1.49 (colored) next main 1.50 (colored)

upgrade to OpenSSH 3.9

Revision 1.49.4.1 / (download) - annotate - [select for diffs], Thu Aug 19 04:13:26 2004 UTC (19 years, 9 months ago) by brad
Branch: OPENBSD_3_5
Changes since 1.49: +10 -10 lines
Diff to previous 1.49 (colored) next main 1.50 (colored)

upgrade to OpenSSH 3.9

Revision 1.51 / (download) - annotate - [select for diffs], Sun Jul 11 17:48:47 2004 UTC (19 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_8_BASE, OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6
Branch point for: OPENBSD_3_9, OPENBSD_3_8
Changes since 1.50: +8 -8 lines
Diff to previous 1.50 (colored)

spaces

Revision 1.50 / (download) - annotate - [select for diffs], Mon Jun 21 17:36:31 2004 UTC (19 years, 10 months ago) by avsm
Branch: MAIN
Changes since 1.49: +3 -3 lines
Diff to previous 1.49 (colored)

make ssh -Wshadow clean, no functional changes
markus@ ok

Revision 1.47.4.2 / (download) - annotate - [select for diffs], Thu Mar 4 18:18:16 2004 UTC (20 years, 2 months ago) by brad
Branch: OPENBSD_3_3
Changes since 1.47.4.1: +0 -0 lines
Diff to previous 1.47.4.1 (colored) to branchpoint 1.47 (colored) next main 1.48 (colored)

upgrade to OpenSSH 3.8upgrade to OpenSSH 3.8upgrade to OpenSSH 3.8

Revision 1.47.2.1 / (download) - annotate - [select for diffs], Tue Sep 16 21:20:26 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_2
Changes since 1.47: +25 -25 lines
Diff to previous 1.47 (colored) next main 1.48 (colored)

upgrade to OpenSSH 3.7

Revision 1.47.4.1 / (download) - annotate - [select for diffs], Tue Sep 16 20:50:43 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_3
Changes since 1.47: +25 -25 lines
Diff to previous 1.47 (colored)

upgrade to OpenSSH 3.7

Revision 1.49 / (download) - annotate - [select for diffs], Fri Aug 29 10:04:36 2003 UTC (20 years, 8 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_4_BASE
Branch point for: OPENBSD_3_5, OPENBSD_3_4
Changes since 1.48: +23 -23 lines
Diff to previous 1.48 (colored)

be less chatty; debug -> debug2, cleanup; ok henning@

Revision 1.48 / (download) - annotate - [select for diffs], Tue Apr 8 20:21:29 2003 UTC (21 years, 1 month ago) by itojun
Branch: MAIN
Changes since 1.47: +3 -3 lines
Diff to previous 1.47 (colored)

rename log() into logit() to avoid name conflict.  markus ok, from netbsd

Revision 1.45.2.1 / (download) - annotate - [select for diffs], Wed Jun 26 15:30:38 2002 UTC (21 years, 10 months ago) by jason
Branch: OPENBSD_3_1
Changes since 1.45: +4 -4 lines
Diff to previous 1.45 (colored) next main 1.46 (colored)

Pull in OpenSSH-3.4

Revision 1.32.2.3 / (download) - annotate - [select for diffs], Sat Jun 22 07:23:17 2002 UTC (21 years, 11 months ago) by miod
Branch: OPENBSD_3_0
Changes since 1.32.2.2: +4 -4 lines
Diff to previous 1.32.2.2 (colored) to branchpoint 1.32 (colored) next main 1.33 (colored)

Update OpenSSH to version 3.3 (with local changes, configuration files still
living in /etc and privsep user being nobody).

Revision 1.47 / (download) - annotate - [select for diffs], Wed Jun 19 00:27:55 2002 UTC (21 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_2_BASE
Branch point for: OPENBSD_3_3, OPENBSD_3_2
Changes since 1.46: +2 -2 lines
Diff to previous 1.46 (colored)

KNF done automatically while reading....

Revision 1.46 / (download) - annotate - [select for diffs], Sun Jun 9 13:32:01 2002 UTC (21 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.45: +3 -3 lines
Diff to previous 1.45 (colored)

use tab not spaces (|unexpand)

Revision 1.23.2.4 / (download) - annotate - [select for diffs], Sun Jun 2 22:56:10 2002 UTC (21 years, 11 months ago) by miod
Branch: OPENBSD_2_9
Changes since 1.23.2.3: +27 -33 lines
Diff to previous 1.23.2.3 (colored) to branchpoint 1.23 (colored) next main 1.24 (colored)

Upgrade to OpenSSH 3.2.3.

Except for improbable compilation error fixes, this should be the last
commit made to the 2.9-STABLE branche. Have fun upgrading.

Revision 1.32.2.2 / (download) - annotate - [select for diffs], Fri May 17 00:03:23 2002 UTC (22 years ago) by miod
Branch: OPENBSD_3_0
Changes since 1.32.2.1: +27 -33 lines
Diff to previous 1.32.2.1 (colored) to branchpoint 1.32 (colored)

Update OpenSSH to version 3.2.2.

Revision 1.45 / (download) - annotate - [select for diffs], Mon Mar 25 21:13:51 2002 UTC (22 years, 1 month ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE
Branch point for: OPENBSD_3_1
Changes since 1.44: +27 -33 lines
Diff to previous 1.44 (colored)

don't send stderr data after EOF, accept this from older known (broken)
sshd servers only, fixes http://bugzilla.mindrot.org/show_bug.cgi?id=179

Revision 1.23.2.3 / (download) - annotate - [select for diffs], Sat Mar 9 00:20:44 2002 UTC (22 years, 2 months ago) by miod
Branch: OPENBSD_2_9
Changes since 1.23.2.2: +94 -165 lines
Diff to previous 1.23.2.2 (colored) to branchpoint 1.23 (colored)

Merge OpenSSH 3.1, keeping /etc as configuration files directory.
(i.e. OpenSSH 3.1 + openbsd29_3.1.patch)

Revision 1.19.2.7 / (download) - annotate - [select for diffs], Fri Mar 8 17:04:42 2002 UTC (22 years, 2 months ago) by brad
Branch: OPENBSD_2_8
Changes since 1.19.2.6: +94 -165 lines
Diff to previous 1.19.2.6 (colored) to branchpoint 1.19 (colored) next main 1.20 (colored)

Merge OpenSSH 3.1.

Revision 1.32.2.1 / (download) - annotate - [select for diffs], Thu Mar 7 17:37:46 2002 UTC (22 years, 2 months ago) by jason
Branch: OPENBSD_3_0
Changes since 1.32: +94 -165 lines
Diff to previous 1.32 (colored)

Update to OpenSSH-3.1 on 3.0-stable branch

Revision 1.44 / (download) - annotate - [select for diffs], Mon Jan 21 23:27:10 2002 UTC (22 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.43: +4 -1 lines
Diff to previous 1.43 (colored)

cleanup channels faster if the are empty and we are in drain-state; ok deraadt@

Revision 1.43 / (download) - annotate - [select for diffs], Mon Jan 14 13:57:03 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.42: +2 -2 lines
Diff to previous 1.42 (colored)

(c) 2002

Revision 1.42 / (download) - annotate - [select for diffs], Mon Jan 14 13:55:55 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.41: +32 -56 lines
Diff to previous 1.41 (colored)

remove function pointers for events, remove chan_init*; ok provos@

Revision 1.41 / (download) - annotate - [select for diffs], Mon Jan 14 13:41:13 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.40: +1 -4 lines
Diff to previous 1.40 (colored)

remove duplicated code; ok provos@

Revision 1.40 / (download) - annotate - [select for diffs], Mon Jan 14 13:40:10 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.39: +7 -6 lines
Diff to previous 1.39 (colored)

correct fn names for ssh2, do not switch from closed to closed; ok provos@

Revision 1.39 / (download) - annotate - [select for diffs], Mon Jan 14 13:34:07 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.38: +13 -37 lines
Diff to previous 1.38 (colored)

merge chan_[io]buf_empty[12]; ok provos@

Revision 1.38 / (download) - annotate - [select for diffs], Mon Jan 14 13:22:35 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.37: +4 -2 lines
Diff to previous 1.37 (colored)

chan_send_oclose1() no longer calls chan_shutdown_write(); ok provos@

Revision 1.37 / (download) - annotate - [select for diffs], Sun Jan 13 21:31:20 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.36: +43 -40 lines
Diff to previous 1.36 (colored)

add chan_set_[io]state(), order states, state is now an u_int,
simplifies debugging messages; ok provos@

Revision 1.36 / (download) - annotate - [select for diffs], Thu Jan 10 12:47:59 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.35: +1 -24 lines
Diff to previous 1.35 (colored)

more unused code (with channels.c:1.156)

Revision 1.35 / (download) - annotate - [select for diffs], Thu Jan 10 12:38:26 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.34: +1 -7 lines
Diff to previous 1.34 (colored)

remove dead code (skip drain)

Revision 1.34 / (download) - annotate - [select for diffs], Wed Jan 9 17:26:35 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.33: +3 -3 lines
Diff to previous 1.33 (colored)

replace buffer_consume(b, buffer_len(b)) with buffer_clear(b); ok provos@

Revision 1.33 / (download) - annotate - [select for diffs], Wed Dec 19 07:18:56 2001 UTC (22 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.32: +5 -5 lines
Diff to previous 1.32 (colored)

basic KNF done while i was looking for something else

Revision 1.23.2.2 / (download) - annotate - [select for diffs], Thu Nov 15 00:15:19 2001 UTC (22 years, 6 months ago) by miod
Branch: OPENBSD_2_9
Changes since 1.23.2.1: +12 -3 lines
Diff to previous 1.23.2.1 (colored) to branchpoint 1.23 (colored)

Merge OpenSSH 3.0

Revision 1.19.2.6 / (download) - annotate - [select for diffs], Thu Nov 15 00:14:59 2001 UTC (22 years, 6 months ago) by miod
Branch: OPENBSD_2_8
Changes since 1.19.2.5: +12 -3 lines
Diff to previous 1.19.2.5 (colored) to branchpoint 1.19 (colored)

Merge OpenSSH 3.0

Revision 1.32 / (download) - annotate - [select for diffs], Wed Oct 10 22:18:47 2001 UTC (22 years, 7 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE
Branch point for: OPENBSD_3_0
Changes since 1.31: +12 -3 lines
Diff to previous 1.31 (colored)

try to keep channels open until an exit-status message is sent.
don't kill the login shells if the shells stdin/out/err is closed.
this should now work:
ssh -2n localhost 'exec > /dev/null 2>&1; sleep 10; exit 5'; echo ?

Revision 1.23.2.1 / (download) - annotate - [select for diffs], Thu Sep 27 19:03:54 2001 UTC (22 years, 7 months ago) by jason
Branch: OPENBSD_2_9
Changes since 1.23: +88 -41 lines
Diff to previous 1.23 (colored)

Pull in OpenSSH-2.9.9

Revision 1.19.2.5 / (download) - annotate - [select for diffs], Thu Sep 27 00:15:42 2001 UTC (22 years, 7 months ago) by miod
Branch: OPENBSD_2_8
Changes since 1.19.2.4: +88 -41 lines
Diff to previous 1.19.2.4 (colored) to branchpoint 1.19 (colored)

Pull in OpenSSH 2.9.9 to the 2.8 branch.

Revision 1.31 / (download) - annotate - [select for diffs], Tue Jul 17 21:04:57 2001 UTC (22 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.30: +3 -5 lines
Diff to previous 1.30 (colored)

keep track of both maxfd and the size of the malloc'ed fdsets.
update maxfd if maxfd gets closed.

Revision 1.30 / (download) - annotate - [select for diffs], Mon Jun 25 08:25:38 2001 UTC (22 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)

update copyright for 2001

Revision 1.29 / (download) - annotate - [select for diffs], Sat Jun 23 15:12:19 2001 UTC (22 years, 10 months ago) by itojun
Branch: MAIN
Changes since 1.28: +7 -7 lines
Diff to previous 1.28 (colored)

more strict prototypes.  raise warning level in Makefile.inc.  markus ok'ed
TODO; cleanup headers

Revision 1.28 / (download) - annotate - [select for diffs], Thu May 31 10:30:16 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.27: +69 -30 lines
Diff to previous 1.27 (colored)

undo the .c file split, just merge the header and keep the cvs history

Revision 1.27, Wed May 30 12:55:11 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.26: +1 -1 lines
FILE REMOVED

channel layer cleanup: merge header files and split .c files

Revision 1.26 / (download) - annotate - [select for diffs], Mon May 28 23:14:49 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.25: +7 -3 lines
Diff to previous 1.25 (colored)

undo broken channel fix and try a different one. there
should be still some select errors...

Revision 1.25 / (download) - annotate - [select for diffs], Wed May 16 22:09:21 2001 UTC (23 years ago) by markus
Branch: MAIN
Changes since 1.24: +1 -3 lines
Diff to previous 1.24 (colored)

more select() error fixes (don't set rfd/wfd to -1).

Revision 1.19.2.4 / (download) - annotate - [select for diffs], Mon May 7 21:09:31 2001 UTC (23 years ago) by jason
Branch: OPENBSD_2_8
Changes since 1.19.2.3: +0 -0 lines
Diff to previous 1.19.2.3 (colored) to branchpoint 1.19 (colored)

Pull in OpenSSH-2.9 to 2.8 branch.

Revision 1.24 / (download) - annotate - [select for diffs], Fri May 4 23:47:34 2001 UTC (23 years ago) by markus
Branch: MAIN
Changes since 1.23: +9 -1 lines
Diff to previous 1.23 (colored)

move to Channel **channels (instead of Channel *channels), fixes realloc problems.
channel_new now returns a Channel *, favour Channel * over channel id.
remove old channel_allocate interface.

Revision 1.19.2.3 / (download) - annotate - [select for diffs], Wed Mar 21 19:46:26 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.19.2.2: +31 -26 lines
Diff to previous 1.19.2.2 (colored) to branchpoint 1.19 (colored)

Pull in OpenSSH-2.5.2 for 2.8 branch.

Revision 1.17.2.4 / (download) - annotate - [select for diffs], Wed Mar 21 18:52:53 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.17.2.3: +31 -26 lines
Diff to previous 1.17.2.3 (colored) to branchpoint 1.17 (colored) next main 1.18 (colored)

Pull in OpenSSH-2.5.2 for 2.7 branch.

Revision 1.17.2.3 / (download) - annotate - [select for diffs], Mon Mar 12 15:44:12 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.17.2.2: +8 -5 lines
Diff to previous 1.17.2.2 (colored) to branchpoint 1.17 (colored)

OpenSSH-2.5.1 for 2.7 patch branch

Revision 1.23 / (download) - annotate - [select for diffs], Wed Feb 28 08:54:55 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE
Branch point for: OPENBSD_2_9
Changes since 1.22: +31 -26 lines
Diff to previous 1.22 (colored)

make sure remote stderr does not get truncated.
remove closed fd's from the select mask.

Revision 1.19.2.2 / (download) - annotate - [select for diffs], Mon Feb 19 17:19:08 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.19.2.1: +0 -0 lines
Diff to previous 1.19.2.1 (colored) to branchpoint 1.19 (colored)

Pull in OpenSSH-2.5.1

Revision 1.19.2.1 / (download) - annotate - [select for diffs], Fri Feb 16 20:13:08 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.19: +8 -5 lines
Diff to previous 1.19 (colored)

Pull in OpenSSH 2.5.0

Revision 1.22 / (download) - annotate - [select for diffs], Sun Jan 21 19:05:52 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.21: +4 -6 lines
Diff to previous 1.21 (colored)

split ssh.h and try to cleanup the #include mess. remove unnecessary #includes.
rename util.[ch] -> misc.[ch]

Revision 1.21 / (download) - annotate - [select for diffs], Fri Jan 19 15:55:11 2001 UTC (23 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.20: +2 -1 lines
Diff to previous 1.20 (colored)

move ssh1 definitions to ssh1.h, pathnames to pathnames.h

Revision 1.17.2.2 / (download) - annotate - [select for diffs], Wed Nov 8 21:30:59 2000 UTC (23 years, 6 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.17.2.1: +1 -6 lines
Diff to previous 1.17.2.1 (colored) to branchpoint 1.17 (colored)

openssh-2.3.0 (again) for 2.7 branch

Revision 1.20 / (download) - annotate - [select for diffs], Mon Nov 6 23:04:56 2000 UTC (23 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.19: +5 -1 lines
Diff to previous 1.19 (colored)

agent forwarding and -R for ssh2, based on work from jhuuskon@messi.uku.fi

Revision 1.19 / (download) - annotate - [select for diffs], Thu Sep 7 20:27:52 2000 UTC (23 years, 8 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE
Branch point for: OPENBSD_2_8
Changes since 1.18: +1 -6 lines
Diff to previous 1.18 (colored)

cleanup copyright notices on all files.  I have attempted to be accurate with
the details.  everything is now under Tatu's licence (which I copied from his
readme), and/or the core-sdi bsd-ish thing for deattack, or various openbsd
developers under a 2-term bsd licence.  We're not changing any rules, just
being accurate.

Revision 1.17.2.1 / (download) - annotate - [select for diffs], Fri Sep 1 18:23:21 2000 UTC (23 years, 8 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.17: +1 -1 lines
Diff to previous 1.17 (colored)

Pull in the rest of openssh-2.2.0 to 2.7 branch (luvin' cvs...)

Revision 1.18 / (download) - annotate - [select for diffs], Tue Jun 20 01:39:42 2000 UTC (23 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.17: +1 -1 lines
Diff to previous 1.17 (colored)

OpenBSD tag

Revision 1.17 / (download) - annotate - [select for diffs], Mon May 8 17:44:54 2000 UTC (24 years ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE
Branch point for: OPENBSD_2_7
Changes since 1.16: +5 -1 lines
Diff to previous 1.16 (colored)

no drain if ibuf_empty, fixes x11fwd problems; tests by fries@

Revision 1.16 / (download) - annotate - [select for diffs], Wed May 3 10:19:18 2000 UTC (24 years ago) by markus
Branch: MAIN
Changes since 1.15: +20 -1 lines
Diff to previous 1.15 (colored)

fix close for non-open ssh1 channels

Revision 1.15 / (download) - annotate - [select for diffs], Tue May 2 12:44:38 2000 UTC (24 years ago) by markus
Branch: MAIN
Changes since 1.14: +2 -2 lines
Diff to previous 1.14 (colored)

use c-style comments

Revision 1.14 / (download) - annotate - [select for diffs], Fri Apr 14 10:30:32 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored)

whitespace cleanup

Revision 1.13 / (download) - annotate - [select for diffs], Mon Apr 3 07:07:15 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.12: +309 -70 lines
Diff to previous 1.12 (colored)

channel layer support for ssh2

Revision 1.12 / (download) - annotate - [select for diffs], Tue Mar 28 20:34:14 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.11: +1 -5 lines
Diff to previous 1.11 (colored)

sync w/ channels.c

Revision 1.11 / (download) - annotate - [select for diffs], Tue Mar 28 20:31:27 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.10: +2 -3 lines
Diff to previous 1.10 (colored)

replace big switch() with function tables (prepare for ssh2)

Revision 1.10 / (download) - annotate - [select for diffs], Mon Jan 10 10:15:28 2000 UTC (24 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.9: +18 -12 lines
Diff to previous 1.9 (colored)

handle OCLOSE for CHAN_INPUT_WAIT_DRAIN, i.e. do not drain buffer if
peer is not going to read the data.

Revision 1.9 / (download) - annotate - [select for diffs], Thu Dec 2 20:10:05 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.8: +10 -10 lines
Diff to previous 1.8 (colored)

use error() for internal errors

Revision 1.8 / (download) - annotate - [select for diffs], Wed Nov 24 20:21:48 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.7: +3 -2 lines
Diff to previous 1.7 (colored)

it's not an error() if shutdown_write failes in nchan.

Revision 1.7 / (download) - annotate - [select for diffs], Wed Nov 24 16:15:25 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.6: +30 -1 lines
Diff to previous 1.6 (colored)

missing copyright

Revision 1.6 / (download) - annotate - [select for diffs], Tue Nov 23 22:25:54 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.5: +67 -52 lines
Diff to previous 1.5 (colored)

KNF part 1

Revision 1.5 / (download) - annotate - [select for diffs], Mon Oct 25 21:04:28 1999 UTC (24 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.4: +1 -14 lines
Diff to previous 1.4 (colored)

remove buggy 'x11-fix'

Revision 1.4 / (download) - annotate - [select for diffs], Mon Oct 25 21:03:17 1999 UTC (24 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.3: +7 -7 lines
Diff to previous 1.3 (colored)

typo in debug messages (input vs. ouput)

Revision 1.3 / (download) - annotate - [select for diffs], Sun Oct 17 16:56:09 1999 UTC (24 years, 7 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.2: +168 -69 lines
Diff to previous 1.2 (colored)

re-implement the proto-1.5 channel close protocol, see nchan.ms.

Revision 1.2 / (download) - annotate - [select for diffs], Sat Oct 16 22:29:01 1999 UTC (24 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.1: +7 -4 lines
Diff to previous 1.1 (colored)

add CVS tags, fix comments and whitespace

Revision 1.1 / (download) - annotate - [select for diffs], Sat Oct 16 20:47:14 1999 UTC (24 years, 7 months ago) by markus
Branch: MAIN

support for SSH protocol 1.5 which is poorly documented, the RFC.troff lies.
interops (x11,agent,etc) with 1.2.27 and protocol 1.3

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.