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
commit1b4f762e2b07601b1705aefce9c9daca70462dba (patch)
tree4ca4a98a78a23be842a1c09eb6fcb8fbec9067eb
parent88d5b61e4f86f3a52e94dad53fd4e76343cffaab (diff)
downloadupstream-1b4f762e2b07601b1705aefce9c9daca70462dba.tar.gz
upstream-1b4f762e2b07601b1705aefce9c9daca70462dba.tar.bz2
upstream-1b4f762e2b07601b1705aefce9c9daca70462dba.zip
Fixed writechannel bug as described in ticket in #246, now closed
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3131 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/dropbear/patches/160-writechannel.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/package/dropbear/patches/160-writechannel.patch b/package/dropbear/patches/160-writechannel.patch
new file mode 100644
index 0000000000..0e84a9953e
--- /dev/null
+++ b/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"))