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

Catch network exceptions

Browse Source
This commit is contained in:
Keith Winstein
2011-08-14 03:32:04 -04:00
parent e50b67b845
commit 827d95f6fd
2 changed files with 118 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stm-server.cpp
+55 -51
View File
@@ -135,36 +135,63 @@ void serve( int host_fd )
uint64_t last_remote_num = network.get_remote_state_num(); uint64_t last_remote_num = network.get_remote_state_num();
while ( 1 ) { while ( 1 ) {
int active_fds = poll( pollfds, 2, network.tick() ); try {
if ( active_fds < 0 ) { int active_fds = poll( pollfds, 2, network.tick() );
perror( "poll" ); if ( active_fds < 0 ) {
break; perror( "poll" );
} break;
}
if ( pollfds[ 0 ].revents & POLLIN ) { if ( pollfds[ 0 ].revents & POLLIN ) {
/* packet received from the network */ /* packet received from the network */
network.recv(); network.recv();
/* is new user input available for the terminal? */ /* is new user input available for the terminal? */
if ( network.get_remote_state_num() != last_remote_num ) { if ( network.get_remote_state_num() != last_remote_num ) {
string terminal_to_host; string terminal_to_host;
Network::UserStream us; Network::UserStream us;
us.apply_string( network.get_remote_diff() ); us.apply_string( network.get_remote_diff() );
/* apply userstream to terminal */ /* apply userstream to terminal */
for ( size_t i = 0; i < us.size(); i++ ) { for ( size_t i = 0; i < us.size(); i++ ) {
terminal_to_host += terminal.act( us.get_action( i ) ); terminal_to_host += terminal.act( us.get_action( i ) );
if ( typeid( *us.get_action( i ) ) == typeid( Parser::Resize ) ) { if ( typeid( *us.get_action( i ) ) == typeid( Parser::Resize ) ) {
/* tell child process of resize */ /* tell child process of resize */
const Parser::Resize *res = static_cast<const Parser::Resize *>( us.get_action( i ) ); const Parser::Resize *res = static_cast<const Parser::Resize *>( us.get_action( i ) );
window_size.ws_col = res->width; window_size.ws_col = res->width;
window_size.ws_row = res->height; window_size.ws_row = res->height;
if ( ioctl( host_fd, TIOCSWINSZ, &window_size ) < 0 ) { if ( ioctl( host_fd, TIOCSWINSZ, &window_size ) < 0 ) {
perror( "ioctl TIOCSWINSZ" ); perror( "ioctl TIOCSWINSZ" );
return; return;
}
} }
} }
/* update client with new state of terminal */
network.set_current_state( terminal );
/* write any writeback octets back to the host */
if ( swrite( host_fd, terminal_to_host.c_str(), terminal_to_host.length() ) < 0 ) {
break;
}
} }
}
if ( pollfds[ 1 ].revents & POLLIN ) {
/* input from the host needs to be fed to the terminal */
const int buf_size = 16384;
char buf[ buf_size ];
/* fill buffer if possible */
ssize_t bytes_read = read( pollfds[ 1 ].fd, buf, buf_size );
if ( bytes_read == 0 ) { /* EOF */
return;
} else if ( bytes_read < 0 ) {
perror( "read" );
return;
}
string terminal_to_host = terminal.act( string( buf, bytes_read ) );
/* update client with new state of terminal */ /* update client with new state of terminal */
network.set_current_state( terminal ); network.set_current_state( terminal );
@@ -174,36 +201,13 @@ void serve( int host_fd )
break; break;
} }
} }
}
if ( pollfds[ 1 ].revents & POLLIN ) { if ( (pollfds[ 0 ].revents | pollfds[ 1 ].revents)
/* input from the host needs to be fed to the terminal */ & (POLLERR | POLLHUP | POLLNVAL) ) {
const int buf_size = 16384;
char buf[ buf_size ];
/* fill buffer if possible */
ssize_t bytes_read = read( pollfds[ 1 ].fd, buf, buf_size );
if ( bytes_read == 0 ) { /* EOF */
return;
} else if ( bytes_read < 0 ) {
perror( "read" );
return;
}
string terminal_to_host = terminal.act( string( buf, bytes_read ) );
/* update client with new state of terminal */
network.set_current_state( terminal );
/* write any writeback octets back to the host */
if ( swrite( host_fd, terminal_to_host.c_str(), terminal_to_host.length() ) < 0 ) {
break; break;
} }
} } catch ( Network::NetworkException e ) {
fprintf( stderr, "%s: %s\r\n", e.function.c_str(), strerror( e.the_errno ) );
if ( (pollfds[ 0 ].revents | pollfds[ 1 ].revents)
& (POLLERR | POLLHUP | POLLNVAL) ) {
break;
} }
} }
} }
stm.cpp
+59 -55
View File
@@ -139,70 +139,74 @@ void client( const char *ip, int port, const char *key )
uint64_t last_remote_num = network.get_remote_state_num(); uint64_t last_remote_num = network.get_remote_state_num();
while ( 1 ) { while ( 1 ) {
int active_fds = poll( pollfds, 3, network.tick() ); try {
if ( active_fds < 0 ) { int active_fds = poll( pollfds, 3, network.tick() );
perror( "poll" ); if ( active_fds < 0 ) {
break; perror( "poll" );
} break;
if ( pollfds[ 0 ].revents & POLLIN ) {
/* packet received from the network */
network.recv();
/* is a new frame available from the terminal? */
if ( network.get_remote_state_num() != last_remote_num ) {
string diff = network.get_remote_diff();
swrite( STDOUT_FILENO, diff.data(), diff.size() );
}
}
if ( pollfds[ 1 ].revents & POLLIN ) {
/* input from the user needs to be fed to the network */
const int buf_size = 16384;
char buf[ buf_size ];
/* fill buffer if possible */
ssize_t bytes_read = read( pollfds[ 1 ].fd, buf, buf_size );
if ( bytes_read == 0 ) { /* EOF */
return;
} else if ( bytes_read < 0 ) {
perror( "read" );
return;
} }
for ( int i = 0; i < bytes_read; i++ ) { if ( pollfds[ 0 ].revents & POLLIN ) {
network.get_current_state().push_back( Parser::UserByte( buf[ i ] ) ); /* packet received from the network */
} network.recv();
}
if ( pollfds[ 2 ].revents & POLLIN ) { /* is a new frame available from the terminal? */
/* resize */ if ( network.get_remote_state_num() != last_remote_num ) {
struct signalfd_siginfo info; string diff = network.get_remote_diff();
assert( read( winch_fd, &info, sizeof( info ) ) == sizeof( info ) ); swrite( STDOUT_FILENO, diff.data(), diff.size() );
assert( info.ssi_signo == SIGWINCH ); }
/* get new size */
if ( ioctl( STDIN_FILENO, TIOCGWINSZ, &window_size ) < 0 ) {
perror( "ioctl TIOCGWINSZ" );
return;
} }
/* tell remote emulator */ if ( pollfds[ 1 ].revents & POLLIN ) {
Parser::Resize res( window_size.ws_col, window_size.ws_row ); /* input from the user needs to be fed to the network */
const int buf_size = 16384;
char buf[ buf_size ];
network.get_current_state().push_back( res ); /* fill buffer if possible */
ssize_t bytes_read = read( pollfds[ 1 ].fd, buf, buf_size );
if ( bytes_read == 0 ) { /* EOF */
return;
} else if ( bytes_read < 0 ) {
perror( "read" );
return;
}
/* tell local emulator -- there is probably a safer way to do this */ for ( int i = 0; i < bytes_read; i++ ) {
for ( list< Network::TimestampedState<Terminal::Complete> >::iterator i = network.begin(); network.get_current_state().push_back( Parser::UserByte( buf[ i ] ) );
i != network.end(); }
i++ ) {
i->state.act( &res );
} }
}
if ( (pollfds[ 0 ].revents | pollfds[ 1 ].revents) if ( pollfds[ 2 ].revents & POLLIN ) {
& (POLLERR | POLLHUP | POLLNVAL) ) { /* resize */
break; struct signalfd_siginfo info;
assert( read( winch_fd, &info, sizeof( info ) ) == sizeof( info ) );
assert( info.ssi_signo == SIGWINCH );
/* get new size */
if ( ioctl( STDIN_FILENO, TIOCGWINSZ, &window_size ) < 0 ) {
perror( "ioctl TIOCGWINSZ" );
return;
}
/* tell remote emulator */
Parser::Resize res( window_size.ws_col, window_size.ws_row );
network.get_current_state().push_back( res );
/* tell local emulator -- there is probably a safer way to do this */
for ( list< Network::TimestampedState<Terminal::Complete> >::iterator i = network.begin();
i != network.end();
i++ ) {
i->state.act( &res );
}
}
if ( (pollfds[ 0 ].revents | pollfds[ 1 ].revents)
& (POLLERR | POLLHUP | POLLNVAL) ) {
break;
}
} catch ( Network::NetworkException e ) {
fprintf( stderr, "%s: %s\r\n", e.function.c_str(), strerror( e.the_errno ) );
} }
} }
} }