tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
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
This commit is contained in:
djm@openbsd.org 2017-09-24 09:50:01 +00:00 committed by Damien Miller
parent 55486f5cef
commit c704f641f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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) { if (c->datagram) {
/* ignore truncated writes, datagrams might get lost */ /* ignore truncated writes, datagrams might get lost */
len = write(c->wfd, data, dlen); len = write(c->wfd, buf, dlen);
free(data); free(data);
if (len < 0 && (errno == EINTR || errno == EAGAIN || if (len < 0 && (errno == EINTR || errno == EAGAIN ||
errno == EWOULDBLOCK)) errno == EWOULDBLOCK))