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

[channels,serial] improve command line parsing

Browse Source 
* Gracefully exit on invalid serial driver
* Gracefully exit on onvalid serial port flags
This commit is contained in:
akallabeth 2024-08-23 09:50:30 +02:00
parent 0b21fddef6
commit eb7d8fdeb0
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
channels/serial/client/serial_main.c
View File

@ -858,6 +858,7 @@ FREERDP_ENTRY_POINT(UINT serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS
RDPDR_SERIAL* device = (RDPDR_SERIAL*)pEntryPoints->device; RDPDR_SERIAL* device = (RDPDR_SERIAL*)pEntryPoints->device;
WINPR_ASSERT(device); WINPR_ASSERT(device);
wLog* log = WLog_Get(TAG);
const char* name = device->device.Name; const char* name = device->device.Name;
const char* path = device->Path; const char* path = device->Path;
const char* driver = device->Driver; const char* driver = device->Driver;
@ -865,17 +866,13 @@ FREERDP_ENTRY_POINT(UINT serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS
if (!name || (name[0] == '*')) if (!name || (name[0] == '*'))
{ {
/* TODO: implement auto detection of serial ports */ /* TODO: implement auto detection of serial ports */
WLog_Print(log, WLOG_WARN,
"Serial port autodetection not implemented, nothing will be redirected!");
return CHANNEL_RC_OK; return CHANNEL_RC_OK;
} }
if ((name && name[0]) && (path && path[0])) if ((name && name[0]) && (path && path[0]))
{ {
wLog* log = WLog_Get(TAG);
WLog_Print(log, WLOG_DEBUG, "initializing");
#ifndef __linux__ /* to be removed */
WLog_Print(log, WLOG_WARN, "Serial ports redirection not supported on this platform.");
return CHANNEL_RC_INITIALIZATION_ERROR;
#else /* __linux __ */
WLog_Print(log, WLOG_DEBUG, "Defining %s as %s", name, path); WLog_Print(log, WLOG_DEBUG, "Defining %s as %s", name, path);
if (!DefineCommDevice(name /* eg: COM1 */, path /* eg: /dev/ttyS0 */)) if (!DefineCommDevice(name /* eg: COM1 */, path /* eg: /dev/ttyS0 */))
@ -922,10 +919,10 @@ FREERDP_ENTRY_POINT(UINT serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS
serial->ServerSerialDriverId = SerialDriverSerCx2Sys; serial->ServerSerialDriverId = SerialDriverSerCx2Sys;
else else
{ {
WINPR_ASSERT(FALSE); WLog_Print(serial->log, WLOG_WARN, "Unknown server's serial driver: %s.", driver);
WLog_Print(serial->log, WLOG_DEBUG, WLog_Print(serial->log, WLOG_WARN,
"Unknown server's serial driver: %s. SerCx2 will be used", driver); "Valid options are: 'Serial' (default), 'SerCx' and 'SerCx2'");
serial->ServerSerialDriverId = SerialDriverSerialSys; goto error_out;
} }
} }
else else
@ -942,14 +939,14 @@ FREERDP_ENTRY_POINT(UINT serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS
} }
else else
{ {
WLog_Print(serial->log, WLOG_DEBUG, "Unknown flag: %s", device->Permissive); WLog_Print(serial->log, WLOG_WARN, "Unknown flag: %s", device->Permissive);
WINPR_ASSERT(FALSE); goto error_out;
} }
} }
WLog_Print(serial->log, WLOG_DEBUG, "Server's serial driver: %s (id: %d)", driver, WLog_Print(serial->log, WLOG_DEBUG, "Server's serial driver: %s (id: %d)", driver,
serial->ServerSerialDriverId); serial->ServerSerialDriverId);
/* TODO: implement auto detection of the server's serial driver */
serial->MainIrpQueue = MessageQueue_New(NULL); serial->MainIrpQueue = MessageQueue_New(NULL);
if (!serial->MainIrpQueue) if (!serial->MainIrpQueue)
@ -998,8 +995,6 @@ FREERDP_ENTRY_POINT(UINT serial_DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS
error = ERROR_INTERNAL_ERROR; error = ERROR_INTERNAL_ERROR;
goto error_out; goto error_out;
} }
#endif /* __linux __ */
} }
return error; return error;