Mirrors/proxytunnel
1
0
Fork 0
mirror of https://github.com/proxytunnel/proxytunnel.git synced 2026-01-23 02:34:59 +00:00
Code Issues Projects Releases Wiki Activity

Add IPv6 support

Browse source
This commit is contained in:
Will Mortensen 2016-08-18 10:15:33 -07:00 • committed by Stephen Kent
parent e771c3aaee
commit dbffa1653e
2 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

59
proxytunnel.c
View file

@ -66,45 +66,44 @@ void signal_handler( int signal ) {
* the socket that is connected to the proxy
*/
int tunnel_connect() {
struct sockaddr_in sa;
struct hostent *he;
struct addrinfo hints = {
.ai_family = AF_UNSPEC,
.ai_socktype = SOCK_STREAM,
.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV,
.ai_protocol = 0
};
struct addrinfo * result, * rp;
int rc;
char service[6];
int sd;
/* Create the socket */
if( ( sd = socket( AF_INET, SOCK_STREAM, 0 ) ) < 0 ) {
my_perror("Can not create socket");
rc = snprintf( service, sizeof(service), "%d", args_info.proxyport_arg );
if( ( rc < 0 ) || ( rc >= sizeof(service) ) ) {
/* this should never happen */
message( "snprintf() failed" );
exit(1);
}
/* Lookup the IP address of the proxy */
if( ! ( he = gethostbyname( args_info.proxyhost_arg ) ) ) {
// FIXME: my_perror("Local proxy %s could not be resolved", args_info.proxyhost_arg);
my_perror("Local proxy could not be resolved." );
rc = getaddrinfo( args_info.proxyhost_arg, service, &hints, &result );
if( rc != 0 ) {
message( "getaddrinfo() failed to resolve local proxy: %s\n",
gai_strerror( rc ) );
exit(1);
}
char ip[16];
snprintf(ip, 16, "%d.%d.%d.%d", he->h_addr[0] & 255, he->h_addr[1] & 255, he->h_addr[2] & 255, he->h_addr[3] & 255);
if( args_info.verbose_flag && strcmp(args_info.proxyhost_arg, ip)) {
message( "Local proxy %s resolves to %d.%d.%d.%d\n",
args_info.proxyhost_arg,
he->h_addr[0] & 255,
he->h_addr[1] & 255,
he->h_addr[2] & 255,
he->h_addr[3] & 255 );
for (rp = result; rp != NULL; rp = rp->ai_next) {
sd = socket( rp->ai_family, rp->ai_socktype, rp->ai_protocol );
if( sd < 0 ) {
continue;
}
if( connect( sd, rp->ai_addr, rp->ai_addrlen ) == 0 ) {
break;
}
close(sd);
}
/* Set up the structure to connect to the proxy port of the proxy host */
memset( &sa, '\0', sizeof( sa ) );
sa.sin_family = AF_INET;
memcpy( &sa.sin_addr.s_addr, he->h_addr, 4);
sa.sin_port = htons( args_info.proxyport_arg );
/* Connect the socket */
if( connect( sd, (struct sockaddr*) &sa, sizeof( sa ) ) < 0 ) {
my_perror("connect() failed");
if( rp == NULL ) {
my_perror( "failed to connect to local proxy" );
exit(1);
}
freeaddrinfo(result);
/* Increase interactivity of tunnel, patch by Ingo Molnar */
int flag = 1;