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

rdpdr/printer: ignore unhanded packetID

Browse Source 
Ignore packetIDs PRN_CACHE_DATA and PRN_USING_XPS instead of returning
an error.
This commit is contained in:
Bernhard Miklautz 2015-07-28 14:05:57 +02:00
parent d9aca506d6
commit 9fb6705380
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
channels/rdpdr/client/rdpdr_main.c
View File

@ -851,7 +851,6 @@ static WIN32ERROR rdpdr_process_receive(rdpdrPlugin* rdpdr, wStream* s)
WLog_ERR(TAG, "rdpdr_send_client_name_request failed with error %lu", error); WLog_ERR(TAG, "rdpdr_send_client_name_request failed with error %lu", error);
return error; return error;
} }
if ((error = rdpdr_process_init(rdpdr))) if ((error = rdpdr_process_init(rdpdr)))
{ {
WLog_ERR(TAG, "rdpdr_process_init failed with error %lu", error); WLog_ERR(TAG, "rdpdr_process_init failed with error %lu", error);
@ -909,13 +908,28 @@ static WIN32ERROR rdpdr_process_receive(rdpdrPlugin* rdpdr, wStream* s)
} }
else if (component == RDPDR_CTYP_PRN) else if (component == RDPDR_CTYP_PRN)
{ {
WLog_ERR(TAG, "RDPDR_CTYP_PRN unknown PacketId: 0x%04X", packetId); switch (packetId)
return ERROR_INVALID_DATA; {
case PAKID_PRN_CACHE_DATA:
{
UINT32 eventID;
Stream_Read_UINT32(s, eventID);
WLog_ERR(TAG, "Ignoring unhandled message PAKID_PRN_CACHE_DATA (EventID: 0x%04X)", eventID);
}
break;
case PAKID_PRN_USING_XPS:
WLog_ERR(TAG, "Ignoring unhandled message PAKID_PRN_USING_XPS");
break;
default:
WLog_ERR(TAG, "Unknown printing component packetID: 0x%04X", packetId);
return ERROR_INVALID_DATA;
}
} }
else else
{ {
WLog_ERR(TAG, "unknown message: Component: 0x%04X PacketId: 0x%04X", WLog_ERR(TAG, "Unknown message: Component: 0x%04X PacketId: 0x%04X", component, packetId);
component, packetId);
return ERROR_INVALID_DATA; return ERROR_INVALID_DATA;
} }