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

Merge branch 'master' of https://github.com/awakecoding/FreeRDP

Browse Source
This commit is contained in:
C-o-r-E 2012-11-14 10:37:03 -05:00
commit cf5cee3f99
7 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/freerdp/utils/msusb.h
View File

@ -120,18 +120,18 @@ struct _MSUSB_CONFIG_DESCRIPTOR
} __attribute__((packed));
/* MSUSB_PIPE exported functions */
void msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, MSUSB_PIPE_DESCRIPTOR** NewMsPipes, UINT32 NewNumberOfPipes);
FREERDP_API void msusb_mspipes_replace(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, MSUSB_PIPE_DESCRIPTOR** NewMsPipes, UINT32 NewNumberOfPipes);
/* MSUSB_INTERFACE exported functions */
void msusb_msinterface_replace(MSUSB_CONFIG_DESCRIPTOR* MsConfig, BYTE InterfaceNumber, MSUSB_INTERFACE_DESCRIPTOR* NewMsInterface);
MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(BYTE* data, UINT32 data_size, int* offset);
int msusb_msinterface_write(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, BYTE* data, int* offset);
FREERDP_API void msusb_msinterface_replace(MSUSB_CONFIG_DESCRIPTOR* MsConfig, BYTE InterfaceNumber, MSUSB_INTERFACE_DESCRIPTOR* NewMsInterface);
FREERDP_API MSUSB_INTERFACE_DESCRIPTOR* msusb_msinterface_read(BYTE* data, UINT32 data_size, int* offset);
FREERDP_API int msusb_msinterface_write(MSUSB_INTERFACE_DESCRIPTOR* MsInterface, BYTE* data, int* offset);
/* MSUSB_CONFIG exported functions */
MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_new();
void msusb_msconfig_free(MSUSB_CONFIG_DESCRIPTOR* MsConfig);
MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(BYTE* data, UINT32 data_size, UINT32 NumInterfaces);
int msusb_msconfig_write(MSUSB_CONFIG_DESCRIPTOR* MsConfg, BYTE* data, int * offset);
void msusb_msconfig_dump(MSUSB_CONFIG_DESCRIPTOR* MsConfg);
FREERDP_API MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_new();
FREERDP_API void msusb_msconfig_free(MSUSB_CONFIG_DESCRIPTOR* MsConfig);
FREERDP_API MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(BYTE* data, UINT32 data_size, UINT32 NumInterfaces);
FREERDP_API int msusb_msconfig_write(MSUSB_CONFIG_DESCRIPTOR* MsConfg, BYTE* data, int * offset);
FREERDP_API void msusb_msconfig_dump(MSUSB_CONFIG_DESCRIPTOR* MsConfg);
#endif

4
libfreerdp/core/nego.c
View File

@ -661,7 +661,7 @@ BOOL nego_send_negotiation_request(rdpNego* nego)
length += cookie_length + 19;
}
DEBUG_NEGO("requested_protocols: %d", nego->RequestedProtocols);
DEBUG_NEGO("requested_protocols: %d", nego->requested_protocols);
if (nego->requested_protocols > PROTOCOL_RDP)
{
@ -702,7 +702,7 @@ void nego_process_negotiation_request(rdpNego* nego, STREAM* s)
stream_read_UINT16(s, length);
stream_read_UINT32(s, nego->requested_protocols);
DEBUG_NEGO("requested_protocols: %d", nego->RequestedProtocols);
DEBUG_NEGO("requested_protocols: %d", nego->requested_protocols);
nego->state = NEGO_STATE_FINAL;
}

4
libfreerdp/core/rpc.c
View File

@ -1015,6 +1015,7 @@ int rpc_recv_pdu(rdpRpc* rpc)
printf("Fragmented PDU\n");
#if 0
while (!(fragHeader.pfc_flags & PFC_LAST_FRAG))
{
bytesRead = 0;
@ -1054,6 +1055,7 @@ int rpc_recv_pdu(rdpRpc* rpc)
totalBytesRead += status;
}
}
#endif
}
if (header->ptype == PTYPE_RTS) /* RTS PDU */
@ -1366,7 +1368,7 @@ rdpRpc* rpc_new(rdpTransport* transport)
rpc->ReceiveWindow = 0x00010000;
rpc->VirtualConnection = rpc_client_virtual_connection_new(rpc);
rpc->call_id = 0;
rpc->call_id = 1;
}
return rpc;

24
libfreerdp/core/tpdu.c
View File

@ -66,8 +66,7 @@
* @return TPDU length indicator (LI)
*/
BYTE
tpdu_read_header(STREAM* s, BYTE* code)
BYTE tpdu_read_header(STREAM* s, BYTE* code)
{
BYTE li;
@ -97,8 +96,7 @@ tpdu_read_header(STREAM* s, BYTE* code)
* @param code TPDU code
*/
void
tpdu_write_header(STREAM* s, UINT16 length, BYTE code)
void tpdu_write_header(STREAM* s, UINT16 length, BYTE code)
{
stream_write_BYTE(s, length); /* LI */
stream_write_BYTE(s, code); /* code */
@ -143,8 +141,7 @@ BYTE tpdu_read_connection_request(STREAM* s)
* @param length TPDU length
*/
void
tpdu_write_connection_request(STREAM* s, UINT16 length)
void tpdu_write_connection_request(STREAM* s, UINT16 length)
{
tpdu_write_header(s, length, X224_TPDU_CONNECTION_REQUEST);
}
@ -155,8 +152,7 @@ tpdu_write_connection_request(STREAM* s, UINT16 length)
* @return length indicator (LI)
*/
BYTE
tpdu_read_connection_confirm(STREAM* s)
BYTE tpdu_read_connection_confirm(STREAM* s)
{
BYTE li;
BYTE code;
@ -178,8 +174,7 @@ tpdu_read_connection_confirm(STREAM* s)
* @param length TPDU length
*/
void
tpdu_write_connection_confirm(STREAM* s, UINT16 length)
void tpdu_write_connection_confirm(STREAM* s, UINT16 length)
{
tpdu_write_header(s, length, X224_TPDU_CONNECTION_CONFIRM);
}
@ -190,8 +185,7 @@ tpdu_write_connection_confirm(STREAM* s, UINT16 length)
* @param length TPDU length
*/
void
tpdu_write_disconnect_request(STREAM* s, UINT16 length)
void tpdu_write_disconnect_request(STREAM* s, UINT16 length)
{
tpdu_write_header(s, length, X224_TPDU_DISCONNECT_REQUEST);
}
@ -201,8 +195,7 @@ tpdu_write_disconnect_request(STREAM* s, UINT16 length)
* @param s stream
*/
void
tpdu_write_data(STREAM* s)
void tpdu_write_data(STREAM* s)
{
tpdu_write_header(s, 2, X224_TPDU_DATA);
}
@ -212,8 +205,7 @@ tpdu_write_data(STREAM* s)
* @param s stream
*/
UINT16
tpdu_read_data(STREAM* s)
UINT16 tpdu_read_data(STREAM* s)
{
BYTE code;
UINT16 li;

1
libfreerdp/core/tpkt.c
View File

@ -68,6 +68,7 @@ BOOL tpkt_verify_header(STREAM* s)
BYTE version;
stream_peek_BYTE(s, version);
if (version == 3)
return TRUE;
else

2
libfreerdp/core/tsg.c
View File

@ -1109,7 +1109,7 @@ int tsg_read(rdpTsg* tsg, BYTE* data, UINT32 length)
if (header->frag_length == 64)
{
printf("Ignoring 64-byte length PDU (probably TsProxySetupPipe return code)\n");
printf("Ignoring 64-byte length PDU (probably TsProxySetupReceivePipe return code)\n");
return tsg_read(tsg, data, length);
}

4
libfreerdp/crypto/certificate.c
View File

@ -148,7 +148,7 @@ void certificate_data_replace(rdpCertificateStore* certificate_store, rdpCertifi
if (!fp)
return;
// Read the current contents of the file.
/* Read the current contents of the file. */
fseek(fp, 0, SEEK_END);
size = ftell(fp);
fseek(fp, 0, SEEK_SET);
@ -164,7 +164,7 @@ void certificate_data_replace(rdpCertificateStore* certificate_store, rdpCertifi
return;
}
// Write the file back out, with appropriate fingerprint substitutions
/* Write the file back out, with appropriate fingerprint substitutions */
fp = fopen(certificate_store->file, "w+");
data[size] = '\n';
data[size + 1] = '\0';