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

Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0

Browse Source
This commit is contained in:
Marc-André Moreau 2011-08-24 11:21:55 -04:00
commit d71f84d279
7 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/DirectFB/dfreerdp.c
View File

@ -344,6 +344,7 @@ int dfreerdp_run(freerdp* instance)
freerdp_chanman_free(chanman);
df_free(dfi);
gdi_free(instance);
instance->Disconnect(instance);
freerdp_free(instance);
return 0;

2
client/X11/xf_window.c
View File

@ -94,7 +94,7 @@ boolean xf_GetWindowProperty(xfInfo* xfi, Window window, Atom property, int leng
property, 0, length, False, AnyPropertyType,
&actual_type, &actual_format, nitems, bytes, prop);
if (status != Success)
if (status == None)
return False;
return True;

5
client/X11/xfreerdp.c
View File

@ -597,6 +597,7 @@ int xfreerdp_run(freerdp* instance)
freerdp_chanman_close(chanman, instance);
freerdp_chanman_free(chanman);
instance->Disconnect(instance);
freerdp_free(instance);
xf_free(xfi);
@ -643,7 +644,9 @@ int main(int argc, char* argv[])
chanman = freerdp_chanman_new();
SET_CHANMAN(instance, chanman);
freerdp_parse_args(instance->settings, argc, argv, xf_process_plugin_args, chanman, NULL, NULL);
if (freerdp_parse_args(instance->settings, argc, argv, xf_process_plugin_args, chanman, NULL,
NULL) < 0)
return 1;
data = (struct thread_data*) xzalloc(sizeof(struct thread_data));
data->instance = instance;

2
include/freerdp/freerdp.h
View File

@ -44,6 +44,7 @@ typedef boolean (*pcGetFileDescriptor)(freerdp* instance, void** rfds, int* rcou
typedef boolean (*pcCheckFileDescriptor)(freerdp* instance);
typedef int (*pcSendChannelData)(freerdp* instance, int channelId, uint8* data, int size);
typedef int (*pcReceiveChannelData)(freerdp* instance, int channelId, uint8* data, int size, int flags, int total_size);
typedef void (*pcDisconnect)(freerdp* instance);
struct rdp_freerdp
{
@ -64,6 +65,7 @@ struct rdp_freerdp
pcCheckFileDescriptor CheckFileDescriptor;
pcSendChannelData SendChannelData;
pcReceiveChannelData ReceiveChannelData;
pcDisconnect Disconnect;
};
FREERDP_API freerdp* freerdp_new();

9
libfreerdp-core/freerdp.c
View File

@ -70,6 +70,14 @@ static int freerdp_send_channel_data(freerdp* instance, int channel_id, uint8* d
return rdp_send_channel_data(instance->rdp, channel_id, data, size);
}
void freerdp_disconnect(freerdp* instance)
{
rdpRdp* rdp;
rdp = (rdpRdp*) instance->rdp;
transport_disconnect(rdp->transport);
}
freerdp* freerdp_new()
{
freerdp* instance;
@ -88,6 +96,7 @@ freerdp* freerdp_new()
instance->GetFileDescriptor = freerdp_get_fds;
instance->CheckFileDescriptor = freerdp_check_fds;
instance->SendChannelData = freerdp_send_channel_data;
instance->Disconnect = freerdp_disconnect;
input_register_client_callbacks(rdp->input);
}

14
libfreerdp-core/tcp.c
View File

@ -102,7 +102,6 @@ void tcp_get_mac_address(rdpTcp * tcp)
boolean tcp_connect(rdpTcp* tcp, const char* hostname, uint16 port)
{
int status;
int sockfd = -1;
char servname[10];
struct addrinfo hints = { 0 };
struct addrinfo * res, * ai;
@ -119,30 +118,31 @@ boolean tcp_connect(rdpTcp* tcp, const char* hostname, uint16 port)
return False;
}
tcp->sockfd = -1;
for (ai = res; ai; ai = ai->ai_next)
{
sockfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
tcp->sockfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if (sockfd < 0)
if (tcp->sockfd < 0)
continue;
if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) == 0)
if (connect(tcp->sockfd, ai->ai_addr, ai->ai_addrlen) == 0)
{
printf("connected to %s:%s\n", hostname, servname);
break;
}
sockfd = -1;
close(tcp->sockfd);
tcp->sockfd = -1;
}
freeaddrinfo(res);
if (sockfd == -1)
if (tcp->sockfd == -1)
{
printf("unable to connect to %s:%s\n", hostname, servname);
return False;
}
tcp->sockfd = sockfd;
tcp_get_ip_address(tcp);
tcp_get_mac_address(tcp);

38
libfreerdp-utils/args.c
View File

@ -57,7 +57,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing color depth\n");
return 0;
return -1;
}
settings->color_depth = atoi(argv[index]);
}
@ -67,7 +67,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing username\n");
return 0;
return -1;
}
settings->username = xstrdup(argv[index]);
}
@ -77,7 +77,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing password\n");
return 0;
return -1;
}
settings->password = xstrdup(argv[index]);
settings->autologon = 1;
@ -95,7 +95,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing domain\n");
return 0;
return -1;
}
settings->domain = xstrdup(argv[index]);
}
@ -105,7 +105,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing shell\n");
return 0;
return -1;
}
settings->shell = xstrdup(argv[index]);
}
@ -115,7 +115,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing directory\n");
return 0;
return -1;
}
settings->directory = xstrdup(argv[index]);
}
@ -125,7 +125,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing dimensions\n");
return 0;
return -1;
}
if (strncmp("workarea", argv[index], 1) == 0)
@ -161,7 +161,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing port number\n");
return 0;
return -1;
}
settings->port = atoi(argv[index]);
}
@ -171,7 +171,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing client hostname\n");
return 0;
return -1;
}
strncpy(settings->client_hostname, argv[index], sizeof(settings->client_hostname) - 1);
settings->client_hostname[sizeof(settings->client_hostname) - 1] = 0;
@ -227,7 +227,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing performance flag\n");
return 0;
return -1;
}
if (argv[index][0] == 'm') /* modem */
{
@ -266,7 +266,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing protocol security\n");
return 0;
return -1;
}
if (strncmp("rdp", argv[index], 1) == 0) /* Standard RDP */
{
@ -289,7 +289,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
else
{
printf("unknown protocol security\n");
return 0;
return -1;
}
}
else if (strcmp("--plugin", argv[index]) == 0)
@ -299,7 +299,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing plugin name\n");
return 0;
return -1;
}
plugin_data = NULL;
if (index < argc - 1 && strcmp("--data", argv[index + 1]) == 0)
@ -339,7 +339,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (plugin_callback != NULL)
{
if (!plugin_callback(settings, argv[t], plugin_data, plugin_user_data))
return 0;
return -1;
}
}
else if (strcmp("--ext", argv[index]) == 0)
@ -348,12 +348,12 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc)
{
printf("missing extension name\n");
return 0;
return -1;
}
if (num_extensions >= sizeof(settings->extensions) / sizeof(struct rdp_ext_set))
{
printf("maximum extensions reached\n");
return 0;
return -1;
}
snprintf(settings->extensions[num_extensions].name,
sizeof(settings->extensions[num_extensions].name),
@ -375,7 +375,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
else if (strcmp("--version", argv[index]) == 0)
{
printf("This is FreeRDP version %s\n", FREERDP_VERSION_FULL);
return 0;
return -1;
}
else if (argv[index][0] != '-')
{
@ -416,7 +416,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (t == 0)
{
printf("invalid option: %s\n", argv[index]);
return 0;
return -1;
}
index += t - 1;
}
@ -424,5 +424,5 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
index++;
}
printf("missing server name\n");
return 0;
return -1;
}