--listen was originally added in a96e8ba:
"I added some support to make the client act as a pseudo-server. I'm doing this so it might be possible to have SMOnline written entirelly in Flash." Considering that this never panned out, and --listen doesn't exactly work, I'm removing it.
This commit is contained in:
@@ -124,23 +124,11 @@ void NetworkSyncManager::PostStartUp( const RString& ServerIP )
|
|||||||
LOG->Info( "Attempting to connect to: %s, Port: %d", sAddress.c_str(), iPort );
|
LOG->Info( "Attempting to connect to: %s, Port: %d", sAddress.c_str(), iPort );
|
||||||
|
|
||||||
CloseConnection();
|
CloseConnection();
|
||||||
if( ServerIP!="LISTEN" )
|
if( !Connect(sAddress.c_str(), iPort) )
|
||||||
{
|
{
|
||||||
if( !Connect(sAddress.c_str(), iPort) )
|
m_startupStatus = 2;
|
||||||
{
|
LOG->Warn( "Network Sync Manager failed to connect" );
|
||||||
m_startupStatus = 2;
|
return;
|
||||||
LOG->Warn( "Network Sync Manager failed to connect" );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if( !Listen(iPort) )
|
|
||||||
{
|
|
||||||
m_startupStatus = 2;
|
|
||||||
LOG->Warn( "Listen() failed" );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
FOREACH_PlayerNumber( pn )
|
FOREACH_PlayerNumber( pn )
|
||||||
@@ -204,8 +192,6 @@ void NetworkSyncManager::StartUp()
|
|||||||
|
|
||||||
if( GetCommandlineArgument( "netip", &ServerIP ) )
|
if( GetCommandlineArgument( "netip", &ServerIP ) )
|
||||||
PostStartUp( ServerIP );
|
PostStartUp( ServerIP );
|
||||||
else if( GetCommandlineArgument("listen") )
|
|
||||||
PostStartUp("LISTEN");
|
|
||||||
|
|
||||||
BroadcastReception = new EzSockets;
|
BroadcastReception = new EzSockets;
|
||||||
BroadcastReception->create( IPPROTO_UDP );
|
BroadcastReception->create( IPPROTO_UDP );
|
||||||
@@ -224,42 +210,6 @@ bool NetworkSyncManager::Connect( const RString& addy, unsigned short port )
|
|||||||
return useSMserver;
|
return useSMserver;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Listen (Wait for connection in-bound)
|
|
||||||
// NOTE: Right now, StepMania cannot connect back to StepMania!
|
|
||||||
bool NetworkSyncManager::Listen( unsigned short port )
|
|
||||||
{
|
|
||||||
LOG->Info( "Beginning to Listen" );
|
|
||||||
|
|
||||||
EzSockets *EZListener = new EzSockets;
|
|
||||||
|
|
||||||
EZListener->create();
|
|
||||||
//LOG->Info( "[NetworkSyncManager::Listen] Initializing socket..." );
|
|
||||||
NetPlayerClient->create(); // Initialize Socket
|
|
||||||
|
|
||||||
EZListener->bind( 8765 );
|
|
||||||
|
|
||||||
//LOG->Info( "[NetworkSyncManager::Listen] Listening..." );
|
|
||||||
useSMserver = EZListener->listen();
|
|
||||||
|
|
||||||
//LOG->Info( "[NetworkSyncManager::Listen] Accept NetPlayerClient" );
|
|
||||||
useSMserver = EZListener->accept( *NetPlayerClient ); // Wait for someone to connect
|
|
||||||
|
|
||||||
//LOG->Info( "[NetworkSyncManager::Listen] Kill listener" );
|
|
||||||
EZListener->close(); //Kill listener
|
|
||||||
delete EZListener;
|
|
||||||
|
|
||||||
//LOG->Info("Accept Response: ", useSMserver);
|
|
||||||
useSMserver=true;
|
|
||||||
/*
|
|
||||||
if(useSMserver)
|
|
||||||
LOG->Info( "[NetworkSyncManager::Listen] using SMserver" );
|
|
||||||
else
|
|
||||||
LOG->Info( "[NetworkSyncManager::Listen] not using SMserver" );
|
|
||||||
*/
|
|
||||||
return useSMserver;
|
|
||||||
}
|
|
||||||
|
|
||||||
void NetworkSyncManager::ReportNSSOnOff(int i)
|
void NetworkSyncManager::ReportNSSOnOff(int i)
|
||||||
{
|
{
|
||||||
m_packet.ClearPacket();
|
m_packet.ClearPacket();
|
||||||
|
|||||||
@@ -203,8 +203,6 @@ private:
|
|||||||
|
|
||||||
int m_ServerVersion; // ServerVersion
|
int m_ServerVersion; // ServerVersion
|
||||||
|
|
||||||
bool Listen( unsigned short port );
|
|
||||||
|
|
||||||
PacketFunctions m_packet;
|
PacketFunctions m_packet;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user