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

libfreerdp-client: started new command-line syntax

Browse Source
This commit is contained in:
Marc-André Moreau 2012-11-05 22:11:13 -05:00
parent 44a063ee2b
commit 917bb894d7
5 changed files with 311 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
client/X11/xfreerdp.c
View File

@ -468,6 +468,19 @@ int _xf_error_handler(Display* d, XErrorEvent* ev)
return xf_error_handler(d, ev);
}
BOOL xf_detect_new_command_line_syntax(int argc, char* argv[])
{
int index;
for (index = 1; index < argc; index++)
{
if (argv[index][0] == '/')
return TRUE;
}
return FALSE;
}
/**
* Callback given to freerdp_connect() to process the pre-connect operations.
* It will parse the command line parameters given to xfreerdp (using freerdp_parse_args())
@ -495,15 +508,24 @@ BOOL xf_pre_connect(freerdp* instance)
xfi->context->settings = instance->settings;
xfi->instance = instance;
arg_parse_result = freerdp_parse_args(instance->settings, instance->context->argc,instance->context->argv,
if (xf_detect_new_command_line_syntax(instance->context->argc,instance->context->argv))
{
printf("Using new command-line syntax\n");
freerdp_client_parse_command_line_arguments(instance->context->argc,instance->context->argv, instance->settings);
}
else
{
arg_parse_result = freerdp_parse_args(instance->settings, instance->context->argc,instance->context->argv,
xf_process_plugin_args, instance->context->channels, xf_process_client_args, xfi);
if (arg_parse_result < 0)
{
if (arg_parse_result == FREERDP_ARGS_PARSE_FAILURE)
fprintf(stderr, "%s:%d: failed to parse arguments.\n", __FILE__, __LINE__);
exit(XF_EXIT_PARSE_ARGUMENTS);
if (arg_parse_result < 0)
{
if (arg_parse_result == FREERDP_ARGS_PARSE_FAILURE)
fprintf(stderr, "%s:%d: failed to parse arguments.\n", __FILE__, __LINE__);
exit(XF_EXIT_PARSE_ARGUMENTS);
}
}
settings = instance->settings;

3
client/common/CMakeLists.txt
View File

@ -20,6 +20,7 @@ set(MODULE_PREFIX "FREERDP_CLIENT")
set(${MODULE_PREFIX}_SRCS
client.c
cmdline.c
file.c)
set(FREERDP_CHANNELS_CLIENT_PATH "../../channels/client")
@ -40,7 +41,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS MONOLITHIC ${MONOLITHIC_BUILD}
MODULE winpr
MODULES winpr-crt)
MODULES winpr-crt winpr-utils)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

251
client/common/cmdline.c Normal file
View File

@ -0,0 +1,251 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* FreeRDP Client Command-Line Interface
*
* Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <winpr/crt.h>
#include <winpr/cmdline.h>
#include <freerdp/client/cmdline.h>
COMMAND_LINE_ARGUMENT_A args[] =
{
{ "w", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "width" },
{ "h", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "height" },
{ "f", COMMAND_LINE_VALUE_FLAG, NULL, NULL, "fullscreen" },
{ "bpp", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "session bpp (color depth)" },
{ "v", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "destination server" },
{ "admin", COMMAND_LINE_VALUE_FLAG, NULL, "console", "admin (or console) session" },
{ "multimon", COMMAND_LINE_VALUE_FLAG, NULL, NULL, "multi-monitor" },
{ "a", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "addin" },
{ "u", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "username" },
{ "p", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "password" },
{ "d", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "domain" },
{ "z", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "compression" },
{ "audio", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "audio output mode" },
{ "mic", COMMAND_LINE_VALUE_FLAG, NULL, NULL, "audio input (microphone)" },
{ "fonts", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "smooth fonts (cleartype)" },
{ "aero", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "desktop composition" },
{ "window-drag", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "full window drag" },
{ "menu-anims", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "menu animations" },
{ "themes", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "themes" },
{ "wallpaper", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "wallpaper" },
{ "codec", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "codec" },
{ "nego", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "protocol security negotiation" },
{ "sec", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "force specific protocol security" },
{ "sec-rdp", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "rdp protocol security" },
{ "sec-tls", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "tls protocol security" },
{ "sec-nla", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "nla protocol security" },
{ "sec-ext", COMMAND_LINE_VALUE_BOOL, NULL, NULL, "nla extended protocol security" },
{ "cert-name", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, "certificate name" },
{ "cert-ignore", COMMAND_LINE_VALUE_FLAG, NULL, NULL, "ignore certificate" },
{ "ver", COMMAND_LINE_VALUE_FLAG | COMMAND_LINE_FINAL_ARGUMENT, NULL, "version", "print version" },
{ "?", COMMAND_LINE_VALUE_FLAG | COMMAND_LINE_FINAL_ARGUMENT, NULL, "help", "print help" },
{ NULL, 0, NULL, NULL, NULL }
};
int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettings* settings)
{
char* p;
int status;
DWORD flags;
COMMAND_LINE_ARGUMENT_A* arg;
flags = COMMAND_LINE_SIGIL_SLASH | COMMAND_LINE_SEPARATOR_COLON | COMMAND_LINE_SIGIL_PLUS_MINUS;
status = CommandLineParseArgumentsA(argc, (const char**) argv, args, flags);
arg = args;
do
{
if (!(arg->Flags & COMMAND_LINE_VALUE_PRESENT))
continue;
CommandLineSwitchStart(arg)
CommandLineSwitchCase(arg, "v")
{
p = strchr(arg->Value, ':');
settings->hostname = _strdup(arg->Value);
}
CommandLineSwitchCase(arg, "w")
{
settings->width = atoi(arg->Value);
}
CommandLineSwitchCase(arg, "h")
{
settings->height = atoi(arg->Value);
}
CommandLineSwitchCase(arg, "f")
{
settings->fullscreen = TRUE;
}
CommandLineSwitchCase(arg, "bpp")
{
settings->color_depth = atoi(arg->Value);
}
CommandLineSwitchCase(arg, "u")
{
settings->username = _strdup(arg->Value);
}
CommandLineSwitchCase(arg, "d")
{
settings->domain = _strdup(arg->Value);
}
CommandLineSwitchCase(arg, "p")
{
settings->password = _strdup(arg->Value);
}
CommandLineSwitchCase(arg, "z")
{
settings->compression = arg->Value ? TRUE : FALSE;
}
CommandLineSwitchCase(arg, "fonts")
{
settings->smooth_fonts = arg->Value ? TRUE : FALSE;
}
CommandLineSwitchCase(arg, "wallpaper")
{
settings->disable_wallpaper = arg->Value ? FALSE : TRUE;
}
CommandLineSwitchCase(arg, "window-drag")
{
settings->disable_full_window_drag = arg->Value ? FALSE : TRUE;
}
CommandLineSwitchCase(arg, "menu-anims")
{
settings->disable_menu_animations = arg->Value ? FALSE : TRUE;
}
CommandLineSwitchCase(arg, "themes")
{
settings->disable_theming = arg->Value ? FALSE : TRUE;
}
CommandLineSwitchCase(arg, "aero")
{
settings->desktop_composition = arg->Value ? TRUE : FALSE;
}
CommandLineSwitchCase(arg, "nego")
{
settings->security_layer_negotiation = arg->Value ? TRUE : FALSE;
}
CommandLineSwitchCase(arg, "pcid")
{
settings->send_preconnection_pdu = TRUE;
settings->preconnection_id = atoi(arg->Value);
}
CommandLineSwitchCase(arg, "pcb")
{
settings->send_preconnection_pdu = TRUE;
settings->preconnection_blob = _strdup(arg->Value);
}
CommandLineSwitchCase(arg, "sec")
{
if (strcmp("rdp", arg->Value) == 0) /* Standard RDP */
{
settings->rdp_security = TRUE;
settings->tls_security = FALSE;
settings->nla_security = FALSE;
settings->ext_security = FALSE;
settings->encryption = TRUE;
settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
}
else if (strcmp("tls", arg->Value) == 0) /* TLS */
{
settings->rdp_security = FALSE;
settings->tls_security = TRUE;
settings->nla_security = FALSE;
settings->ext_security = FALSE;
}
else if (strcmp("nla", arg->Value) == 0) /* NLA */
{
settings->rdp_security = FALSE;
settings->tls_security = FALSE;
settings->nla_security = TRUE;
settings->ext_security = FALSE;
}
else if (strcmp("ext", arg->Value) == 0) /* NLA Extended */
{
settings->rdp_security = FALSE;
settings->tls_security = FALSE;
settings->nla_security = FALSE;
settings->ext_security = TRUE;
}
else
{
printf("unknown protocol security: %s\n", arg->Value);
}
}
CommandLineSwitchCase(arg, "sec-rdp")
{
settings->rdp_security = arg->Value ? TRUE : FALSE;
}
CommandLineSwitchCase(arg, "sec-tls")
{
settings->tls_security = arg->Value ? TRUE : FALSE;
}
CommandLineSwitchCase(arg, "sec-nla")
{
settings->nla_security = arg->Value ? TRUE : FALSE;
}
CommandLineSwitchCase(arg, "sec-ext")
{
settings->ext_security = arg->Value ? TRUE : FALSE;
}
CommandLineSwitchCase(arg, "cert-name")
{
settings->certificate_name = _strdup(arg->Value);
}
CommandLineSwitchCase(arg, "cert-ignore")
{
settings->ignore_certificate = TRUE;
}
CommandLineSwitchDefault(arg)
{
}
CommandLineSwitchEnd(arg)
}
while ((arg = CommandLineFindNextArgumentA(arg)) != NULL);
settings->performance_flags = PERF_FLAG_NONE;
if (settings->smooth_fonts)
settings->performance_flags |= PERF_ENABLE_FONT_SMOOTHING;
if (settings->desktop_composition)
settings->performance_flags |= PERF_ENABLE_DESKTOP_COMPOSITION;
if (settings->disable_wallpaper)
settings->performance_flags |= PERF_DISABLE_WALLPAPER;
if (settings->disable_full_window_drag)
settings->performance_flags |= PERF_DISABLE_FULLWINDOWDRAG;
if (settings->disable_menu_animations)
settings->performance_flags |= PERF_DISABLE_MENUANIMATIONS;
if (settings->disable_theming)
settings->performance_flags |= PERF_DISABLE_THEMING;
return 1;
}

29
include/freerdp/client/cmdline.h Normal file
View File

@ -0,0 +1,29 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* FreeRDP Client Command-Line Interface
*
* Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef FREERDP_CLIENT_CMDLINE
#define FREERDP_CLIENT_CMDLINE
#include <freerdp/api.h>
#include <freerdp/freerdp.h>
FREERDP_API int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettings* settings);
#endif /* FREERDP_CLIENT_CMDLINE */

7
winpr/libwinpr/utils/cmdline.c
View File

@ -190,13 +190,6 @@ int CommandLineParseArgumentsA(int argc, LPCSTR* argv, COMMAND_LINE_ARGUMENT_A*
if (!match)
continue;
printf("option: %.*s", keyword_length, keyword);
if (value)
printf(" value: %s", value);
printf("\n");
if (value && (options[j].Flags & COMMAND_LINE_VALUE_FLAG))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;