瀏覽代碼

fix tty close patch (#1651)

SVN-Revision: 7148
Felix Fietkau 18 年之前
父節點
當前提交
2b4cd792c1
共有 1 個文件被更改,包括 10 次插入1 次删除
  1. 10 1
      package/dropbear/patches/160-tty_close.patch

+ 10 - 1
package/dropbear/patches/160-tty_close.patch

@@ -1,7 +1,7 @@
 diff -ur db.old/common-channel.c db.dev/common-channel.c
 --- db.old/common-channel.c	2007-02-22 17:17:15.000000000 +0100
 +++ db.dev/common-channel.c	2007-05-06 19:50:19.154943528 +0200
-@@ -309,15 +309,6 @@
+@@ -309,15 +309,15 @@
  			&& (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)) {
  		send_msg_channel_eof(channel);
  	}
@@ -14,6 +14,15 @@ diff -ur db.old/common-channel.c db.dev/common-channel.c
 -		TRACE(("sending close, readfd is closed"))
 -		send_msg_channel_close(channel);
 -	}
++
++	/* And if we can't receive any more data from them either, close up (server only) */
++	if (!channel->sent_close
++			&& channel->readfd == FD_CLOSED
++			&& !ERRFD_IS_WRITE(channel)
++			&& !write_pending(channel)) {
++		TRACE(("sending close, readfd is closed"))
++		send_msg_channel_close(channel);
++	}
  }
  
  /* Check whether a deferred (EINPROGRESS) connect() was successful, and