diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-09-24 09:50:01 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-09-24 19:51:01 +1000 |
| commit | c704f641f7b8777497dc82e81f2ac89afec7e401 (patch) | |
| tree | 2c68d38501a8ddf6880f12373dada6b114029ee0 | |
| parent | 55486f5cef117354f0c64f991895835077b7c7f7 (diff) | |
upstream commit
write the correct buffer when tunnel forwarding; doesn't
matter on OpenBSD (they are the same) but does matter on portable where we
use an output filter to translate os-specific tun/tap headers
Upstream-ID: f1ca94eff48404827b12e1d12f6139ee99a72284
| -rw-r--r-- | channels.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.373 2017/09/23 22:04:07 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.374 2017/09/24 09:50:01 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1941,7 +1941,7 @@ channel_handle_wfd(struct ssh *ssh, Channel *c, if (c->datagram) { /* ignore truncated writes, datagrams might get lost */ - len = write(c->wfd, data, dlen); + len = write(c->wfd, buf, dlen); free(data); if (len < 0 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)) |