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

More graceful quit sequence when UDP is firewalled.

Browse Source
This commit is contained in:
Keith Winstein
2012-05-23 11:48:10 -04:00
parent 8026c924dc
commit c0a8cd61ee
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/stmclient.cc
+2 -1
View File
@@ -112,7 +112,7 @@ void STMClient::shutdown( void )
} }
if ( still_connecting() ) { if ( still_connecting() ) {
fprintf( stderr, "mosh did not make a successful connection to %s:%d.\n", ip.c_str(), port ); fprintf( stderr, "\nmosh did not make a successful connection to %s:%d.\n", ip.c_str(), port );
fprintf( stderr, "Please verify that UDP port %d is not firewalled and can reach the server.\n\n", port ); fprintf( stderr, "Please verify that UDP port %d is not firewalled and can reach the server.\n\n", port );
fprintf( stderr, "(By default, mosh uses a UDP port between 60000 and 61000. The -p option\nselects a specific UDP port number.)\n" ); fprintf( stderr, "(By default, mosh uses a UDP port between 60000 and 61000. The -p option\nselects a specific UDP port number.)\n" );
} else if ( network ) { } else if ( network ) {
@@ -388,6 +388,7 @@ void STMClient::main( void )
&& (timestamp() - network->get_latest_remote_state().timestamp > 250) ) { && (timestamp() - network->get_latest_remote_state().timestamp > 250) ) {
if ( timestamp() - network->get_latest_remote_state().timestamp > 15000 ) { if ( timestamp() - network->get_latest_remote_state().timestamp > 15000 ) {
if ( !network->shutdown_in_progress() ) { if ( !network->shutdown_in_progress() ) {
overlays.get_notification_engine().set_notification_string( wstring( L"Timed out waiting for server, exiting..." ), true );
network->start_shutdown(); network->start_shutdown();
} }
} }