From c65ac150ce52216714b01386eaaf0b047867fbb1 Mon Sep 17 00:00:00 2001
From: Vic Lee <llyzs@163.com>
Date: Sun, 3 Jul 2011 10:59:07 +0800
Subject: [PATCH] libfreerdp-core: rename 'network' module to 'transport'

---
 libfreerdp-core/CMakeLists.txt             |  4 ++--
 libfreerdp-core/{network.c => transport.c} | 28 +++++++++++-----------
 libfreerdp-core/{network.h => transport.h} | 24 +++++++++----------
 3 files changed, 28 insertions(+), 28 deletions(-)
 rename libfreerdp-core/{network.c => transport.c} (62%)
 rename libfreerdp-core/{network.h => transport.h} (65%)

diff --git a/libfreerdp-core/CMakeLists.txt b/libfreerdp-core/CMakeLists.txt
index 86b164d3a..9f25c5df3 100644
--- a/libfreerdp-core/CMakeLists.txt
+++ b/libfreerdp-core/CMakeLists.txt
@@ -30,12 +30,12 @@ set(LIBFREERDP_CORE_SRCS
 #	credssp.h
 #	ntlmssp.c
 #	ntlmssp.h
-	network.c
-	network.h
 	tpdu.c
 	tpdu.h
 	tpkt.c
 	tpkt.h
+	transport.c
+	transport.h
 )
 
 add_library(freerdp-core SHARED ${LIBFREERDP_CORE_SRCS})
diff --git a/libfreerdp-core/network.c b/libfreerdp-core/transport.c
similarity index 62%
rename from libfreerdp-core/network.c
rename to libfreerdp-core/transport.c
index 2a244980b..1cd116eef 100644
--- a/libfreerdp-core/network.c
+++ b/libfreerdp-core/transport.c
@@ -23,51 +23,51 @@
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/memory.h>
 
-#include "network.h"
+#include "transport.h"
 
-rdpNetwork *
-network_new(void)
+rdpTransport *
+transport_new(void)
 {
-	rdpNetwork * network;
+	rdpTransport * transport;
 
-	network = (rdpNetwork *) xmalloc(sizeof(rdpNetwork));
-	memset(network, 0, sizeof(rdpNetwork));
+	transport = (rdpTransport *) xmalloc(sizeof(rdpTransport));
+	memset(transport, 0, sizeof(rdpTransport));
 
-	return network;
+	return transport;
 }
 
 void
-network_free(rdpNetwork * network)
+transport_free(rdpTransport * transport)
 {
-	xfree(network);
+	xfree(transport);
 }
 
 int
-network_connect(rdpNetwork * network, const char * server, int port)
+transport_connect(rdpTransport * transport, const char * server, int port)
 {
 	return 0;
 }
 
 int
-network_disconnect(rdpNetwork * network)
+transport_disconnect(rdpTransport * transport)
 {
 	return 0;
 }
 
 int
-network_start_tls(rdpNetwork * network)
+transport_start_tls(rdpTransport * transport)
 {
 	return 0;
 }
 
 int
-network_send(rdpNetwork * network, STREAM * stream)
+transport_send(rdpTransport * transport, STREAM * stream)
 {
 	return 0;
 }
 
 int
-network_check_fds(rdpNetwork * network)
+transport_check_fds(rdpTransport * transport)
 {
 	return 0;
 }
diff --git a/libfreerdp-core/network.h b/libfreerdp-core/transport.h
similarity index 65%
rename from libfreerdp-core/network.h
rename to libfreerdp-core/transport.h
index 71530668f..6fa02cd4d 100644
--- a/libfreerdp-core/network.h
+++ b/libfreerdp-core/transport.h
@@ -17,34 +17,34 @@
  * limitations under the License.
  */
 
-#ifndef __NETWORK_H
-#define __NETWORK_H
+#ifndef __TRANSPORT_H
+#define __TRANSPORT_H
 
 #include <freerdp/utils/stream.h>
 
 typedef int (* PacketReceivedCallback) (STREAM * stream);
 
-struct rdp_network
+struct rdp_transport
 {
 	int sockfd;
 	struct crypto_tls * tls;
 	PacketReceivedCallback * recv_callback;
 };
-typedef struct rdp_network rdpNetwork;
+typedef struct rdp_transport rdpTransport;
 
-rdpNetwork *
-network_new(void);
+rdpTransport *
+transport_new(void);
 void
-network_free(rdpNetwork * network);
+transport_free(rdpTransport * transport);
 int
-network_connect(rdpNetwork * network, const char * server, int port);
+transport_connect(rdpTransport * transport, const char * server, int port);
 int
-network_disconnect(rdpNetwork * network);
+transport_disconnect(rdpTransport * transport);
 int
-network_start_tls(rdpNetwork * network);
+transport_start_tls(rdpTransport * transport);
 int
-network_send(rdpNetwork * network, STREAM * stream);
+transport_send(rdpTransport * transport, STREAM * stream);
 int
-network_check_fds(rdpNetwork * network);
+transport_check_fds(rdpTransport * transport);
 
 #endif