Context Navigation

← Previous Changeset
Next Changeset →

Changeset 9690 in orxonox.OLD

Timestamp:

Aug 22, 2006, 4:45:14 PM (18 years ago)

Author:

bensch

Message:

some network-stuff

Location:

branches/new_class_id/src/lib/network

Files:

: 47 edited

converter.cc (modified) (1 diff)
converter.h (modified) (1 diff)
data_stream.cc (modified) (1 diff)
data_stream.h (modified) (1 diff)
handshake.cc (modified) (1 diff)
handshake.h (modified) (1 diff)
message_manager.cc (modified) (1 diff)
message_manager.h (modified) (1 diff)
monitor/connection_monitor.cc (modified) (1 diff)
monitor/connection_monitor.h (modified) (1 diff)
monitor/network_monitor.cc (modified) (1 diff)
monitor/network_monitor.h (modified) (1 diff)
monitor/network_stats_widget.cc (modified) (1 diff)
monitor/network_stats_widget.h (modified) (1 diff)
network_game_manager.cc (modified) (1 diff)
network_game_manager.h (modified) (1 diff)
network_log.h (modified) (1 diff)
network_manager.cc (modified) (1 diff)
network_manager.h (modified) (1 diff)
network_protocol.cc (modified) (1 diff)
network_protocol.h (modified) (1 diff)
network_socket.cc (modified) (1 diff)
network_socket.h (modified) (1 diff)
network_stream.cc (modified) (1 diff)
network_stream.h (modified) (1 diff)
player_stats.cc (modified) (1 diff)
player_stats.h (modified) (1 diff)
proxy/network_settings.cc (modified) (1 diff)
proxy/network_settings.h (modified) (1 diff)
proxy/proxy_control.cc (modified) (1 diff)
proxy/proxy_control.h (modified) (1 diff)
server_socket.cc (modified) (1 diff)
server_socket.h (modified) (1 diff)
shared_network_data.cc (modified) (1 diff)
shared_network_data.h (modified) (1 diff)
synchronizeable.cc (modified) (2 diffs)
synchronizeable.h (modified) (1 diff)
tcp_server_socket.cc (modified) (1 diff)
tcp_server_socket.h (modified) (1 diff)
tcp_socket.cc (modified) (5 diffs)
tcp_socket.h (modified) (1 diff)
udp_broadcast.cc (modified) (6 diffs)
udp_broadcast.h (modified) (1 diff)
udp_server_socket.cc (modified) (1 diff)
udp_server_socket.h (modified) (1 diff)
udp_socket.cc (modified) (1 diff)
udp_socket.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/new_class_id/src/lib/network/converter.cc

r9406	r9690
28	28	SHELL_COMMAND_STATIC(debug, Converter, Converter::debug);
29	29
30
	30	NewObjectListDefinition(Converter);
31	31	/* using namespace std is default, this needs to be here */
32	32

branches/new_class_id/src/lib/network/converter.h

r7230	r9690
24	24	class Converter : public BaseObject
25	25	{
	26	NewObjectListDeclaration(Converter);
26	27	public:
27	28	static byte* intToByteArray(int x);

branches/new_class_id/src/lib/network/data_stream.cc

-                      r9406
+                      r9690
 /* using namespace std is default, this needs to be here */
+NewObjectListDefinition(DataStream);
 /**

branches/new_class_id/src/lib/network/data_stream.h

-                      r6981
+                      r9690
 class DataStream : public BaseObject
+{
+      public:
+  NewObjectListDeclaration(DataStream);
+  public:
       DataStream();
       DataStream(DataStream& inStream, DataStream& outStream);

branches/new_class_id/src/lib/network/handshake.cc

r9656	r9690
23	23
24	24
25
	25	NewObjectListDefinition(Handshake);
26	26
27	27

branches/new_class_id/src/lib/network/handshake.h

r9494	r9690
42	42	class Handshake : public Synchronizeable
43	43	{
44
	44	NewObjectListDeclaration(Handshake);
45	45	public:
46	46	Handshake( int nodeType, int clientId = 0, int networkGameManagerId = 0, int messageManagerId = 0 );

branches/new_class_id/src/lib/network/message_manager.cc

r9656	r9690
28	28
29	29
30
	30	NewObjectListDefinition(MessageManager);
31	31	MessageManager* MessageManager::singletonRef = NULL;
32	32

branches/new_class_id/src/lib/network/message_manager.h

r9656	r9690
96	96	class MessageManager : public Synchronizeable {
97	97
98
	98	NewObjectListDeclaration(MessageManager);
99	99	public:
100	100	inline static MessageManager * getInstance(){ if (!singletonRef) singletonRef = new MessageManager(); return singletonRef; }

branches/new_class_id/src/lib/network/monitor/connection_monitor.cc

r9494	r9690
23	23	/* using namespace std is default, this needs to be here */
24	24
25
	25	NewObjectListDefinition(ConnectionMonitor);
26	26	/**
27	27	* constructor

branches/new_class_id/src/lib/network/monitor/connection_monitor.h

r9494	r9690
19	19	class ConnectionMonitor : virtual public BaseObject
20	20	{
	21	NewObjectListDeclaration(ConnectionMonitor);
21	22	public:
22	23	ConnectionMonitor( int userId );

branches/new_class_id/src/lib/network/monitor/network_monitor.cc

r9656	r9690
37	37	SHELL_COMMAND(debug, NetworkMonitor, debug);
38	38
	39	NewObjectListDefinition(NetworkMonitor);
39	40
40	41

branches/new_class_id/src/lib/network/monitor/network_monitor.h

r9656	r9690
27	27	class NetworkMonitor : public Synchronizeable
28	28	{
29
	29	NewObjectListDeclaration(NetworkMonitor);
30	30	public:
31	31	NetworkMonitor(NetworkStream* networkStream);

branches/new_class_id/src/lib/network/monitor/network_stats_widget.cc

r9656	r9690
30	30	// ->setAlias("ProxyGui");
31	31
	32	NewObjectListDefinition(NetworkStatsWidget);
32	33
33	34	HostWidget::HostWidget(const std::string& name, const IP& ip)

branches/new_class_id/src/lib/network/monitor/network_stats_widget.h

r9656	r9690
20	20	class HostWidget : public OrxGui::GLGuiBox
21	21	{
	22	NewObjectListDeclaration(HostWidget);
22	23	public:
23	24	HostWidget(const std::string& name, const IP& ip);

branches/new_class_id/src/lib/network/network_game_manager.cc

r9656	r9690
47	47
48	48
49
	49	NewObjectListDefinition(NetworkGameManager);
50	50	NetworkGameManager* NetworkGameManager::singletonRef = NULL;
51	51

branches/new_class_id/src/lib/network/network_game_manager.h

r9656	r9690
33	33	class NetworkGameManager: public Synchronizeable
34	34	{
35
	35	NewObjectListDeclaration(NetworkGameManager);
36	36	public:
37	37	virtual ~NetworkGameManager();

branches/new_class_id/src/lib/network/network_log.h

r7954	r9690
38	38	class NetworkLog
39	39	{
40
41	40	public:
42	41	virtual ~NetworkLog(void);

branches/new_class_id/src/lib/network/network_manager.cc

r9656	r9690
41	41
42	42
43
	43	NewObjectListDefinition(NetworkManager);
44	44	NetworkManager* NetworkManager::singletonRef = NULL;
45	45

branches/new_class_id/src/lib/network/network_manager.h

r9656	r9690
25	25	class NetworkManager : public BaseObject
26	26	{
27
	27	NewObjectListDeclaration(NetworkManager);
28	28	public:
29	29

branches/new_class_id/src/lib/network/network_protocol.cc

r9406	r9690
35	35
36	36
37
	37	NewObjectListDefinition(NetworkManager);
38	38	/**
39	39	standard constructor

branches/new_class_id/src/lib/network/network_protocol.h

r6981	r9690
25	25	class NetworkProtocol : virtual public BaseObject
26	26	{
	27	NewObjectListDeclaration(NetworkProtocol);
27	28	public:
28	29	NetworkProtocol();

branches/new_class_id/src/lib/network/network_socket.cc

-                      r9406
+                      r9690
 #include "network_socket.h"
+/* header for debug output */
+#include "debug.h"
+NewObjectListDefinition(NetworkSocket);
 /**
  * Default constructor

branches/new_class_id/src/lib/network/network_socket.h

r9406	r9690
17	17	class NetworkSocket : public BaseObject
18	18	{
	19	NewObjectListDeclaration(NetworkSocket);
19	20	public:
20	21	NetworkSocket();

branches/new_class_id/src/lib/network/network_stream.cc

r9656	r9690
57	57	#define PACKAGE_SIZE 256
58	58
59
	59	NewObjectListDefinition(NetworkStream);
60	60	/**
61	61	* empty constructor

branches/new_class_id/src/lib/network/network_stream.h

r9656	r9690
33	33	class NetworkStream : public DataStream
34	34	{
35
	35	NewObjectListDeclaration(NetworkStream);
36	36	public:
37	37	NetworkStream();

branches/new_class_id/src/lib/network/player_stats.cc

-                      r9656
+                      r9690
 #include "shell_command.h"
+#include "class_id.h"
 CREATE_FACTORY(PlayerStats, CL_PLAYER_STATS);
+NewObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);
 /**

branches/new_class_id/src/lib/network/player_stats.h

r9656	r9690
36	36	class PlayerStats : public Synchronizeable
37	37	{
38
	38	NewObjectListDeclaration(PlayerStats);
39	39	public:
40	40	PlayerStats( const TiXmlElement* root = NULL );

branches/new_class_id/src/lib/network/proxy/network_settings.cc

r9656	r9690
27	27
28	28
	29	NewObjectListDefinition(NetworkSettings);
29	30
30	31	NetworkSettings* NetworkSettings::singletonRef = NULL;

branches/new_class_id/src/lib/network/proxy/network_settings.h

r9494	r9690
24	24	class NetworkSettings : public BaseObject
25	25	{
26
	26	NewObjectListDeclaration(NetworkSettings);
27	27	public:
28	28	inline static NetworkSettings* getInstance() { if (!NetworkSettings::singletonRef) NetworkSettings::singletonRef = new NetworkSettings();

branches/new_class_id/src/lib/network/proxy/proxy_control.cc

r9656	r9690
41	41
42	42	SHELL_COMMAND(forceReconnect, ProxyControl, forceReconnectionShell);
	43	NewObjectListDefinition(ProxyControl);
43	44
44	45	/**

branches/new_class_id/src/lib/network/proxy/proxy_control.h

r9656	r9690
30	30	class ProxyControl : public Synchronizeable
31	31	{
32
	32	NewObjectListDeclaration(ProxyControl);
33	33	public:
34	34	inline static ProxyControl* getInstance() { if (!ProxyControl::singletonRef) ProxyControl::singletonRef = new ProxyControl();

branches/new_class_id/src/lib/network/server_socket.cc

-                      r7954
+                      r9690
 #include "server_socket.h"
+/* header for debug output */
+#include "debug.h"
+NewObjectListDefinition(ServerSocket);
 /**
  * constructor

branches/new_class_id/src/lib/network/server_socket.h

r9656	r9690
19	19	class ServerSocket : public BaseObject
20	20	{
	21	NewObjectListDeclaration(ServerSocket);
21	22	public:
22	23	ServerSocket( int port);

branches/new_class_id/src/lib/network/shared_network_data.cc

r9494	r9690
25	25
26	26
27
	27	NewObjectListDefinition(SharedNetworkData);
28	28	SharedNetworkData* SharedNetworkData::singletonRef = NULL;
29	29

branches/new_class_id/src/lib/network/shared_network_data.h

r9656	r9690
22	22	class SharedNetworkData : public BaseObject
23	23	{
24
	24	NewObjectListDeclaration(SharedNetworkData);
25	25	public:
26	26	inline static SharedNetworkData* getInstance() { if (!SharedNetworkData::singletonRef) SharedNetworkData::singletonRef = new SharedNetworkData();

branches/new_class_id/src/lib/network/synchronizeable.cc

-                      r9656
+                      r9690
+NewObjectListDefinition(Synchronizeable);
 /**
 …
 Synchronizeable::Synchronizeable()
+{
   this->setClassID(CL_SYNCHRONIZEABLE, "Synchronizeable");
+  this->registerObject(this, Synchronizeable::_objectList);
   this->owner = 0;
 //   this->setIsServer(SharedNetworkData::getInstance()->getHostID() == 0);

branches/new_class_id/src/lib/network/synchronizeable.h

r9406	r9690
41	41	class Synchronizeable : virtual public BaseObject
42	42	{
	43	NewObjectListDeclaration(Synchronizeable);
43	44
44	45	public:

branches/new_class_id/src/lib/network/tcp_server_socket.cc

r9494	r9690
26	26	#include "debug.h"
27	27
	28	NewObjectListDefinition(TcpServerSocket);
28	29	TcpServerSocket::TcpServerSocket( int port ) : ServerSocket( port )
29	30	{

branches/new_class_id/src/lib/network/tcp_server_socket.h

r9406	r9690
19	19	class TcpServerSocket : public ServerSocket
20	20	{
	21	NewObjectListDeclaration(TcpServerSocket);
21	22	public:
22	23	TcpServerSocket( int port );

branches/new_class_id/src/lib/network/tcp_socket.cc

r7954	r9690
30	30	#include "debug.h"
31	31
	32	NewObjectListDefinition(TcpSocket);
32	33	/**
33	34	* Default constructor
…	…
122	123	{
123	124	IPaddress ip;
124
125		bOk = true;
126
	125
	126	bOk = true;
	127
127	128	if ( SDLNet_ResolveHost( &ip, host.c_str(), port ) != 0 )
128	129	{
…	…
131	132	return;
132	133	}
133
	134
134	135	//check if not already connected or listening
135	136	if (tcpSocket)
…	…
345	346	}
346	347	#endif
347
	348
348	349	PRINTF(0)("QUIT READ THREAD\n");
349
	350
350	351	return 0;
351	352	}
…	…
425	426
426	427	return 0;
427
	428
428	429	}
429	430

branches/new_class_id/src/lib/network/tcp_socket.h

r9406	r9690
40	40	class TcpSocket : public NetworkSocket
41	41	{
	42	NewObjectListDeclaration(TcpSocket);
42	43	public:
43	44	TcpSocket();

branches/new_class_id/src/lib/network/udp_broadcast.cc

r8623	r9690
18	18	#include "udp_broadcast.h"
19	19
	20	NewObjectListDefinition(UdpBroadcast);
20	21	/**
21	22	* standard constructor
…	…
26	27	this->port = 0;
27	28	packet = SDLNet_AllocPacket( BROADCAST_PACKET_SIZE );
28
29		if ( !packet )
	29
	30	if ( !packet )
30	31	{
31	32	printf( "SDLNet_AllocPacket: %s\n", SDLNet_GetError() );
32	33	assert( packet );
33	34	}
34
	35
35	36	this->socket = NULL;
36	37	}
…	…
47	48	this->packet = NULL;
48	49	}
49
	50
50	51	if ( this->socket )
51	52	{
…	…
53	54	this->socket = NULL;
54	55	}
55
	56
56	57	}
57	58
58	59	/**
59	60	* listen for incoming broadcast packets
60		* @param port port to listen on
	61	* @param port port to listen on
61	62	* @return true on success
62	63	*/
…	…
74	75	{
75	76	this->port = port;
76
	77
77	78	return true;
78	79	}
…	…
80	81	/**
81	82	* send packet
82		* @param data data to send
	83	* @param data data to send
83	84	* @param length length of data
84	85	* @param ip if ip == NULL broadcast is used

branches/new_class_id/src/lib/network/udp_broadcast.h

-                      r8623
+                      r9690
 class UdpBroadcast
+{
+  NewObjectListDeclaration(UdpBroadcast);
   public:
     UdpBroadcast();
     virtual ~UdpBroadcast();
     bool listen( int port );
     bool open( int port );

branches/new_class_id/src/lib/network/udp_server_socket.cc

r9494	r9690
18	18
19	19
20
	20	NewObjectListDefinition(UdpServerSocket);
21	21	/**
22	22	* constructor

branches/new_class_id/src/lib/network/udp_server_socket.h

r9494	r9690
50	50	class UdpServerSocket : public ServerSocket
51	51	{
	52	NewObjectListDeclaration(UdpServerSocket);
52	53	public:
53	54	UdpServerSocket( int port);

branches/new_class_id/src/lib/network/udp_socket.cc

r9406	r9690
18	18	#include "debug.h"
19	19
	20	NewObjectListDefinition(UdpSocket);
20	21
21	22	void UdpSocket::init( )

branches/new_class_id/src/lib/network/udp_socket.h

r9656	r9690
24	24	class UdpSocket : public NetworkSocket
25	25	{
	26	NewObjectListDeclaration(UdpSocket);
26	27	public:
27	28	UdpSocket();

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 9690 in orxonox.OLD

Legend:

Download in other formats: