diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-12-27 04:25:24 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-12-27 04:38:22 +0100 |
| commit | 0a843d9a0e805f14653a555f5c7a8ba99d62c12d (patch) | |
| tree | 481f36e9fd1918be5449e369a97c086a1a8d2432 /misc.h | |
| parent | upstream: Fix calculation of initial bandwidth limits. Account for (diff) | |
| download | openssh-0a843d9a0e805f14653a555f5c7a8ba99d62c12d.tar.xz openssh-0a843d9a0e805f14653a555f5c7a8ba99d62c12d.zip | |
upstream: move client/server SSH-* banners to buffers under
ssh->kex and factor out the banner exchange. This eliminates some common code
from the client and server.
Also be more strict about handling \r characters - these should only
be accepted immediately before \n (pointed out by Jann Horn).
Inspired by a patch from Markus Schmidt.
(lots of) feedback and ok markus@
OpenBSD-Commit-ID: 1cc7885487a6754f63641d7d3279b0941890275b
Diffstat (limited to 'misc.h')
| -rw-r--r-- | misc.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.77 2018/12/07 04:36:09 dtucker Exp $ */ +/* $OpenBSD: misc.h,v 1.78 2018/12/27 03:25:25 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -17,6 +17,7 @@ #include <sys/time.h> #include <sys/types.h> +#include <sys/socket.h> /* Data structure for representing a forwarding request. */ struct Forward { @@ -51,6 +52,8 @@ void set_nodelay(int); int set_reuseaddr(int); char *get_rdomain(int); int set_rdomain(int, const char *); +int waitrfd(int, int *); +int timeout_connect(int, const struct sockaddr *, socklen_t, int *); int a2port(const char *); int a2tun(const char *, int *); char *put_host_port(const char *, u_short); |