[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src ChangeLog NetPanzer/Classes/Netwo...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer/src ChangeLog NetPanzer/Classes/Netwo... |
|
Date: |
Sun, 07 Sep 2003 14:39:33 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/07 14:39:33
Modified files:
src : ChangeLog
src/NetPanzer/Classes/Network: NetworkClient.cpp
NetworkClient.hpp
NetworkServer.cpp
NetworkServer.hpp
ServerConnectDaemon.cpp
src/NetPanzer/Interfaces: ChatInterface.cpp GameManager.cpp
ObjectiveInterface.cpp
PlayerInterface.cpp
PowerUpInterface.cpp UnitInterface.cpp
src/NetPanzer/Interfaces/unix: NetworkClientUnix.cpp
NetworkClientUnix.hpp
NetworkServerUnix.cpp
NetworkServerUnix.hpp
src/UILib/Network: Client.hpp ServerSocket.cpp ServerSocket.hpp
SocketMessage.hpp
Log message:
-cleaned up socket code alot, by removing all this UDP code (a complete
new
and clean network code will be needed sometime anyway...)
-more cleanup in the network code
-added a client version of the SDLNet code
Patches:
Index: netpanzer/src/ChangeLog
diff -u netpanzer/src/ChangeLog:1.7 netpanzer/src/ChangeLog:1.8
--- netpanzer/src/ChangeLog:1.7 Sun Sep 7 10:04:47 2003
+++ netpanzer/src/ChangeLog Sun Sep 7 14:39:32 2003
@@ -2,6 +2,10 @@
-removed NetMessageLog class (because it only contained shit ;-)
-slightly changed NetworkServer and NetworkClient interfaces
-Added a SDL_Net version of the network code
+-cleaned up socket code alot, by removing all this UDP code (a complete new
+ and clean network code will be needed sometime anyway...)
+-more cleanup in the network code
+-added a client version of the SDLNet code
6-Sep-2003 by Matze Braun
-added a unix implementation of _findfirst, _findnext and _findclose
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.5
netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.6
--- netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp:1.5 Sun Sep
7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkClient.cpp Sun Sep 7
14:39:32 2003
@@ -23,7 +23,6 @@
#include "NetworkClient.hpp"
#include "NetworkState.hpp"
-#include "NetMessageLog.hpp"
#include "ClientServerNetMessage.hpp"
#include "ConnectNetMessage.hpp"
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.3
netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp:1.3 Sun Sep
7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkClient.hpp Sun Sep 7
14:39:32 2003
@@ -87,27 +87,25 @@
NetworkClient ();
virtual ~NetworkClient ();
- void activateKeepAlive( void );
- void deactivateKeepAlive( void );
+ void activateKeepAlive();
+ void deactivateKeepAlive();
virtual int openSession() = 0;
- virtual int startEnumeration( ConnectionAddress address ) = 0;
- virtual int startEnumeration( void ) = 0;
- virtual int stopEnumeration( void ) = 0;
- virtual int getSessionList( SessionList &list ) = 0;
+ virtual int startEnumeration(ConnectionAddress address) = 0;
+ virtual int startEnumeration() = 0;
+ virtual int stopEnumeration() = 0;
+ virtual int getSessionList(SessionList &list) = 0;
- virtual int joinSession( void ) = 0;
- virtual int joinSession( int session_index ) = 0;
- virtual int joinSession( const char session_name ) = 0;
- virtual int setJoinSession( const char *session_name ) = 0;
+ virtual int joinSession() = 0;
+ virtual int joinSession(int session_index) = 0;
+ virtual int joinSession(const char* session_name) = 0;
+ virtual int setJoinSession(const char *session_name) = 0;
- virtual int closeSession( void ) = 0;
+ virtual int closeSession() = 0;
- virtual int sendMessage( NetMessage *message, unsigned long size, int
flags
- ) = 0;
-
- virtual int getMessage( NetMessage *message ) = 0;
+ virtual void sendMessage(NetMessage *message, size_t size, int flags) =
0;
+ virtual int getMessage(NetMessage *message) = 0;
};
#endif // ** _NETWORK_CLIENT_HPP
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.5
netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.6
--- netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp:1.5 Sun Sep
7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkServer.cpp Sun Sep 7
14:39:32 2003
@@ -23,9 +23,6 @@
#include "ClientServerNetMessage.hpp"
#include "ServerConnectDaemon.hpp"
-#include "NetMessageLog.hpp"
-
-#include "codewiz.hpp"
#include "ConsoleInterface.hpp"
//***************************************************************
@@ -171,7 +168,7 @@
set_keep_alive_mesg.keep_alive_state = true;
- sendMessage( &set_keep_alive_mesg, sizeof(ClientMesgSetKeepAlive),
client_data->client_id, 0 );
+ sendMessage( client_data->client_id, &set_keep_alive_mesg,
sizeof(ClientMesgSetKeepAlive), 0);
return( true );
}
@@ -193,7 +190,7 @@
set_keep_alive_mesg.keep_alive_state = false;
- sendMessage( &set_keep_alive_mesg, sizeof(ClientMesgSetKeepAlive),
client_data->client_id, 0 );
+ sendMessage( client_data->client_id, &set_keep_alive_mesg,
sizeof(ClientMesgSetKeepAlive), 0 );
return( true );
}
@@ -225,7 +222,7 @@
ping_request_mesg = (ServerMesgPingRequest *) message;
- sendMessage( &ping_ack_mesg, sizeof( ClientMesgPingAck ),
ping_request_mesg->client_id, _network_send_no_guarantee );
+ sendMessage( ping_request_mesg->client_id, &ping_ack_mesg, sizeof(
ClientMesgPingAck ), _network_send_no_guarantee );
}
void NetworkServer::netMessageTransportClientAccept( NetMessage *message )
@@ -240,7 +237,7 @@
player_id = PlayerID( 0, connect_ack_mesg.client_transport_id );
- sendMessage( &connect_ack_mesg, sizeof( ClientMesgConnectAck ), player_id, 0
);
+ sendMessage( player_id, &connect_ack_mesg, sizeof( ClientMesgConnectAck ),
0);
}
@@ -296,7 +293,7 @@
{
ClientMesgKeepAlive server_keepalive;
- sendMessage( &server_keepalive, sizeof( ClientMesgKeepAlive ),
client_data_ptr->client_id, 0 );
+ sendMessage( client_data_ptr->client_id, &server_keepalive, sizeof(
ClientMesgKeepAlive ), 0);
}
}
client_data_ptr = client_list.incIteratorPtr( &iterator );
Index: netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp
diff -u netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp:1.3
netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp:1.4
--- netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp:1.3 Sun Sep
7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Classes/Network/NetworkServer.hpp Sun Sep 7
14:39:32 2003
@@ -114,8 +114,8 @@
virtual void closeSession() = 0;
virtual int sendMessage(NetMessage *message, size_t size, int flags) =
0;
- virtual int sendMessage(NetMessage *message, size_t size,
- const PlayerID
&player_id, int flags) = 0;
+ virtual int sendMessage(const PlayerID& player_id,
+ NetMessage *message,
size_t size, int flags) = 0;
virtual int getMessage(NetMessage *message) = 0;
Index: netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp:1.4
netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp:1.5
--- netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp:1.4 Sun Sep
7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Classes/Network/ServerConnectDaemon.cpp Sun Sep
7 14:39:32 2003
@@ -94,9 +94,8 @@
ClientConnectJoinRequestAck link_ack;
- SERVER->sendMessage( &link_ack,
- sizeof(ClientConnectJoinRequestAck),
- new_player_id, 0 );
+ SERVER->sendMessage( new_player_id, &link_ack,
+ sizeof(ClientConnectJoinRequestAck), 0);
}
}
@@ -146,9 +145,8 @@
{
process_update.queue_position = queue_position;
- SERVER->sendMessage( &process_update,
- sizeof(ConnectProcessUpdate),
- connect_request.new_player_id, 0 );
+ SERVER->sendMessage( connect_request.new_player_id, &process_update,
+ sizeof(ConnectProcessUpdate), 0);
connect_request = connect_queue.incIterator( &iterator, &completed );
@@ -209,10 +207,8 @@
}
- SERVER->sendMessage( &join_request_ack,
- sizeof(ClientConnectJoinRequestAck),
- new_player_id,
- 0 );
+ SERVER->sendMessage( new_player_id, &join_request_ack,
+ sizeof(ClientConnectJoinRequestAck), 0);
}
@@ -292,9 +288,8 @@
int send_ret_val;
- send_ret_val = SERVER->sendMessage( &start_connect,
- sizeof(ClientConnectStartConnect),
- connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id, &start_connect,
+ sizeof(ClientConnectStartConnect), 0);
if( send_ret_val != _network_ok )
{
@@ -359,9 +354,8 @@
{
connect_result.result_code = _connect_result_server_full;
- send_ret_val = SERVER->sendMessage( &connect_result,
- sizeof(ClientConnectResult),
- connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id,
&connect_result,
+ sizeof(ClientConnectResult), 0);
resetConnectFsm();
return( true );
@@ -370,9 +364,8 @@
{
connect_result.result_code = _connect_result_success;
- send_ret_val = SERVER->sendMessage( &connect_result,
- sizeof(ClientConnectResult),
- connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id, &connect_result,
+ sizeof(ClientConnectResult), 0 );
if( send_ret_val != _network_ok )
{
@@ -412,9 +405,8 @@
ConnectMesgServerGameSettings server_game_setup;
GameManager::getServerGameSetup( &server_game_setup );
- send_ret_val = SERVER->sendMessage( &server_game_setup,
-
sizeof(ConnectMesgServerGameSettings),
- connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id,
&server_game_setup,
+
sizeof(ConnectMesgServerGameSettings), 0);
if( send_ret_val != _network_ok )
{
@@ -470,7 +462,7 @@
);
- send_ret_val = SERVER->sendMessage( &player_connect_mesg,
sizeof(PlayerConnectID), connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage(connect_player_id,
&player_connect_mesg, sizeof(PlayerConnectID), 0 );
if( send_ret_val != _network_ok )
{
@@ -483,7 +475,8 @@
ConnectProcessStateMessage state_mesg;
state_mesg.message_enum = _connect_state_message_sync_player_info;
- send_ret_val = SERVER->sendMessage( &state_mesg,
sizeof(ConnectProcessStateMessage), connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id, &state_mesg,
+
sizeof(ConnectProcessStateMessage), 0);
if( send_ret_val != _network_ok )
{
@@ -547,7 +540,7 @@
state_mesg.message_enum =
_connect_state_message_sync_player_info_percent;
state_mesg.percent_complete = percent_complete;
- send_ret_val = SERVER->sendMessage( &state_mesg,
sizeof(ConnectProcessStateMessage), connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id, &state_mesg,
sizeof(ConnectProcessStateMessage), 0);
if( send_ret_val != _network_ok )
{
@@ -559,7 +552,7 @@
UnitInterface::startRemoteUnitSync( connect_player_id );
state_mesg.message_enum = _connect_state_message_sync_units;
- send_ret_val = SERVER->sendMessage( &state_mesg,
sizeof(ConnectProcessStateMessage), connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id, &state_mesg,
sizeof(ConnectProcessStateMessage), 0 );
if( send_ret_val != _network_ok )
{
@@ -588,7 +581,7 @@
{
state_mesg.message_enum =
_connect_state_message_sync_player_info_percent;
state_mesg.percent_complete = percent_complete;
- send_ret_val = SERVER->sendMessage( &state_mesg,
sizeof(ConnectProcessStateMessage), connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id, &state_mesg,
sizeof(ConnectProcessStateMessage), 0 );
if( send_ret_val != _network_ok )
{
@@ -617,7 +610,8 @@
state_mesg.message_enum = _connect_state_message_sync_units_percent;
state_mesg.percent_complete = percent_complete;
- send_ret_val = SERVER->sendMessage( &state_mesg,
sizeof(ConnectProcessStateMessage), connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id, &state_mesg,
+ sizeof(ConnectProcessStateMessage), 0 );
if( send_ret_val != _network_ok )
{
@@ -626,7 +620,7 @@
}
UnitSyncIntegrityCheck unit_integrity_check_mesg;
- send_ret_val = SERVER->sendMessage( &unit_integrity_check_mesg,
sizeof(UnitSyncIntegrityCheck), connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id,
&unit_integrity_check_mesg, sizeof(UnitSyncIntegrityCheck), 0 );
if( send_ret_val != _network_ok )
{
@@ -653,7 +647,7 @@
SERVER->sendMessage( &player_state_update, sizeof(PlayerStateSync), 0 );
state_mesg.message_enum = _connect_state_sync_complete;
- send_ret_val = SERVER->sendMessage( &state_mesg,
sizeof(ConnectProcessStateMessage), connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id, &state_mesg,
sizeof(ConnectProcessStateMessage), 0 );
if( send_ret_val != _network_ok )
{
@@ -672,7 +666,8 @@
{
state_mesg.message_enum = _connect_state_message_sync_units_percent;
state_mesg.percent_complete = percent_complete;
- send_ret_val = SERVER->sendMessage( &state_mesg,
sizeof(ConnectProcessStateMessage), connect_player_id, 0 );
+ send_ret_val = SERVER->sendMessage( connect_player_id, &state_mesg,
+ sizeof(ConnectProcessStateMessage), 0);
if( send_ret_val != _network_ok )
{
Index: netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/ChatInterface.cpp Sun Sep 7
14:39:32 2003
@@ -31,7 +31,7 @@
void ChatInterface::chatMessageRequest( NetMessage *message )
{
- bool post_on_server;
+ bool post_on_server = false;
SystemChatMesg chat_mesg;
SystemChatMesgRequest *chat_request;
@@ -65,7 +65,7 @@
if( PlayerInterface::isAllied( chat_request->source_player_index, i )
== true )
{
if ( (local_player_index != i) )
- { SERVER->sendMessage( &chat_mesg, sizeof(SystemChatMesg),
player_id, 0 ); }
+ { SERVER->sendMessage( player_id, &chat_mesg,
sizeof(SystemChatMesg), 0 ); }
else
{ post_on_server = true; }
}
@@ -78,8 +78,9 @@
}
else
{
- SERVER->sendMessage( &chat_mesg, sizeof(SystemChatMesg),
-
PlayerInterface::getPlayerID(chat_request->source_player_index ) , 0 );
+ SERVER->sendMessage(
+
PlayerInterface::getPlayerID(chat_request->source_player_index),
+ &chat_mesg, sizeof(SystemChatMesg), 0);
}
}
else
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.21
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.22
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.21 Sun Sep 7
10:04:47 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Sun Sep 7 14:39:32 2003
@@ -1105,7 +1105,7 @@
SystemSetPlayerView set_view;
set_view.camera_loc = world_loc;
- SERVER->sendMessage( &set_view, sizeof( SystemSetPlayerView ), player, 0 );
+ SERVER->sendMessage( player, &set_view, sizeof( SystemSetPlayerView ), 0);
}
sound->PlayTankIdle();
@@ -1359,7 +1359,7 @@
(ping_request->client_player_index != 0)
)
{
- SERVER->sendMessage( &ping_ack, sizeof(SystemPingAcknowledge), player_id,
0 );
+ SERVER->sendMessage( player_id, &ping_ack, sizeof(SystemPingAcknowledge),
0 );
}
}
Index: netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.4
netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp:1.4 Sun Sep
7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Interfaces/ObjectiveInterface.cpp Sun Sep 7
14:39:32 2003
@@ -349,8 +349,8 @@
while ( message_encoder.encodeMessage( &sync_mesg,
sizeof(ObjectiveSyncMesg), &encode_message ) )
{
- SERVER->sendMessage( encode_message, encode_message->realSize(),
- connect_player, 0 );
+ SERVER->sendMessage( connect_player, encode_message,
+ encode_message->realSize(),
0);
message_encoder.resetEncoder();
} // ** if
}
@@ -358,7 +358,8 @@
message_encoder.getEncodeMessage( &encode_message );
if ( encode_message != 0 )
{
- SERVER->sendMessage( encode_message, encode_message->realSize(),
connect_player, 0 );
+ SERVER->sendMessage( connect_player, encode_message,
+ encode_message->realSize(),
0);
} // ** if
}
Index: netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/PlayerInterface.cpp Sun Sep 7
14:39:32 2003
@@ -382,8 +382,8 @@
while( message_encoder.encodeMessage( &sync_mesg,
sizeof(PlayerStateSync), &encode_message ) )
{
- send_ret_val = SERVER->sendMessage( encode_message,
encode_message->realSize(),
- player_sync_connect_id, 0 );
+ send_ret_val = SERVER->sendMessage( player_sync_connect_id,
+ encode_message,
encode_message->realSize(),0);
message_encoder.resetEncoder();
if ( send_ret_val != _network_ok )
@@ -403,7 +403,8 @@
message_encoder.getEncodeMessage( &encode_message );
if ( encode_message != 0 )
{
- send_ret_val = SERVER->sendMessage( encode_message,
encode_message->realSize(), player_sync_connect_id, 0 );
+ send_ret_val = SERVER->sendMessage(player_sync_connect_id,
+ encode_message,
encode_message->realSize(), 0);
if ( send_ret_val != _network_ok )
{
Index: netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.4
netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp:1.4 Sat Sep 6
11:39:25 2003
+++ netpanzer/src/NetPanzer/Interfaces/PowerUpInterface.cpp Sun Sep 7
14:39:32 2003
@@ -420,7 +420,7 @@
powerup_ptr->powerup_state.type
);
- SERVER->sendMessage( &create_mesg, sizeof( PowerUpCreateMesg ), player_id,
0 );
+ SERVER->sendMessage( player_id, &create_mesg, sizeof( PowerUpCreateMesg ),
0);
powerup_list.incIteratorPtr( &powerup_ptr );
}
Index: netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.4
netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.5
--- netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.4 Sat Sep 6
06:34:29 2003
+++ netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp Sun Sep 7
14:39:32 2003
@@ -1153,8 +1153,8 @@
sync_message.location = unit_map_loc;
sync_message.unit_state = unit->unit_state;
- send_ret_val = SERVER->sendMessage( &sync_message, sizeof(
UnitIniSyncMessage ),
- sync_units_remote_player, 0 );
+ send_ret_val = SERVER->sendMessage( sync_units_remote_player,
+ &sync_message, sizeof( UnitIniSyncMessage ), 0 );
if ( send_ret_val != _network_ok )
{
Index: netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp:1.2
netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp:1.2 Sun Sep
7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.cpp Sun Sep
7 14:39:33 2003
@@ -16,214 +16,138 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <config.h>
-#include "NetworkClientUnix.hpp"
-
-#include "gapp.hpp"
+#include "Exception.hpp"
+#include "Log.hpp"
+#include "NetworkGlobals.hpp"
#include "NetworkState.hpp"
-#include "NetMessageLog.hpp"
-
-#include "Desktop.hpp"
-
-// XXX stub implementation for now
+#include "NetworkClientUnix.hpp"
NetworkClientUnix::NetworkClientUnix( void )
- : NetworkClient()
+ : NetworkClient(), clientsocket(0)
{
}
NetworkClientUnix::~NetworkClientUnix()
{
+ delete clientsocket;
}
int NetworkClientUnix::openSession()
{
-#if 0
- NetworkClient::openSession( connection_type, session_flags );
-
- if ( connection_type == _connection_loop_back )
- {
- NetworkClientUnix::connection_type = _connection_loop_back;
- return( true );
- }
- else
- {
- NetworkClientUnix::connection_type = connection_type;
- InitWinSock(gapp.hwndApp);
- InitDgramClient(gapp.hwndApp);
- //HACK -- needs to return something real from last two calls--
- return(true);
- }
-#endif
- return true;
- }
+ return true;
+}
-int NetworkClientUnix::startEnumeration( ConnectionAddress address )
- {
-#if 0
- int iReturn;
-
- iReturn = AsyncGetHost(gapp.hwndApp, (LPSTR) address.string_rep );
-
- if(iReturn == WS_OK)
- { return( true ); }
-
- return( false );
-#endif
- return false;
- }
+int NetworkClientUnix::startEnumeration(ConnectionAddress )
+{
+ LOG( ("Server enumeration not implemented yet!") );
+ return false;
+}
int NetworkClientUnix::startEnumeration( )
- {
- Desktop::setVisibility("IPAddressView", true);
- return( true );
- }
+{
+ LOG( ("Server enumeration not implemented yet!") );
+ //Desktop::setVisibility("IPAddressView", true);
+ return false;
+}
int NetworkClientUnix::stopEnumeration( void )
- {
- return( true );
- }
-
-int NetworkClientUnix::getSessionList( SessionList &list )
- {
-#if 0
- SessionInfo session_info;
-
-
- session_list.deallocate();
- list.deallocate();
-
- QueryServer();
-
- if ( GetHostInfo( session_info.name, session_info.map,
session_info.game_type,
- &session_info.current_players, &session_info.max_players )
== true )
- {
- session_list.initialize( 1 );
- list.initialize( 1 );
- memcpy( &session_list[ 0 ], &session_info, sizeof( SessionInfo ) );
- memcpy( &list[ 0 ], &session_info, sizeof( SessionInfo ) );
- }
-#endif
- return( true );
- }
-
-int NetworkClientUnix::joinSession( void )
- {
-#if 0
- if ( InitStreamClient(gapp.hwndApp) == true )
- {
- return( true );
- }
- else
- {
- return( false );
- }
-#endif
- return false;
- }
+{
+ return true;
+}
-int NetworkClientUnix::joinSession( int session_index )
- {
-
- return( false );
- }
+int NetworkClientUnix::getSessionList(SessionList& )
+{
+ LOG( ("SessionList enumeration not implemented yet!") );
+
+ return false;
+}
+
+int NetworkClientUnix::joinSession()
+{
+ return false;
+}
-int NetworkClientUnix::joinSession( const char session_name )
- {
- return( false );
- }
-
-int NetworkClientUnix::setJoinSession( const char *session_name )
- {
- return( true );
- }
-
-int NetworkClientUnix::closeSession( void )
- {
- //ShutdownWinSockClient();
- return( true );
- }
+int NetworkClientUnix::joinSession(int )
+{
+ LOG ( ("Join by session ID not implemented!") );
+ return false;
+}
+
+int NetworkClientUnix::joinSession(const char* session_name)
+{
+ delete clientsocket;
+ clientsocket = 0;
+ try {
+ clientsocket = new ClientSocket(session_name,
_NETPANZER_DEFAULT_PORT_TCP);
+ } catch(Exception e) {
+ LOG( ( "Couldn't connect to server:\n%s.", e.getMessage()) );
+ return false;
+ }
+
+ return true;
+}
+
+int NetworkClientUnix::setJoinSession(const char* )
+{
+ return false;
+}
+
+int NetworkClientUnix::closeSession()
+{
+ delete clientsocket;
+ clientsocket = 0;
+
+ return true;
+}
-int NetworkClientUnix::sendMessage( NetMessage *message, unsigned long size,
int flags )
- {
-#if 0
- if ( connection_type == _connection_loop_back )
- {
- memmove( net_packet.data, (void *) message, size );
- net_packet.packet_size = (unsigned short) size;
- loop_back_recv_queue.enqueue( net_packet );
- }
- else
- {
- if ( connection_status == _connection_status_connected )
- {
- int ret_val;
-
- message->size = size;
-
- if( flags & _network_send_no_guarantee )
- {
- ret_val = WSClientToServer( 0, ( char *) message, size );
- }
- else
- {
- ret_val = WSClientToServer( 1, ( char *) message, size );
- }
-
- if( ret_val != WS_OK )
- {
- connection_status = _connection_status_no_connection;
- return( winsockErrorToNetworkError( ret_val ) );
- }
+void NetworkClientUnix::sendMessage(NetMessage *message, size_t size, int
flags)
+{
+ message->size = size;
+ clientsocket->sendMessage((char*) message, message->size,
+ ! (flags &
_network_send_no_guarantee) );
- NetworkState::incPacketsSent( size );
- }
- } // ** else
-
- return( _network_ok );
-#endif
- return true;
- }
+ NetworkState::incPacketsSent( size );
+}
-int NetworkClientUnix::getMessage( NetMessage *message )
- {
-#if 0
+int NetworkClientUnix::getMessage(NetMessage *message)
+{
updateKeepAliveState();
if ( receive_queue.isReady() )
- {
- receive_queue.dequeue( &net_packet );
+ {
+ receive_queue.dequeue( &net_packet );
- memmove( (void *) message, net_packet.data, net_packet.packet_size );
+ memmove( (void *) message, net_packet.data, net_packet.packet_size );
- //LOG( ( "RECV >> Class: %s ID: %s", NetMessageClassToString( *message),
NetMessageIDtoString( *message ) ) );
+ LOG( ( "RECV >> Class: %d ID: %d", message->message_class,
+
message->message_id) );
- if ( message->message_class == _net_message_class_client_server )
- { processNetMessage( message ); }
+ if ( message->message_class == _net_message_class_client_server )
+ { processNetMessage( message ); }
- NetworkState::incPacketsReceived( net_packet.packet_size );
+ NetworkState::incPacketsReceived( net_packet.packet_size );
- return( true );
- }
+ return true;
+ }
if ( non_guarantee_queue.isReady() )
- {
- non_guarantee_queue.dequeue( &net_packet );
-
- memmove( (void *) message, net_packet.data, net_packet.packet_size );
-
- //LOG( ( "RECV >> Class: %s ID: %s", NetMessageClassToString( *message),
NetMessageIDtoString( *message ) ) );
+ {
+ non_guarantee_queue.dequeue( &net_packet );
+
+ memmove( (void *) message, net_packet.data, net_packet.packet_size );
+
+ LOG( ( "RECV >> Class: %d ID: %d", message->message_class,
+
message->message_id ) );
+
+ if ( message->message_class == _net_message_class_client_server )
+ { processNetMessage( message ); }
+
+ NetworkState::incPacketsReceived( net_packet.packet_size );
+
+ return( true );
+ }
- if ( message->message_class == _net_message_class_client_server )
- { processNetMessage( message ); }
-
- NetworkState::incPacketsReceived( net_packet.packet_size );
-
- return( true );
- }
-
-#endif
-
- return( false );
- }
+ return false;
+}
Index: netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp:1.2
netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp:1.2 Sun Sep
7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Interfaces/unix/NetworkClientUnix.hpp Sun Sep
7 14:39:33 2003
@@ -19,30 +19,32 @@
#define _NETWORK_CLIENT_WINSOCK_HPP
#include "NetworkClient.hpp"
+#include "UILib/Network/ClientSocket.hpp"
class NetworkClientUnix : public NetworkClient
{
public:
- NetworkClientUnix( void );
- ~NetworkClientUnix();
+ NetworkClientUnix();
+ virtual ~NetworkClientUnix();
- virtual int openSession();
+ virtual int openSession();
- virtual int startEnumeration( ConnectionAddress address );
- virtual int startEnumeration( void );
- virtual int stopEnumeration( void );
- virtual int getSessionList( SessionList &list );
+ virtual int startEnumeration(ConnectionAddress address);
+ virtual int startEnumeration();
+ virtual int stopEnumeration();
+ virtual int getSessionList(SessionList &list);
- virtual int joinSession( void );
- virtual int joinSession( int session_index );
- virtual int joinSession( const char session_name );
- virtual int setJoinSession( const char *session_name );
-
- virtual int closeSession( void );
+ virtual int joinSession();
+ virtual int joinSession(int session_index);
+ virtual int joinSession(const char* session_name);
+ virtual int setJoinSession(const char *session_name);
+ virtual int closeSession();
- virtual int sendMessage( NetMessage *message, unsigned long size, int flags
);
-
- virtual int getMessage( NetMessage *message );
+ virtual void sendMessage(NetMessage *message, size_t size, int flags);
+ virtual int getMessage(NetMessage *message);
+
+private:
+ ClientSocket* clientsocket;
};
#endif // ** _NETWORK_CLIENT_WINSOCK_HPP
Index: netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.cpp:1.3 Sun Sep
7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.cpp Sun Sep
7 14:39:33 2003
@@ -47,8 +47,7 @@
void NetworkServerUnix::hostSession()
{
delete serversocket;
- serversocket = new ServerSocket(_NETPANZER_DEFAULT_PORT_TCP,
-
_NETPANZER_DEFAULT_PORT_UDP);
+ serversocket = new ServerSocket(_NETPANZER_DEFAULT_PORT_TCP);
}
void NetworkServerUnix::closeSession()
@@ -57,41 +56,30 @@
serversocket = 0;
}
-void NetworkServerUnix::sendMessage(ServerClientListData *client_data_ptr,
- const
PlayerID& player_id,
-
NetMessage* message, int flags)
+int NetworkServerUnix::sendMessage(const PlayerID& player_id,
+
NetMessage* message, size_t size, int flags)
{
- if( flags & _network_send_no_guarantee )
- {
- if(client_data_ptr==0) {
- client_data_ptr = client_list.getClientData(player_id);
- assert(client_data_ptr != 0);
- }
- message->sequence =
client_data_ptr->no_guarantee_sequence_counter;
- client_data_ptr->no_guarantee_sequence_counter++;
+ LOG( ( "SEND >> Class: %d ID: %d", message->message_class,
+
message->message_id ) );
+ message->size = size;
- serversocket->sendMessage(
- player_id.getNetworkID(),
- (char*) message, message->size, false);
- }
- else
- {
- serversocket->sendMessage(
- player_id.getNetworkID(),
- (char *) message, message->size, true);
+ try {
+ serversocket->sendMessage(player_id.getNetworkID(), (char
*) message,
+ message->size, ! (flags &
_network_send_no_guarantee));
+ } catch(Exception e) {
+ LOG ( ("Network send error when sending to client %d.",
+ player_id.getNetworkID()) );
+ //return -1;
}
NetworkState::incPacketsSent(message->size);
+
+ return 0;
}
int NetworkServerUnix::sendMessage(NetMessage *message, size_t size,
int flags)
{
- message->size = size;
-
- LOG( ( "SEND >> Class: %d ID: %d", message->message_class,
-
message->message_id ) );
-
ServerClientListData *iterator = 0;
ServerClientListData *client_data_ptr = 0;
@@ -102,8 +90,7 @@
while( client_data_ptr != 0 )
{
try {
- sendMessage(client_data_ptr, client_data_ptr->client_id,
- message, flags);
+ sendMessage(client_data_ptr->client_id, message, size,
flags);
} catch(Exception e) {
LOG( ("Error while sending network packet.") );
//return -1;
@@ -115,24 +102,6 @@
return 0;
}
-int NetworkServerUnix::sendMessage( NetMessage *message, size_t size,
- const
PlayerID &player_id, int flags )
-{
- message->size = size;
-
- LOG( ( "SEND >> Class: %d ID: %d", message->message_class,
-
message->message_id ) );
-
- try {
- sendMessage(0, player_id, message, flags);
- } catch(Exception e) {
- LOG( ("Error while sending network packet.") );
- //return -1;
- }
-
- return 0;
-}
-
int NetworkServerUnix::getMessage(NetMessage *message)
{
updateKeepAliveState();
@@ -171,3 +140,4 @@
if(serversocket)
serversocket->read();
}
+
Index: netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.hpp:1.3
netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.hpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.hpp:1.3 Sun Sep
7 10:04:47 2003
+++ netpanzer/src/NetPanzer/Interfaces/unix/NetworkServerUnix.hpp Sun Sep
7 14:39:33 2003
@@ -36,8 +36,8 @@
virtual int sendMessage(NetMessage *message, size_t size,
int flags);
- virtual int sendMessage(NetMessage *message, size_t size,
- const PlayerID
&player_id, int flags);
+ virtual int sendMessage(const PlayerID& player_id,
+ NetMessage *message,
size_t size, int flags);
virtual int getMessage(NetMessage *message);
@@ -46,9 +46,6 @@
virtual void checkIncoming();
private:
- void sendMessage(ServerClientListData *client_data_ptr,
- const PlayerID& player_id,
- NetMessage* message, int flags);
ServerSocket* serversocket;
};
Index: netpanzer/src/UILib/Network/Client.hpp
diff -u netpanzer/src/UILib/Network/Client.hpp:1.1
netpanzer/src/UILib/Network/Client.hpp:1.2
--- netpanzer/src/UILib/Network/Client.hpp:1.1 Sun Sep 7 10:04:48 2003
+++ netpanzer/src/UILib/Network/Client.hpp Sun Sep 7 14:39:33 2003
@@ -3,6 +3,8 @@
#include <SDL_net.h>
+/** This class keep data from a single client that is connected to the server
+ */
class Client
{
public:
Index: netpanzer/src/UILib/Network/ServerSocket.cpp
diff -u netpanzer/src/UILib/Network/ServerSocket.cpp:1.1
netpanzer/src/UILib/Network/ServerSocket.cpp:1.2
--- netpanzer/src/UILib/Network/ServerSocket.cpp:1.1 Sun Sep 7 10:04:48 2003
+++ netpanzer/src/UILib/Network/ServerSocket.cpp Sun Sep 7 14:39:33 2003
@@ -1,5 +1,5 @@
/*
-Copyright (C) 1998 Pyrosoft Inc. (www.pyrosoftgames.com), Matthew Bogue
+Copyright (C) 2003 Matthias Braun <address@hidden>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,16 +31,12 @@
#include "Client.hpp"
#include "Exception.hpp"
-ServerSocket::ServerSocket(Uint16 tcpport, Uint16 udpport)
+ServerSocket::ServerSocket(Uint16 tcpport)
+ : clientlist(0)
{
- udpsocket = SDLNet_UDP_Open(udpport);
- if(!udpsocket)
- throw Exception("couldn't open UDP socket on port %d: %s",
udpport,
- SDLNet_GetError());
-
IPaddress ip;
if(SDLNet_ResolveHost(&ip, 0, tcpport) < 0)
- throw Exception("couldn't resolv address for socket on port %d:
%s",
+ throw Exception("couldn't resolve address for socket on port
%d: %s",
tcpport, SDLNet_GetError());
tcpsocket = SDLNet_TCP_Open(&ip);
if(!tcpsocket)
@@ -54,14 +50,12 @@
{
delete clientlist;
SDLNet_TCP_Close(tcpsocket);
- SDLNet_UDP_Close(udpsocket);
}
void ServerSocket::read()
{
acceptNewClients();
readTCP();
- readUDP();
}
//this function handles accepting a client application that
@@ -77,14 +71,7 @@
while ( (clientsocket = SDLNet_TCP_Accept(tcpsocket)) ) {
Client* client = clientlist->add(clientsocket);
- // We need to request the UDP address of the client
- UDPAddressRequest udpaddressrequest;
- udpaddressrequest.clientid = client->id;
- udpaddressrequest.size = sizeof(UDPAddressRequest);
- sendMessage(client->id, (char*) &udpaddressrequest,
- sizeof(UDPAddressRequest));
-
- // Put the message into the message queue
+ // Put message about connecting client into message queue
TransportClientAccept clientacceptmessage;
clientacceptmessage.client_transport_id = client->id;
EnqueueIncomingPacket(&clientacceptmessage,
@@ -309,105 +296,6 @@
recvoffset = 0;
}
-void ServerSocket::readUDP()
-{
- // XXX should we make this static for efficiency? (and don't care about
the
- // small memory leak)
- UDPpacket* packet = SDLNet_AllocPacket(4096);
- if(!packet)
- throw Exception("out of memory in ReadClientUDP.");
- char *RecvDgram = (char*) packet->data;
-
- //receive the data--
- if (SDLNet_UDP_Recv(udpsocket, packet) == 0) {
- SDLNet_FreePacket(packet);
- return;
- }
-
-#if 0
- Client* client = clientlist->GetClientFromIPAddress(packet.address);
- if(!client) {
- SDLNet_FreePacket(packet);
- return;
- }
-#endif
-
- //Get the message id--
- NetMessage* message = (NetMessage *)RecvDgram;
-
- if ( message->message_class == _net_message_class_winsock )
- {
- switch (message->message_id)
- {
- //TODO: make all these guys work with errors--
- case _net_message_id_basic_info_request:
- {
- BasicInfoRequest* infomessage;
- infomessage = (BasicInfoRequest *)RecvDgram;
-
- char* version = strstr((char
*)infomessage->codeword, _NETPANZER_CODEWORD);
-
- if ((version != 0) )
- {
- BasicGameInfo basicInfo;
- getBasicInfo(basicInfo);
- UDPpacket* sendpacket =
-
SDLNet_AllocPacket(sizeof(BasicGameInfo));
- if(!packet) {
- SDLNet_FreePacket(packet);
- SDLNet_FreePacket(sendpacket);
- throw Exception("Out of
memory.");
- }
- memcpy(packet->data, &basicInfo,
sizeof(BasicGameInfo));
- sendpacket->address = packet->address;
- SDLNet_UDP_Send(udpsocket, -1,
sendpacket);
- SDLNet_FreePacket(sendpacket);
- }
- break;
- }
- case _net_message_id_extended_info_request:
- break;
-
- case _net_message_id_client_udp_address:
- {
- ClientUDPAddress *udpmessage
- = (ClientUDPAddress *)RecvDgram;
- Client::ID id = udpmessage->clientid;
-
- Client* client =
clientlist->getClientFromID(id);
- if (!client || client->udpaddress.host != 0)
- return;
- client->udpaddress = packet->address;
- break;
- }
-
- default:
- break;
- } // ** switch
- } // ** if
- else
- {
- // I just put UDP message into the standard
- // queue on the server side, because all I'm using the UDP
- // for is keepalive message. Also I would have to have a
- // reorder queue for each client on the server.
- EnqueueIncomingPacket(packet->data,
- packet->len,
- 1,
- 0);
- }
-}
-
-void ServerSocket::getBasicInfo(BasicGameInfo& basicInfo) const
-{
- basicInfo.MaxPlayers = (unsigned char)GameConfig::GetNumberPlayers();
- basicInfo.CurrPlayers = PlayerInterface::getActivePlayerCount();
-
- memcpy((char *)basicInfo.GameType, GameConfig::getGameTypeString(), 32);
- memcpy((char *)basicInfo.MapName, GameConfig::getGameMapName(), 32);
- memcpy((char *)basicInfo.PlayerName, GameConfig::GetPlayerName(), 32);
-}
-
/** this function interfaces the network AI code to winsock
* for sending server messages to the client. this
* implementation simply blocks until the entire message
@@ -423,64 +311,15 @@
Client* client = clientlist->getClientFromID(toclient);
if(!client)
throw Exception("message sent to unknown client.");
-
- //udp hack, guarantee should be == 1
- // ** if ((guarantee == 1) || (gUDPDelivery == 0)) **
- // We need to check on a client by client basis
- // whether UDP is enabled instead of based on a global that is set
- // for all clients. I assume this is what you meant and the code
- // above is just legacy code.
-
- if (reliable == 1)
- {
- if (SDLNet_TCP_Send(client->tcpsocket, data, (int) datasize)
- < (int) datasize)
- {
- printf ("Error while sending to Client %lu: %s\n",
client->id,
- SDLNet_GetError());
- clientlist->remove(client);
- return;
- }
-
- // XXX what is the following code fragment good for? (the
original code
- // here was from the WinSock stuff...)
-#if 0
- {
- MSG message;
- while ( gSendReady == 0)
- {
- if ( PeekMessage( &message, 0, 0, 0, PM_NOREMOVE ) )
- {
- if (GetMessage( &message, 0, 0, 0))
- {
- //TranslateMessage(&message);
- DispatchMessage(&message);
- }
- } // ** if PeekMessage
- } // ** while
- gSendReady = 0;
- }
-#endif
- }
- else
- {
- /// XXX we could optimize here by not using SDLNet_AllocPacket,
so that
- //we can avoid the memcpy (but then we're dependent on API
changes in
- //the UDPpacket structure...
- UDPpacket* packet = SDLNet_AllocPacket(datasize);
- if (!packet)
- throw Exception("Out of memeory.");
-
- packet->address = client->udpaddress;
-
- if (SDLNet_UDP_Send(udpsocket, -1, packet) == 0) {
- printf ("Error while sending UDP packet to %d.\n",
client->id);
- SDLNet_FreePacket(packet);
- return;
- }
- SDLNet_FreePacket(packet);
- }
+ // we ignore the reliable flag for now...
+ if (SDLNet_TCP_Send(client->tcpsocket, data, (int) datasize)
+ < (int) datasize)
+ {
+ clientlist->remove(client);
+ throw Exception("Error while sending to client %lu: %s",
client->id,
+ SDLNet_GetError());
+ }
}
void ServerSocket::removeClient(Client::ID clientid)
Index: netpanzer/src/UILib/Network/ServerSocket.hpp
diff -u netpanzer/src/UILib/Network/ServerSocket.hpp:1.1
netpanzer/src/UILib/Network/ServerSocket.hpp:1.2
--- netpanzer/src/UILib/Network/ServerSocket.hpp:1.1 Sun Sep 7 10:04:48 2003
+++ netpanzer/src/UILib/Network/ServerSocket.hpp Sun Sep 7 14:39:33 2003
@@ -1,5 +1,5 @@
/*
-Copyright (C) 1998 Pyrosoft Inc. (www.pyrosoftgames.com), Matthew Bogue
+Copyright (C) 2003 Matthias Braun <address@hidden>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
class ServerSocket
{
public:
- ServerSocket(Uint16 tcpport, Uint16 udpport);
+ ServerSocket(Uint16 tcpport);
~ServerSocket();
void read();
@@ -34,15 +34,10 @@
void removeClient(Client::ID clientid);
private:
- void bindDgram();
void acceptNewClients();
void readTCP();
- void readUDP();
void readClientTCP(Client* client);
- void getBasicInfo(BasicGameInfo& basicInfo) const;
-
- UDPsocket udpsocket;
TCPsocket tcpsocket;
ClientList* clientlist;
};
Index: netpanzer/src/UILib/Network/SocketMessage.hpp
diff -u netpanzer/src/UILib/Network/SocketMessage.hpp:1.1
netpanzer/src/UILib/Network/SocketMessage.hpp:1.2
--- netpanzer/src/UILib/Network/SocketMessage.hpp:1.1 Sun Sep 7 10:04:48 2003
+++ netpanzer/src/UILib/Network/SocketMessage.hpp Sun Sep 7 14:39:33 2003
@@ -48,49 +48,6 @@
} __attribute__((packed));
-
-class ExtendedInfoRequest : public NetMessage
-{
-public:
- char codeword[24];
- DWORD version;
- ExtendedInfoRequest()
- {
- message_class = _net_message_class_winsock;
- message_id = _net_message_id_extended_game_info;
- }
-
-} __attribute__((packed));
-
-
-class UDPAddressRequest : public NetMessage
-{
-public:
- Client::ID clientid;
-
- UDPAddressRequest()
- {
- message_class = _net_message_class_winsock;
- message_id = _net_message_id_udp_request;
- }
-
-} __attribute__((packed));
-
-
-class ClientUDPAddress : public NetMessage
-{
-public:
- Client::ID clientid;
-
- ClientUDPAddress()
- {
- message_class = _net_message_class_winsock;
- message_id = _net_message_id_client_udp_address;
- }
-
-} __attribute__((packed));
-
-
class BasicGameInfo : public NetMessage
{
@@ -108,20 +65,6 @@
message_id = _net_message_id_basic_game_info;
}
-} __attribute__((packed));
-
-
-class ExtendedGameInfo : public NetMessage
-{
-public:
- ExtendedGameInfo()
- {
- message_class = _net_message_class_winsock;
- message_id = _net_message_id_extended_game_info;
- }
-
-
- //TBD
} __attribute__((packed));
#ifdef MSVC
- [netPanzer-CVS] netpanzer/src ChangeLog NetPanzer/Classes/Netwo...,
Matthias Braun <=