@ -2149,15 +2149,95 @@ static int proxy_connect(char *host, int port) {
return psock ;
}
char * get_repeater_string ( char * str , int * len ) {
int pren , which = 0 ;
int prestring_len = 0 ;
char * prestring = NULL , * ptmp = NULL ;
char * equals = strchr ( str , ' = ' ) ;
char * plus = strrchr ( str , ' + ' ) ;
* len = 0 ;
if ( ! plus | | ! equals ) {
return NULL ;
}
* plus = ' \0 ' ;
if ( strstr ( str , " repeater= " ) = = str ) {
/* ultravnc repeater http://www.uvnc.com/addons/repeater.html */
prestring_len = 250 ;
ptmp = ( char * ) calloc ( prestring_len + 1 , 1 ) ;
snprintf ( ptmp , 250 , " %s " , str + strlen ( " repeater= " ) ) ;
which = 1 ;
} else if ( strstr ( str , " pre= " ) = = str ) {
prestring_len = strlen ( str + strlen ( " pre= " ) ) ;
ptmp = ( char * ) calloc ( prestring_len + 1 , 1 ) ;
snprintf ( ptmp , prestring_len + 1 , " %s " , str + strlen ( " pre= " ) ) ;
which = 2 ;
} else if ( sscanf ( str , " pre%d= " , & pren ) = = 1 ) {
if ( pren > 0 & & pren < = 16384 ) {
prestring_len = pren ;
ptmp = ( char * ) calloc ( prestring_len + 1 , 1 ) ;
snprintf ( prestring , prestring_len , " %s " , equals + 1 ) ;
which = 3 ;
}
}
if ( ptmp ! = NULL ) {
int i , k = 0 ;
char * p = ptmp ;
prestring = ( char * ) calloc ( prestring_len + 1 , 1 ) ;
/* translate \n to newline, etc. */
for ( i = 0 ; i < prestring_len ; i + + ) {
if ( i < prestring_len - 1 & & * ( p + i ) = = ' \\ ' ) {
if ( * ( p + i + 1 ) = = ' r ' ) {
prestring [ k + + ] = ' \r ' ; i + + ;
} else if ( * ( p + i + 1 ) = = ' n ' ) {
prestring [ k + + ] = ' \n ' ; i + + ;
} else if ( * ( p + i + 1 ) = = ' t ' ) {
prestring [ k + + ] = ' \t ' ; i + + ;
} else if ( * ( p + i + 1 ) = = ' a ' ) {
prestring [ k + + ] = ' \a ' ; i + + ;
} else if ( * ( p + i + 1 ) = = ' b ' ) {
prestring [ k + + ] = ' \b ' ; i + + ;
} else if ( * ( p + i + 1 ) = = ' v ' ) {
prestring [ k + + ] = ' \v ' ; i + + ;
} else if ( * ( p + i + 1 ) = = ' f ' ) {
prestring [ k + + ] = ' \f ' ; i + + ;
} else if ( * ( p + i + 1 ) = = ' \\ ' ) {
prestring [ k + + ] = ' \\ ' ; i + + ;
} else if ( * ( p + i + 1 ) = = ' c ' ) {
prestring [ k + + ] = ' , ' ; i + + ;
} else {
prestring [ k + + ] = * ( p + i ) ;
}
} else {
prestring [ k + + ] = * ( p + i ) ;
}
}
if ( which = = 2 ) {
prestring_len = k ;
}
if ( ! quiet ) {
rfbLog ( " -connect prestring: '%s' \n " , prestring ) ;
}
free ( ptmp ) ;
}
* plus = ' + ' ;
* len = prestring_len ;
return prestring ;
}
/*
* Do a reverse connect for a single " host " or " host:port "
*/
extern int ssl_client_mode ;
static int do_reverse_connect ( char * str ) {
static int do_reverse_connect ( char * str _in ) {
rfbClientPtr cl ;
char * host , * p ;
char * host , * p , * str = str_in , * s = NULL ;
char * prestring = NULL ;
int prestring_len = 0 ;
int rport = 5500 , len = strlen ( str ) ;
if ( len < 1 ) {
@ -2173,6 +2253,24 @@ static int do_reverse_connect(char *str) {
}
if ( unixpw_in_progress ) return 0 ;
/* look for repeater pre-string */
if ( strchr ( str , ' = ' ) & & strrchr ( str , ' + ' )
& & ( strstr ( str , " pre " ) = = str | | strstr ( str , " repeater= " ) = = str ) ) {
prestring = get_repeater_string ( str , & prestring_len ) ;
str = strrchr ( str , ' + ' ) + 1 ;
} else if ( strrchr ( str , ' + ' ) & & strstr ( str , " repeater:// " ) = = str ) {
/* repeater://host:port+string */
/* repeater=string+host:port */
char * plus = strrchr ( str , ' + ' ) ;
str = ( char * ) malloc ( strlen ( str_in ) + 1 ) ;
s = str ;
* plus = ' \0 ' ;
sprintf ( str , " repeater=%s+%s " , plus + 1 , str_in + strlen ( " repeater:// " ) ) ;
prestring = get_repeater_string ( str , & prestring_len ) ;
str = strrchr ( str , ' + ' ) + 1 ;
* plus = ' + ' ;
}
/* copy in to host */
host = ( char * ) malloc ( len + 1 ) ;
if ( ! host ) {
@ -2204,10 +2302,15 @@ static int do_reverse_connect(char *str) {
rfbLog ( " reverse_connect: failed to connect to: %s \n " , str ) ;
return 0 ;
}
if ( prestring ! = NULL ) {
write ( vncsock , prestring , prestring_len ) ;
free ( prestring ) ;
}
# define OPENSSL_REVERSE 4
openssl_init ( 1 ) ;
accept_openssl ( OPENSSL_REVERSE , vncsock ) ;
openssl_init ( 0 ) ;
free ( host ) ;
return 1 ;
}
if ( use_stunnel ) {
@ -2220,17 +2323,17 @@ static int do_reverse_connect(char *str) {
}
if ( unixpw ) {
int is_localhost = 0 , user_disabled = 0 ;
int is_localhost = 0 , user_disabled _it = 0 ;
if ( ! strcmp ( host , " localhost " ) | | ! strcmp ( host , " 127.0.0.1 " ) ) {
is_localhost = 1 ;
}
if ( getenv ( " UNIXPW_DISABLE_LOCALHOST " ) ) {
user_disabled = 1 ;
user_disabled _it = 1 ;
}
if ( ! is_localhost ) {
if ( user_disabled ) {
if ( user_disabled _it ) {
rfbLog ( " reverse_connect: warning disabling localhost constraint in -unixpw \n " ) ;
} else {
rfbLog ( " reverse_connect: error not localhost in -unixpw \n " ) ;
@ -2242,6 +2345,19 @@ static int do_reverse_connect(char *str) {
if ( connect_proxy ! = NULL ) {
int sock = proxy_connect ( host , rport ) ;
if ( sock > = 0 ) {
if ( prestring ! = NULL ) {
write ( sock , prestring , prestring_len ) ;
free ( prestring ) ;
}
cl = rfbNewClient ( screen , sock ) ;
} else {
return 0 ;
}
} else if ( prestring ! = NULL ) {
int sock = rfbConnectToTcpAddr ( host , rport ) ;
if ( sock > = 0 ) {
write ( sock , prestring , prestring_len ) ;
free ( prestring ) ;
cl = rfbNewClient ( screen , sock ) ;
} else {
return 0 ;
runge
17 years ago