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

server: move server_mode to rdpSettings.

Browse Source
This commit is contained in:
Vic Lee 2011-08-21 09:58:05 +08:00
parent 6b5e5505ac
commit 7216323e07
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/freerdp/settings.h
View File

@ -179,6 +179,8 @@ struct rdp_settings
uint32 encryption_level; uint32 encryption_level;
boolean authentication; boolean authentication;
boolean server_mode;
rdpBlob server_random; rdpBlob server_random;
rdpBlob server_certificate; rdpBlob server_certificate;

2
libfreerdp-core/peer.c
View File

@ -23,7 +23,7 @@ static boolean freerdp_peer_initialize(freerdp_peer* client)
{ {
rdpPeer* peer = (rdpPeer*)client->peer; rdpPeer* peer = (rdpPeer*)client->peer;
peer->rdp->server_mode = True; peer->rdp->settings->server_mode = True;
peer->rdp->state = CONNECTION_STATE_INITIAL; peer->rdp->state = CONNECTION_STATE_INITIAL;
return True; return True;

4
libfreerdp-core/rdp.c
View File

@ -182,7 +182,7 @@ boolean rdp_read_header(rdpRdp* rdp, STREAM* s, uint16* length, uint16* channel_
uint16 initiator; uint16 initiator;
enum DomainMCSPDU MCSPDU; enum DomainMCSPDU MCSPDU;
MCSPDU = (rdp->server_mode ? DomainMCSPDU_SendDataRequest : DomainMCSPDU_SendDataIndication); MCSPDU = (rdp->settings->server_mode ? DomainMCSPDU_SendDataRequest : DomainMCSPDU_SendDataIndication);
mcs_read_domain_mcspdu_header(s, &MCSPDU, length); mcs_read_domain_mcspdu_header(s, &MCSPDU, length);
per_read_integer16(s, &initiator, MCS_BASE_CHANNEL_ID); /* initiator (UserId) */ per_read_integer16(s, &initiator, MCS_BASE_CHANNEL_ID); /* initiator (UserId) */
@ -207,7 +207,7 @@ void rdp_write_header(rdpRdp* rdp, STREAM* s, uint16 length, uint16 channel_id)
{ {
enum DomainMCSPDU MCSPDU; enum DomainMCSPDU MCSPDU;
MCSPDU = (rdp->server_mode ? DomainMCSPDU_SendDataIndication : DomainMCSPDU_SendDataRequest); MCSPDU = (rdp->settings->server_mode ? DomainMCSPDU_SendDataIndication : DomainMCSPDU_SendDataRequest);
mcs_write_domain_mcspdu_header(s, MCSPDU, length, 0); mcs_write_domain_mcspdu_header(s, MCSPDU, length, 0);
per_write_integer16(s, rdp->mcs->user_id, MCS_BASE_CHANNEL_ID); /* initiator */ per_write_integer16(s, rdp->mcs->user_id, MCS_BASE_CHANNEL_ID); /* initiator */

1
libfreerdp-core/rdp.h
View File

@ -115,7 +115,6 @@ struct rdp_rdp
{ {
boolean licensed; boolean licensed;
boolean activated; boolean activated;
boolean server_mode;
int state; int state;
struct rdp_mcs* mcs; struct rdp_mcs* mcs;
struct rdp_nego* nego; struct rdp_nego* nego;