mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ipv6 client support

Browse Source
This commit is contained in:
Jean-Louis Dupond 2014-10-17 12:08:39 +02:00
parent 4c455b8a40
commit 0dc0e01568
2 changed files with 85 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
client/common/cmdline.c
View File

@ -1200,19 +1200,39 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
CommandLineSwitchCase(arg, "v") CommandLineSwitchCase(arg, "v")
{ {
p = strchr(arg->Value, ':'); p = strchr(arg->Value, '[');
/* ipv4 */
if (p) if (!p)
{ {
length = (int) (p - arg->Value); p = strchr(arg->Value, ':');
settings->ServerPort = atoi(&p[1]); if (p)
settings->ServerHostname = (char*) malloc(length + 1); {
strncpy(settings->ServerHostname, arg->Value, length); length = (int) (p - arg->Value);
settings->ServerHostname[length] = '\0'; settings->ServerPort = atoi(&p[1]);
settings->ServerHostname = (char*) malloc(length + 1);
strncpy(settings->ServerHostname, arg->Value, length);
settings->ServerHostname[length] = '\0';
}
else
{
settings->ServerHostname = _strdup(arg->Value);
}
} }
else else /* ipv6 */
{ {
settings->ServerHostname = _strdup(arg->Value); char *p2 = strchr(arg->Value, ']');
/* not a valid [] ipv6 addr found */
if (!p2)
continue;
length = p2 - p;
settings->ServerHostname = (char*) malloc(length);
strncpy(settings->ServerHostname, p+1, length-1);
if (*(p2 + 1) == ':')
{
settings->ServerPort = atoi(&p2[2]);
}
printf("hostname %s port %d\n", settings->ServerHostname, settings->ServerPort);
} }
} }
CommandLineSwitchCase(arg, "spn-class") CommandLineSwitchCase(arg, "spn-class")

55
libfreerdp/core/tcp.c
View File

@ -40,6 +40,8 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <net/if.h> #include <net/if.h>
#include <sys/types.h>
#include <arpa/inet.h>
#ifdef HAVE_POLL_H #ifdef HAVE_POLL_H
#include <poll.h> #include <poll.h>
@ -523,6 +525,7 @@ BOOL tcp_connect(rdpTcp* tcp, const char* hostname, int port, int timeout)
struct timeval tv; struct timeval tv;
#endif #endif
#ifdef NO_IPV6
tcp->socketBio = BIO_new(BIO_s_connect()); tcp->socketBio = BIO_new(BIO_s_connect());
if (!tcp->socketBio) if (!tcp->socketBio)
@ -542,6 +545,58 @@ BOOL tcp_connect(rdpTcp* tcp, const char* hostname, int port, int timeout)
if (tcp->sockfd < 0) if (tcp->sockfd < 0)
return FALSE; return FALSE;
#else /* NO_IPV6 */
struct addrinfo hints = {0};
struct addrinfo *result;
struct addrinfo *tmp;
char port_str[11];
//ZeroMemory(&hints, sizeof(struct addrinfo));
hints.ai_family = AF_UNSPEC; /* Allow IPv4 or IPv6 */
hints.ai_socktype = SOCK_STREAM;
/*
* FIXME: the following is a nasty workaround. Find a cleaner way:
* Either set port manually afterwards or get it passed as string?
*/
snprintf(port_str, 11, "%u", port);
status = getaddrinfo(hostname, port_str, &hints, &result);
if (status) {
fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(status));
return FALSE;
}
/* For now prefer IPv4 over IPv6. */
tmp = result;
if (tmp->ai_family == AF_INET6 && tmp->ai_next != 0)
{
while ((tmp = tmp->ai_next))
{
if (tmp->ai_family == AF_INET)
break;
}
if (!tmp)
tmp = result;
}
tcp->sockfd = socket(tmp->ai_family, tmp->ai_socktype, tmp->ai_protocol);
if (tcp->sockfd < 0) {
freeaddrinfo(result);
return FALSE;
}
if (connect(tcp->sockfd, tmp->ai_addr, tmp->ai_addrlen) < 0) {
fprintf(stderr, "connect: %s\n", strerror(errno));
freeaddrinfo(result);
return FALSE;
}
freeaddrinfo(result);
tcp->socketBio = BIO_new_socket(tcp->sockfd, BIO_NOCLOSE);
/* TODO: make sure the handshake is done by querying the bio */
// if (BIO_should_retry(tcp->socketBio))
// return FALSE;
#endif /* NO_IPV6 */
if (status <= 0) if (status <= 0)
{ {