izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mosh-server: Treat errors on pty read like EOF

Browse Source 
Fixes #264.
This commit is contained in:
Keegan McAllister
2012-05-05 04:49:28 -04:00
committed by Keith Winstein
parent 9791768705
commit 5bf681629d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/mosh-server.cc
+5 -4
View File
@@ -592,15 +592,16 @@ void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &network
/* fill buffer if possible */ /* fill buffer if possible */
ssize_t bytes_read = read( pollfds[ 1 ].fd, buf, buf_size ); ssize_t bytes_read = read( pollfds[ 1 ].fd, buf, buf_size );
if ( bytes_read == 0 ) { /* EOF */
/* If the pty slave is closed, reading from the master can fail with
EIO (see #264). So we treat errors on read() like EOF. */
if ( bytes_read <= 0 ) {
bytes_read = 0;
if ( !network.has_remote_addr() ) { if ( !network.has_remote_addr() ) {
spin(); /* let 60-second timer take care of this */ spin(); /* let 60-second timer take care of this */
} else if ( !network.shutdown_in_progress() ) { } else if ( !network.shutdown_in_progress() ) {
network.start_shutdown(); network.start_shutdown();
} }
} else if ( bytes_read < 0 ) {
perror( "read" );
return;
} }
string terminal_to_host = terminal.act( string( buf, bytes_read ) ); string terminal_to_host = terminal.act( string( buf, bytes_read ) );