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

libfreerdp-core/transport: remove unused transport state.

Browse Source
This commit is contained in:
Vic Lee 2011-08-25 13:23:24 +08:00
parent 413824d134
commit 258db78efb
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libfreerdp-core/transport.c
View File

@ -77,8 +77,6 @@ boolean transport_disconnect(rdpTransport* transport)
boolean transport_connect_rdp(rdpTransport* transport)
{
transport->state = TRANSPORT_STATE_RDP;
/* RDP encryption */
return True;
@ -90,7 +88,6 @@ boolean transport_connect_tls(rdpTransport* transport)
transport->tls = tls_new();
transport->layer = TRANSPORT_LAYER_TLS;
transport->state = TRANSPORT_STATE_TLS;
transport->tls->sockfd = transport->tcp->sockfd;
if (tls_connect(transport->tls) != True)
@ -105,7 +102,6 @@ boolean transport_connect_nla(rdpTransport* transport)
transport->tls = tls_new();
transport->layer = TRANSPORT_LAYER_TLS;
transport->state = TRANSPORT_STATE_NLA;
transport->tls->sockfd = transport->tcp->sockfd;
if (tls_connect(transport->tls) != True)
@ -135,8 +131,6 @@ boolean transport_connect_nla(rdpTransport* transport)
boolean transport_accept_rdp(rdpTransport* transport)
{
transport->state = TRANSPORT_STATE_RDP;
/* RDP encryption */
return True;
@ -148,7 +142,6 @@ boolean transport_accept_tls(rdpTransport* transport)
transport->tls = tls_new();
transport->layer = TRANSPORT_LAYER_TLS;
transport->state = TRANSPORT_STATE_TLS;
transport->tls->sockfd = transport->tcp->sockfd;
if (tls_accept(transport->tls, transport->settings->cert_file, transport->settings->privatekey_file) != True)
@ -163,7 +156,6 @@ boolean transport_accept_nla(rdpTransport* transport)
transport->tls = tls_new();
transport->layer = TRANSPORT_LAYER_TLS;
transport->state = TRANSPORT_STATE_NLA;
transport->tls->sockfd = transport->tcp->sockfd;
if (tls_accept(transport->tls, transport->settings->cert_file, transport->settings->privatekey_file) != True)
@ -360,7 +352,6 @@ int transport_check_fds(rdpTransport* transport)
void transport_init(rdpTransport* transport)
{
transport->layer = TRANSPORT_LAYER_TCP;
transport->state = TRANSPORT_STATE_NEGO;
}
boolean transport_set_blocking_mode(rdpTransport* transport, boolean blocking)

11
libfreerdp-core/transport.h
View File

@ -26,16 +26,6 @@ typedef enum
TRANSPORT_LAYER_TLS
} TRANSPORT_LAYER;
typedef enum
{
TRANSPORT_STATE_INITIAL,
TRANSPORT_STATE_NEGO,
TRANSPORT_STATE_RDP,
TRANSPORT_STATE_TLS,
TRANSPORT_STATE_NLA,
TRANSPORT_STATE_FINAL
} TRANSPORT_STATE;
typedef struct rdp_transport rdpTransport;
#include "tcp.h"
@ -55,7 +45,6 @@ struct rdp_transport
STREAM* recv_stream;
STREAM* send_stream;
TRANSPORT_LAYER layer;
TRANSPORT_STATE state;
struct rdp_tcp* tcp;
struct rdp_tls* tls;
struct rdp_settings* settings;