aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2006-02-04 23:12:51 +0000
committerFlorian Fainelli <florian@openwrt.org>2006-02-04 23:12:51 +0000
commit5e3468929bcf9d8a3e3b8660c9131ccbde84f57a (patch)
treea760fd55638d4d2046c57724a8e6300f24bf3e4a
parent784048a13c63e670dcf7619a0207e0c5fcf94ed5 (diff)
downloadupstream-5e3468929bcf9d8a3e3b8660c9131ccbde84f57a.tar.gz
upstream-5e3468929bcf9d8a3e3b8660c9131ccbde84f57a.tar.bz2
upstream-5e3468929bcf9d8a3e3b8660c9131ccbde84f57a.zip
Fixed writechannel bug as described in ticket in #246, now closed
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3131 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/dropbear/patches/160-writechannel.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/openwrt/package/dropbear/patches/160-writechannel.patch b/openwrt/package/dropbear/patches/160-writechannel.patch
new file mode 100644
index 00000000000..0e84a9953ec
--- /dev/null
+++ b/openwrt/package/dropbear/patches/160-writechannel.patch
@@ -0,0 +1,12 @@
+diff -urN dropbear-0.47.orig/common-channel.c dropbear-0.47/common-channel.c
+--- dropbear-0.47.orig/common-channel.c 2005-12-09 06:42:31.000000000 +0100
++++ dropbear-0.47/common-channel.c 2006-02-05 00:03:37.000000000 +0100
+@@ -377,7 +377,7 @@
+ cbuf_incrread(cbuf, len);
+ channel->recvdonelen += len;
+
+- if (fd == channel->writefd && len == maxlen && channel->recveof) {
++ if (fd == channel->writefd && len == maxlen && channel->recveof && cbuf_getused(channel->writebuf) == 0) {
+ /* Check if we're closing up */
+ closewritefd(channel);
+ TRACE(("leave writechannel: recveof set"))