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

More robust option parsing and redo wrapper

Browse Source
This commit is contained in:
Keith Winstein
2012-03-18 03:23:58 -04:00
parent 0e5fd920b1
commit 89d1c88bcf
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/mosh
+5 -6
View File
@@ -170,14 +170,13 @@ if ( $pid == 0 ) { # child
open STDERR, ">&", $pty_slave->fileno() or die; open STDERR, ">&", $pty_slave->fileno() or die;
close $pty_slave; close $pty_slave;
my $s; my @server = ( $server, 'new', '-s' );
if ( defined $port_request ) { if ( defined $port_request ) {
$s = q{sh -c 'MOSH_PORT=$1; shift; MOSH_IP=`set -- $SSH_CONNECTION; echo $3`; exec "$@" $MOSH_IP $MOSH_PORT' -- } . $port_request . ' ' . $server; push @server, ( '-p', $port_request );
} else {
# retain compatibility with older server when no port requested
$s = q{sh -c 'exec "$@" "`set -- $SSH_CONNECTION; echo $3`"' -- } . $server;
} }
exec 'ssh', '-S', 'none', '-o', "ProxyCommand=$0 --fake-proxy -- %h %p", '-t', $userhost, '--', $s;
exec 'ssh', '-S', 'none', '-o', "ProxyCommand=$0 --fake-proxy -- %h %p", '-t', $userhost, '--', @server;
die "Cannot exec ssh: $!\n"; die "Cannot exec ssh: $!\n";
} else { # server } else { # server
my ( $ip, $port, $key ); my ( $ip, $port, $key );
src/frontend/mosh-server.cc
+3
View File
@@ -80,6 +80,7 @@ string get_SSH_IP( void )
char *SSH_writable = strdup( SSH_CONNECTION ); char *SSH_writable = strdup( SSH_CONNECTION );
fatal_assert( SSH_writable ); fatal_assert( SSH_writable );
strtok( SSH_writable, " " ); strtok( SSH_writable, " " );
strtok( NULL, " " );
const char *local_interface_IP = strtok( NULL, " " ); const char *local_interface_IP = strtok( NULL, " " );
fatal_assert( local_interface_IP ); fatal_assert( local_interface_IP );
return string( local_interface_IP ); return string( local_interface_IP );
@@ -139,12 +140,14 @@ int main( int argc, char *argv[] )
/* Sanity-check arguments */ /* Sanity-check arguments */
if ( desired_ip if ( desired_ip
&& ( strspn( desired_ip, "0123456789." ) != strlen( desired_ip ) ) ) { && ( strspn( desired_ip, "0123456789." ) != strlen( desired_ip ) ) ) {
fprintf( stderr, "%s: Bad IP address (%s)\n", argv[ 0 ], desired_ip );
print_usage( argv[ 0 ] ); print_usage( argv[ 0 ] );
exit( 1 ); exit( 1 );
} }
if ( desired_port if ( desired_port
&& ( strspn( desired_ip, "0123456789" ) != strlen( desired_ip ) ) ) { && ( strspn( desired_ip, "0123456789" ) != strlen( desired_ip ) ) ) {
fprintf( stderr, "%s: Bad UDP port (%s)\n", argv[ 0 ], desired_port );
print_usage( argv[ 0 ] ); print_usage( argv[ 0 ] );
exit( 1 ); exit( 1 );
} }