|
|
@@ -8,18 +8,17 @@
|
|
|
|
|
|
// Inhalt der ChatServer Klasse aus ChatServer.h
|
|
|
// Konstruktor
|
|
|
-ChatServer::ChatServer( InitDatei *zIni )
|
|
|
+ChatServer::ChatServer( InitDatei* zIni )
|
|
|
: Thread()
|
|
|
{
|
|
|
Network::Start( 100 );
|
|
|
std::cout << "CS: Verbindung mit Datenbank wird hergestellt...\n";
|
|
|
db = new CSDatenbank( zIni );
|
|
|
- klientAnzahl = 0;
|
|
|
klients = new RCArray< CSKlient >();
|
|
|
empfangen = 0;
|
|
|
gesendet = 0;
|
|
|
fehler = new Text();
|
|
|
- ini = dynamic_cast<InitDatei *>( zIni->getThis() );
|
|
|
+ ini = dynamic_cast<InitDatei*>(zIni->getThis());
|
|
|
id = *zIni->zWert( "ServerId" );
|
|
|
server = new Server();
|
|
|
aServer = new SSLServer();
|
|
|
@@ -61,18 +60,18 @@ void ChatServer::runn()
|
|
|
{
|
|
|
while( !end && aServer->isConnected() )
|
|
|
{
|
|
|
- SSLSKlient *klient;
|
|
|
+ SSLSKlient* klient;
|
|
|
klient = aServer->getKlient();
|
|
|
if( end && klient )
|
|
|
{
|
|
|
klient->trenne();
|
|
|
- klient = (SSLSKlient *)klient->release();
|
|
|
+ klient = (SSLSKlient*)klient->release();
|
|
|
Sleep( 1000 );
|
|
|
return;
|
|
|
}
|
|
|
if( !klient )
|
|
|
continue;
|
|
|
- CSAKlient *clHandle = new CSAKlient( klient, dynamic_cast<ChatServer *>( getThis() ) );
|
|
|
+ CSAKlient* clHandle = new CSAKlient( klient, dynamic_cast<ChatServer*>(getThis()) );
|
|
|
clHandle->start();
|
|
|
}
|
|
|
}
|
|
|
@@ -81,15 +80,14 @@ void ChatServer::thread()
|
|
|
{
|
|
|
while( server->isConnected() )
|
|
|
{
|
|
|
- SKlient *klient;
|
|
|
+ SKlient* klient;
|
|
|
klient = server->getKlient();
|
|
|
if( !klient )
|
|
|
continue;
|
|
|
Framework::getThreadRegister()->cleanUpClosedThreads();
|
|
|
- CSKlient *clHandle = new CSKlient( klient, dynamic_cast<ChatServer *>( getThis() ) );
|
|
|
+ CSKlient* clHandle = new CSKlient( klient, dynamic_cast<ChatServer*>(getThis()) );
|
|
|
cs.lock();
|
|
|
- klients->set( clHandle, klientAnzahl );
|
|
|
- klientAnzahl++;
|
|
|
+ klients->add( clHandle );
|
|
|
cs.unlock();
|
|
|
clHandle->start();
|
|
|
}
|
|
|
@@ -103,15 +101,14 @@ void ChatServer::close()
|
|
|
warteAufThread( 1000 );
|
|
|
#endif
|
|
|
cs.lock();
|
|
|
- for( int i = 0; i < klientAnzahl; i++ )
|
|
|
- klients->z( i )->absturz();
|
|
|
- klients = ( RCArray<CSKlient> * )klients->release();
|
|
|
- klientAnzahl = 0;
|
|
|
+ for( CSKlient* client : *klients )
|
|
|
+ client->absturz();
|
|
|
+ klients = (RCArray<CSKlient> *)klients->release();
|
|
|
cs.unlock();
|
|
|
ende();
|
|
|
run = 0;
|
|
|
end = 1;
|
|
|
- Klient *klient = new Klient();
|
|
|
+ Klient* klient = new Klient();
|
|
|
klient->verbinde( aServer->getPort(), "127.0.0.1" );
|
|
|
Sleep( 500 );
|
|
|
aServer->trenne();
|
|
|
@@ -209,13 +206,12 @@ bool ChatServer::absturzKlient( int klientId )
|
|
|
{
|
|
|
bool gefunden = 0;
|
|
|
cs.lock();
|
|
|
- for( int i = 0; i < klientAnzahl; i++ )
|
|
|
+ for( int i = 0; i < klients->getEintragAnzahl(); i++ )
|
|
|
{
|
|
|
if( klients->z( i )->getKlientNummer() == klientId )
|
|
|
{
|
|
|
klients->z( i )->absturz();
|
|
|
klients->remove( i );
|
|
|
- klientAnzahl--;
|
|
|
gefunden = 1;
|
|
|
i--;
|
|
|
}
|
|
|
@@ -228,12 +224,11 @@ bool ChatServer::removeAccount( int accId )
|
|
|
{
|
|
|
bool gefunden = 0;
|
|
|
cs.lock();
|
|
|
- for( int i = 0; i < klientAnzahl; i++ )
|
|
|
+ for( int i = 0; i < klients->getEintragAnzahl(); i++ )
|
|
|
{
|
|
|
if( klients->z( i )->getAccountId() == accId )
|
|
|
{
|
|
|
klients->remove( i );
|
|
|
- klientAnzahl--;
|
|
|
gefunden = 1;
|
|
|
i--;
|
|
|
}
|
|
|
@@ -246,13 +241,12 @@ bool ChatServer::removeKlient( int klientId )
|
|
|
{
|
|
|
bool gefunden = 0;
|
|
|
cs.lock();
|
|
|
- for( int i = 0; i < klientAnzahl; i++ )
|
|
|
+ for( int i = 0; i < klients->getEintragAnzahl(); i++ )
|
|
|
{
|
|
|
if( klients->z( i )->getKlientNummer() == klientId )
|
|
|
{
|
|
|
klients->z( i )->trenne();
|
|
|
klients->remove( i );
|
|
|
- klientAnzahl--;
|
|
|
gefunden = 1;
|
|
|
i--;
|
|
|
}
|
|
|
@@ -261,17 +255,16 @@ bool ChatServer::removeKlient( int klientId )
|
|
|
return gefunden;
|
|
|
}
|
|
|
|
|
|
-bool ChatServer::removeKlient( CSKlient *zKlient )
|
|
|
+bool ChatServer::removeKlient( CSKlient* zKlient )
|
|
|
{
|
|
|
bool gefunden = 0;
|
|
|
cs.lock();
|
|
|
- for( int i = 0; i < klientAnzahl; i++ )
|
|
|
+ for( int i = 0; i < klients->getEintragAnzahl(); i++ )
|
|
|
{
|
|
|
if( klients->z( i ) == zKlient )
|
|
|
{
|
|
|
klients->z( i )->trenne();
|
|
|
klients->remove( i );
|
|
|
- klientAnzahl--;
|
|
|
gefunden = 1;
|
|
|
break;
|
|
|
}
|
|
|
@@ -290,12 +283,12 @@ void ChatServer::addEmpfangen( int bytes )
|
|
|
empfangen += bytes;
|
|
|
}
|
|
|
|
|
|
-int ChatServer::getKlientStatus( int klientNummer, CSKlient *zKlient )
|
|
|
+int ChatServer::getKlientStatus( int klientNummer, CSKlient* zKlient )
|
|
|
{
|
|
|
bool empf = 0;
|
|
|
bool send = 0;
|
|
|
cs.lock();
|
|
|
- for( int i = 0; i < klientAnzahl; i++ )
|
|
|
+ for( int i = 0; i < klients->getEintragAnzahl(); i++ )
|
|
|
{
|
|
|
if( klients->z( i )->getKlientNummer() == klientNummer && klients->z( i ) != zKlient )
|
|
|
{
|
|
|
@@ -313,11 +306,11 @@ int ChatServer::getKlientStatus( int klientNummer, CSKlient *zKlient )
|
|
|
return 2;
|
|
|
}
|
|
|
|
|
|
-CSKlient *ChatServer::zSendeKlient( int accountId )
|
|
|
+CSKlient* ChatServer::zSendeKlient( int accountId )
|
|
|
{
|
|
|
- CSKlient *ret = 0;
|
|
|
+ CSKlient* ret = 0;
|
|
|
cs.lock();
|
|
|
- for( int i = 0; i < klientAnzahl; i++ )
|
|
|
+ for( int i = 0; i < klients->getEintragAnzahl(); i++ )
|
|
|
{
|
|
|
if( klients->z( i )->getAccountId() == accountId && !klients->z( i )->istEmpfang() )
|
|
|
{
|
|
|
@@ -335,19 +328,19 @@ bool ChatServer::istAn() const
|
|
|
return db->serverIstNichtPausiert( id );
|
|
|
}
|
|
|
|
|
|
-Server *ChatServer::zServer() const
|
|
|
+Server* ChatServer::zServer() const
|
|
|
{
|
|
|
return server;
|
|
|
}
|
|
|
|
|
|
-CSDatenbank *ChatServer::zDB() const
|
|
|
+CSDatenbank* ChatServer::zDB() const
|
|
|
{
|
|
|
return db;
|
|
|
}
|
|
|
|
|
|
bool ChatServer::hatClients() const
|
|
|
{
|
|
|
- return klientAnzahl > 0;
|
|
|
+ return klients->hat( 0 );
|
|
|
}
|
|
|
|
|
|
int ChatServer::getId() const
|
|
|
@@ -355,7 +348,7 @@ int ChatServer::getId() const
|
|
|
return id;
|
|
|
}
|
|
|
|
|
|
-char *ChatServer::getLetzterFehler() const
|
|
|
+char* ChatServer::getLetzterFehler() const
|
|
|
{
|
|
|
return fehler->getText();
|
|
|
}
|
|
|
@@ -363,7 +356,7 @@ char *ChatServer::getLetzterFehler() const
|
|
|
|
|
|
// Inhalt der CSAKlient Klasse aus ChatServer.h
|
|
|
// Konstruktor
|
|
|
-CSAKlient::CSAKlient( SSLSKlient *klient, ChatServer *cs )
|
|
|
+CSAKlient::CSAKlient( SSLSKlient* klient, ChatServer* cs )
|
|
|
: Thread()
|
|
|
{
|
|
|
this->klient = klient;
|
|
|
@@ -401,14 +394,14 @@ void CSAKlient::thread()
|
|
|
{
|
|
|
klient->sende( "\1", 1 );
|
|
|
unsigned char nLen = 0;
|
|
|
- klient->getNachricht( (char *)&nLen, 1 );
|
|
|
- char *n = new char[ nLen + 1 ];
|
|
|
+ klient->getNachricht( (char*)&nLen, 1 );
|
|
|
+ char* n = new char[ nLen + 1 ];
|
|
|
n[ (int)nLen ] = 0;
|
|
|
if( nLen )
|
|
|
klient->getNachricht( n, nLen );
|
|
|
unsigned char pLen = 0;
|
|
|
- klient->getNachricht( (char *)&pLen, 1 );
|
|
|
- char *p = new char[ pLen + 1 ];
|
|
|
+ klient->getNachricht( (char*)&pLen, 1 );
|
|
|
+ char* p = new char[ pLen + 1 ];
|
|
|
p[ (int)pLen ] = 0;
|
|
|
if( pLen )
|
|
|
klient->getNachricht( p, pLen );
|
|
|
@@ -445,7 +438,7 @@ void CSAKlient::thread()
|
|
|
{
|
|
|
if( !cs->serverStarten() )
|
|
|
{
|
|
|
- Text *err = new Text();
|
|
|
+ Text* err = new Text();
|
|
|
err->append( cs->getLetzterFehler() );
|
|
|
errorZuKlient( err->getText() );
|
|
|
err->release();
|
|
|
@@ -468,7 +461,7 @@ void CSAKlient::thread()
|
|
|
klient->sende( "\1", 1 );
|
|
|
else
|
|
|
{
|
|
|
- Text *err = new Text();
|
|
|
+ Text* err = new Text();
|
|
|
err->append( cs->getLetzterFehler() );
|
|
|
errorZuKlient( err->getText() );
|
|
|
err->release();
|
|
|
@@ -492,7 +485,7 @@ void CSAKlient::thread()
|
|
|
ok = 1;
|
|
|
else
|
|
|
{
|
|
|
- Text *err = new Text();
|
|
|
+ Text* err = new Text();
|
|
|
err->append( cs->getLetzterFehler() );
|
|
|
errorZuKlient( err->getText() );
|
|
|
err->release();
|
|
|
@@ -577,7 +570,7 @@ void CSAKlient::thread()
|
|
|
klient->sende( "\1", 1 );
|
|
|
else
|
|
|
{
|
|
|
- Text *err = new Text();
|
|
|
+ Text* err = new Text();
|
|
|
err->append( cs->getLetzterFehler() );
|
|
|
errorZuKlient( err->getText() );
|
|
|
err->release();
|
|
|
@@ -599,14 +592,14 @@ void CSAKlient::thread()
|
|
|
{
|
|
|
klient->sende( "\1", 1 );
|
|
|
int maxC = 0;
|
|
|
- klient->getNachricht( (char *)&maxC, 4 );
|
|
|
+ klient->getNachricht( (char*)&maxC, 4 );
|
|
|
if( cs->zDB()->adminHatRecht( adminId, Admin_Recht::CSMCChange ) )
|
|
|
{
|
|
|
if( cs->setMaxKlients( maxC ) )
|
|
|
klient->sende( "\1", 1 );
|
|
|
else
|
|
|
{
|
|
|
- Text *err = new Text();
|
|
|
+ Text* err = new Text();
|
|
|
err->append( cs->getLetzterFehler() );
|
|
|
errorZuKlient( err->getText() );
|
|
|
err->release();
|
|
|
@@ -621,7 +614,7 @@ void CSAKlient::thread()
|
|
|
{
|
|
|
klient->sende( "\1", 1 );
|
|
|
int klientId = 0;
|
|
|
- klient->getNachricht( (char *)&klientId, 4 );
|
|
|
+ klient->getNachricht( (char*)&klientId, 4 );
|
|
|
if( klientId && cs->absturzKlient( klientId ) )
|
|
|
klient->sende( "\1", 1 );
|
|
|
else
|
|
|
@@ -643,7 +636,7 @@ void CSAKlient::thread()
|
|
|
delete this;
|
|
|
}
|
|
|
|
|
|
-void CSAKlient::errorZuKlient( const char *nachricht ) const // sendet eine Fehlernachricht zum Klient
|
|
|
+void CSAKlient::errorZuKlient( const char* nachricht ) const // sendet eine Fehlernachricht zum Klient
|
|
|
{
|
|
|
klient->sende( "\3", 1 );
|
|
|
char len = (char)textLength( nachricht );
|
|
|
@@ -654,13 +647,13 @@ void CSAKlient::errorZuKlient( const char *nachricht ) const // sendet eine Fehl
|
|
|
|
|
|
// Inhalt der CSKlient aus ChatServer.h
|
|
|
// Konstruktor
|
|
|
-CSKlient::CSKlient( SKlient *klient, ChatServer *cs )
|
|
|
+CSKlient::CSKlient( SKlient* klient, ChatServer* cs )
|
|
|
: Thread()
|
|
|
{
|
|
|
this->klient = klient;
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
klientNummer = 0;
|
|
|
this->cs = cs;
|
|
|
accountId = 0;
|
|
|
@@ -699,10 +692,10 @@ void CSKlient::absturz()
|
|
|
if( empfangen )
|
|
|
{
|
|
|
cs->zDB()->unregisterKlient( klientNummer, cs->getId() );
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->accountOffline( accountId );
|
|
|
delete weiter;
|
|
|
- }
|
|
|
+}
|
|
|
}
|
|
|
|
|
|
void CSKlient::thread()
|
|
|
@@ -719,7 +712,7 @@ void CSKlient::thread()
|
|
|
switch( c )
|
|
|
{
|
|
|
case 1: // Klient identifikation
|
|
|
- klient->getNachrichtEncrypted( (char *)&klientNummer, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&klientNummer, 4 );
|
|
|
if( !cs->zDB()->proveKlient( klientNummer, cs->getId() ) )
|
|
|
{
|
|
|
klientNummer = 0;
|
|
|
@@ -744,7 +737,7 @@ void CSKlient::thread()
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Text *key = cs->zDB()->getKlientKey( klientNummer );
|
|
|
+ Text* key = cs->zDB()->getKlientKey( klientNummer );
|
|
|
if( !key )
|
|
|
errorZuKlient( "Es konnte kein Schlüssel ermittelt werden." );
|
|
|
else
|
|
|
@@ -756,7 +749,7 @@ void CSKlient::thread()
|
|
|
if( status == 1 )
|
|
|
{
|
|
|
empfangen = 0;
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->accountOnline( accountId );
|
|
|
delete weiter;
|
|
|
br = 1;
|
|
|
@@ -777,7 +770,7 @@ void CSKlient::thread()
|
|
|
if( 1 )
|
|
|
{
|
|
|
int klientId = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&klientId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&klientId, 4 );
|
|
|
if( klientId && cs->absturzKlient( klientId ) )
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
else
|
|
|
@@ -803,7 +796,7 @@ void CSKlient::thread()
|
|
|
if( !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht Identifiziert." );
|
|
|
break;
|
|
|
@@ -824,8 +817,8 @@ void CSKlient::thread()
|
|
|
{
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int id = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&id, 4 ) );
|
|
|
- CSKlient *c = cs->zSendeKlient( id );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&id, 4 ));
|
|
|
+ CSKlient* c = cs->zSendeKlient( id );
|
|
|
if( c )
|
|
|
{
|
|
|
c->kick();
|
|
|
@@ -840,11 +833,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int accId = 0;
|
|
|
int freundId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( freundId );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&freundId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( freundId );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->freundOnline( accId ) );
|
|
|
+ res = (char)(res & (char)klient->freundOnline( accId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -855,11 +848,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int accId = 0;
|
|
|
int freundId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( freundId );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&freundId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( freundId );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->freundOffline( accId ) );
|
|
|
+ res = (char)(res & (char)klient->freundOffline( accId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -871,18 +864,18 @@ void CSKlient::thread()
|
|
|
int vonAcc = 0;
|
|
|
int zuAcc = 0;
|
|
|
unsigned char len = 0;
|
|
|
- char *nachricht = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&vonAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&len, 1 ) );
|
|
|
+ char* nachricht = 0;
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&vonAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&len, 1 ));
|
|
|
if( len )
|
|
|
{
|
|
|
nachricht = new char[ len + 1 ];
|
|
|
nachricht[ (int)len ] = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( nachricht, len ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( nachricht, len ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->nachricht( vonAcc, nachricht ) );
|
|
|
+ res = (char)(res & (char)klient->nachricht( vonAcc, nachricht ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -896,12 +889,12 @@ void CSKlient::thread()
|
|
|
int vonAcc = 0;
|
|
|
int zuAcc = 0;
|
|
|
int gruppeId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&vonAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&vonAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->gruppeEinladung( vonAcc, gruppeId ) );
|
|
|
+ res = (char)(res & (char)klient->gruppeEinladung( vonAcc, gruppeId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -913,18 +906,18 @@ void CSKlient::thread()
|
|
|
int accId = 0;
|
|
|
int freundId = 0;
|
|
|
unsigned char len = 0;
|
|
|
- char *status = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&len, 1 ) );
|
|
|
+ char* status = 0;
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&freundId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&len, 1 ));
|
|
|
if( len )
|
|
|
{
|
|
|
status = new char[ len + 1 ];
|
|
|
status[ (int)len ] = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( status, len ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( freundId );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( status, len ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( freundId );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->accountStatusChange( accId, status ) );
|
|
|
+ res = (char)(res & (char)klient->accountStatusChange( accId, status ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -938,18 +931,18 @@ void CSKlient::thread()
|
|
|
int accId = 0;
|
|
|
int freundId = 0;
|
|
|
unsigned char len = 0;
|
|
|
- char *name = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&len, 1 ) );
|
|
|
+ char* name = 0;
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&freundId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&len, 1 ));
|
|
|
if( len )
|
|
|
{
|
|
|
name = new char[ len + 1 ];
|
|
|
name[ (int)len ] = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( name, len ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( freundId );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( name, len ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( freundId );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->accountNameChange( accId, name ) );
|
|
|
+ res = (char)(res & (char)klient->accountNameChange( accId, name ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -962,11 +955,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int accId = 0;
|
|
|
int freundId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( freundId );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&freundId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( freundId );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->keinFreundMehr( accId ) );
|
|
|
+ res = (char)(res & (char)klient->keinFreundMehr( accId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -977,11 +970,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int accId = 0;
|
|
|
int freundId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( freundId );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&freundId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( freundId );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->freundesAnfrage( accId ) );
|
|
|
+ res = (char)(res & (char)klient->freundesAnfrage( accId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -992,11 +985,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int accId = 0;
|
|
|
int freundId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( freundId );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&freundId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( freundId );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->neuerFreund( accountId ) );
|
|
|
+ res = (char)(res & (char)klient->neuerFreund( accountId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1008,12 +1001,12 @@ void CSKlient::thread()
|
|
|
int vonAcc = 0;
|
|
|
int zuAcc = 0;
|
|
|
int chatroomId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&vonAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&chatroomId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&vonAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&chatroomId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->einladungZumChatroom( vonAcc, chatroomId ) );
|
|
|
+ res = (char)(res & (char)klient->einladungZumChatroom( vonAcc, chatroomId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1025,12 +1018,12 @@ void CSKlient::thread()
|
|
|
int accId = 0;
|
|
|
int zuAcc = 0;
|
|
|
int chatroomId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&chatroomId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&chatroomId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->spielerBetrittChatroom( chatroomId, accId ) );
|
|
|
+ res = (char)(res & (char)klient->spielerBetrittChatroom( chatroomId, accId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1043,19 +1036,19 @@ void CSKlient::thread()
|
|
|
int zuAcc = 0;
|
|
|
int chatroomId = 0;
|
|
|
unsigned char len = 0;
|
|
|
- char *nachricht = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&vonAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&chatroomId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&len, 1 ) );
|
|
|
+ char* nachricht = 0;
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&vonAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&chatroomId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&len, 1 ));
|
|
|
if( len )
|
|
|
{
|
|
|
nachricht = new char[ len + 1 ];
|
|
|
nachricht[ (int)len ] = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( nachricht, len ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( nachricht, len ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->chatroomNachricht( chatroomId, vonAcc, nachricht ) );
|
|
|
+ res = (char)(res & (char)klient->chatroomNachricht( chatroomId, vonAcc, nachricht ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1069,12 +1062,12 @@ void CSKlient::thread()
|
|
|
int accId = 0;
|
|
|
int zuAcc = 0;
|
|
|
int chatroomId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&chatroomId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&chatroomId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->spielerLeavesChatroom( chatroomId, accId ) );
|
|
|
+ res = (char)(res & (char)klient->spielerLeavesChatroom( chatroomId, accId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1085,11 +1078,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int accId = 0;
|
|
|
int freundId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( freundId );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&freundId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( freundId );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->freundesAnfrageAbgelehnt( accId ) );
|
|
|
+ res = (char)(res & (char)klient->freundesAnfrageAbgelehnt( accId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1101,12 +1094,12 @@ void CSKlient::thread()
|
|
|
int accId = 0;
|
|
|
int zuAcc = 0;
|
|
|
int chatroomId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&chatroomId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&chatroomId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->einladungZumChatroomAbgelehnt( accId, chatroomId ) );
|
|
|
+ res = (char)(res & (char)klient->einladungZumChatroomAbgelehnt( accId, chatroomId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1117,17 +1110,17 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAcc = 0;
|
|
|
unsigned char len = 0;
|
|
|
- char *nachricht = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&len, 1 ) );
|
|
|
+ char* nachricht = 0;
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&len, 1 ));
|
|
|
if( len )
|
|
|
{
|
|
|
nachricht = new char[ len + 1 ];
|
|
|
nachricht[ (int)len ] = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( nachricht, len ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( nachricht, len ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->errorZuKlient( nachricht ) );
|
|
|
+ res = (char)(res & (char)klient->errorZuKlient( nachricht ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1140,11 +1133,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAcc = 0;
|
|
|
int chatroomId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&chatroomId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&chatroomId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->chatroomAdmin( chatroomId ) );
|
|
|
+ res = (char)(res & (char)klient->chatroomAdmin( chatroomId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1155,11 +1148,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAcc = 0;
|
|
|
int chatroomId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&chatroomId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&chatroomId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->chatroomKick( chatroomId ) );
|
|
|
+ res = (char)(res & (char)klient->chatroomKick( chatroomId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1171,12 +1164,12 @@ void CSKlient::thread()
|
|
|
int zuAcc = 0;
|
|
|
int accountId = 0;
|
|
|
int gruppeId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accountId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accountId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->spielerBertittGruppe( accountId, gruppeId ) );
|
|
|
+ res = (char)(res & (char)klient->spielerBertittGruppe( accountId, gruppeId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1188,12 +1181,12 @@ void CSKlient::thread()
|
|
|
int zuAcc = 0;
|
|
|
int accountId = 0;
|
|
|
int gruppeId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accountId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accountId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->spielerLeavesGruppe( accountId, gruppeId ) );
|
|
|
+ res = (char)(res & (char)klient->spielerLeavesGruppe( accountId, gruppeId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1204,11 +1197,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAcc = 0;
|
|
|
int gruppeId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->kickAusGruppe( gruppeId ) );
|
|
|
+ res = (char)(res & (char)klient->kickAusGruppe( gruppeId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1219,11 +1212,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAcc = 0;
|
|
|
int gruppeId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->gruppeAnmelden( gruppeId ) );
|
|
|
+ res = (char)(res & (char)klient->gruppeAnmelden( gruppeId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1234,11 +1227,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAcc = 0;
|
|
|
int gruppeId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->gruppeAbmelden( gruppeId ) );
|
|
|
+ res = (char)(res & (char)klient->gruppeAbmelden( gruppeId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1250,16 +1243,16 @@ void CSKlient::thread()
|
|
|
int zuAcc = 0;
|
|
|
int gruppeId = 0;
|
|
|
unsigned char len;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&len, 1 ) );
|
|
|
- char *nachricht = new char[ len + 1 ];
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&len, 1 ));
|
|
|
+ char* nachricht = new char[ len + 1 ];
|
|
|
nachricht[ (int)len ] = 0;
|
|
|
if( len )
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( nachricht, len ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( nachricht, len ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->gruppeNachricht( gruppeId, nachricht ) );
|
|
|
+ res = (char)(res & (char)klient->gruppeNachricht( gruppeId, nachricht ));
|
|
|
else
|
|
|
res = 0;
|
|
|
delete[]nachricht;
|
|
|
@@ -1272,12 +1265,12 @@ void CSKlient::thread()
|
|
|
int zuAcc = 0;
|
|
|
int gruppeId = 0;
|
|
|
char starten;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( &starten, 1 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( &starten, 1 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->gruppeSpielStarten( gruppeId, starten == 1 ) );
|
|
|
+ res = (char)(res & (char)klient->gruppeSpielStarten( gruppeId, starten == 1 ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1289,12 +1282,12 @@ void CSKlient::thread()
|
|
|
int zuAcc = 0;
|
|
|
int adminId = 0;
|
|
|
int gruppeId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&adminId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&adminId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->setGruppeAdmin( gruppeId, adminId ) );
|
|
|
+ res = (char)(res & (char)klient->setGruppeAdmin( gruppeId, adminId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1306,12 +1299,12 @@ void CSKlient::thread()
|
|
|
int zuAcc = 0;
|
|
|
int accountId = 0;
|
|
|
int gruppeId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accountId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accountId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->gruppeEinladungAbgelehnt( gruppeId, accountId ) );
|
|
|
+ res = (char)(res & (char)klient->gruppeEinladungAbgelehnt( gruppeId, accountId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1322,13 +1315,13 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAcc = 0;
|
|
|
unsigned short port;
|
|
|
- unsigned char *ip = new unsigned char[ 4 ];
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&port, 2 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)ip, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ unsigned char* ip = new unsigned char[ 4 ];
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&port, 2 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)ip, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->spielServerVerbindungsAnfrage( port, ip ) );
|
|
|
+ res = (char)(res & (char)klient->spielServerVerbindungsAnfrage( port, ip ));
|
|
|
else
|
|
|
res = 0;
|
|
|
delete[] ip;
|
|
|
@@ -1341,12 +1334,12 @@ void CSKlient::thread()
|
|
|
int zuAcc = 0;
|
|
|
int gruppeId = 0;
|
|
|
int accountId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accountId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accountId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->gruppeEinladungAbgebrochen( gruppeId, accountId ) );
|
|
|
+ res = (char)(res & (char)klient->gruppeEinladungAbgebrochen( gruppeId, accountId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1358,12 +1351,12 @@ void CSKlient::thread()
|
|
|
int zuAcc = 0;
|
|
|
int gruppeId = 0;
|
|
|
int accountId = 0;
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&accountId, 4 ) );
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&zuAcc, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&gruppeId, 4 ));
|
|
|
+ res = (char)(res & (char)klient->getNachrichtEncrypted( (char*)&accountId, 4 ));
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAcc );
|
|
|
if( klient )
|
|
|
- res = (char)( res & (char)klient->gruppeEinladungNeu( gruppeId, accountId ) );
|
|
|
+ res = (char)(res & (char)klient->gruppeEinladungNeu( gruppeId, accountId ));
|
|
|
else
|
|
|
res = 0;
|
|
|
}
|
|
|
@@ -1381,7 +1374,7 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
@@ -1389,19 +1382,19 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAccount = 0;
|
|
|
unsigned char len = 0;
|
|
|
- char *nachricht = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&zuAccount, 4 );
|
|
|
- klient->getNachrichtEncrypted( (char *)&len, 1 );
|
|
|
+ char* nachricht = 0;
|
|
|
+ klient->getNachrichtEncrypted( (char*)&zuAccount, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&len, 1 );
|
|
|
if( len )
|
|
|
{
|
|
|
nachricht = new char[ len + 1 ];
|
|
|
nachricht[ (int)len ] = 0;
|
|
|
klient->getNachrichtEncrypted( nachricht, len );
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
if( !weiter->chatNachricht( accountId, zuAccount, nachricht ) )
|
|
|
{
|
|
|
cs->zDB()->speicherChatNachricht( accountId, zuAccount, nachricht );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Der Account ist momentan nicht erreichbar." );
|
|
|
}
|
|
|
@@ -1416,15 +1409,15 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
}
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
unsigned char len;
|
|
|
- char *name;
|
|
|
- klient->getNachrichtEncrypted( (char *)&len, 1 );
|
|
|
+ char* name;
|
|
|
+ klient->getNachrichtEncrypted( (char*)&len, 1 );
|
|
|
if( len )
|
|
|
{
|
|
|
name = new char[ len + 1 ];
|
|
|
@@ -1433,14 +1426,14 @@ void CSKlient::thread()
|
|
|
if( cs->zDB()->accountNameChange( accountId, name ) )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->accountNameChange( accountId, name );
|
|
|
delete weiter;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Beim ändern des Namens ist ein Fehler aufgetreten." );
|
|
|
}
|
|
|
@@ -1454,18 +1447,18 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
}
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int freundId = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&freundId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&freundId, 4 );
|
|
|
if( cs->zDB()->beendeFreundschaft( accountId, freundId ) )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->accountKeinFreundMehr( accountId, freundId );
|
|
|
weiter->accountKeinFreundMehr( freundId, accountId );
|
|
|
delete weiter;
|
|
|
@@ -1473,7 +1466,7 @@ void CSKlient::thread()
|
|
|
else
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Die Freundschaft konnte nicht beendet werden." );
|
|
|
}
|
|
|
@@ -1485,17 +1478,17 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
}
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int freundId = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&freundId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&freundId, 4 );
|
|
|
if( cs->zDB()->proveFreundschaftsAnfrage( accountId, freundId ) )
|
|
|
{
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
if( !weiter->freundesAnfrage( accountId, freundId ) )
|
|
|
cs->zDB()->saveFreundschaftsAnfrage( accountId, freundId );
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
@@ -1504,7 +1497,7 @@ void CSKlient::thread()
|
|
|
else
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Diesem Account konnte keine Freundschaftsanfrage gesendet werden." );
|
|
|
}
|
|
|
@@ -1516,7 +1509,7 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
@@ -1524,9 +1517,9 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAccount = 0;
|
|
|
char ok = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&zuAccount, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&zuAccount, 4 );
|
|
|
klient->getNachrichtEncrypted( &ok, 1 );
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
if( !ok )
|
|
|
{
|
|
|
weiter->freundEinladungAbgelehnt( accountId, zuAccount );
|
|
|
@@ -1548,7 +1541,7 @@ void CSKlient::thread()
|
|
|
else
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Fehler beim erstellen der neuen Freundschaft." );
|
|
|
weiter->fehler( zuAccount, "Fehler beim erstellen der neuen Freundschaft." );
|
|
|
@@ -1563,15 +1556,15 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
}
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
unsigned char nLen = 0;
|
|
|
- char *name = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&nLen, 1 );
|
|
|
+ char* name = 0;
|
|
|
+ klient->getNachrichtEncrypted( (char*)&nLen, 1 );
|
|
|
if( nLen )
|
|
|
{
|
|
|
name = new char[ nLen + 1 ];
|
|
|
@@ -1581,7 +1574,7 @@ void CSKlient::thread()
|
|
|
if( !name )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du musst einen Namen eingeben." );
|
|
|
}
|
|
|
@@ -1589,16 +1582,16 @@ void CSKlient::thread()
|
|
|
{
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int id = cs->zDB()->chatroomErstellen( accountId, name );
|
|
|
- klient->sendeEncrypted( (char *)&id, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&id, 4 );
|
|
|
if( !id )
|
|
|
{
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Das Chatroom konnte nicht erstellt werden." );
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
{
|
|
|
c->spielerBetrittChatroom( id, accountId );
|
|
|
@@ -1615,7 +1608,7 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
@@ -1623,11 +1616,11 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAccountId = 0;
|
|
|
int chatroomId = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&zuAccountId, 4 );
|
|
|
- klient->getNachrichtEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&zuAccountId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&chatroomId, 4 );
|
|
|
if( cs->zDB()->proveChatroomEinladung( accountId, zuAccountId, chatroomId ) )
|
|
|
{
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
if( weiter->einladungZumChatroom( accountId, zuAccountId, chatroomId ) )
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
else
|
|
|
@@ -1635,7 +1628,7 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
if( weiter->getLetzterFehler() )
|
|
|
{
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( weiter->getLetzterFehler() );
|
|
|
}
|
|
|
@@ -1645,7 +1638,7 @@ void CSKlient::thread()
|
|
|
else
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Der Account konnte nicht eingeladen werden." );
|
|
|
}
|
|
|
@@ -1657,7 +1650,7 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
@@ -1665,9 +1658,9 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int zuAccountId = 0;
|
|
|
int chatroomId = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&zuAccountId, 4 );
|
|
|
- klient->getNachrichtEncrypted( (char *)&chatroomId, 4 );
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&zuAccountId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&chatroomId, 4 );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->chatroomEinladungAbgelehnt( accountId, chatroomId, zuAccountId );
|
|
|
delete weiter;
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
@@ -1679,23 +1672,23 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
}
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int chatroomId = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&chatroomId, 4 );
|
|
|
if( cs->zDB()->chatroomBeitreten( accountId, chatroomId ) )
|
|
|
{
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->spielerBetrittChatroom( accountId, chatroomId );
|
|
|
delete weiter;
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
- Array< int > *accounts = new Array< int >();
|
|
|
+ Array< int >* accounts = new Array< int >();
|
|
|
int anzahl = cs->zDB()->getChatroomAccount( chatroomId, accounts );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
{
|
|
|
if( !c->spielerImChatroom( chatroomId, (char)anzahl, accounts ) )
|
|
|
@@ -1713,7 +1706,7 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
@@ -1721,18 +1714,18 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int chatroomId = 0;
|
|
|
unsigned char len = 0;
|
|
|
- char *nachricht = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&chatroomId, 4 );
|
|
|
- klient->getNachrichtEncrypted( (char *)&len, 1 );
|
|
|
+ char* nachricht = 0;
|
|
|
+ klient->getNachrichtEncrypted( (char*)&chatroomId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&len, 1 );
|
|
|
if( len )
|
|
|
{
|
|
|
nachricht = new char[ len + 1 ];
|
|
|
nachricht[ (int)len ] = 0;
|
|
|
klient->getNachrichtEncrypted( nachricht, len );
|
|
|
- Text *message = cs->zDB()->getAccountRufName( accountId );
|
|
|
+ Text* message = cs->zDB()->getAccountRufName( accountId );
|
|
|
message->append( ": " );
|
|
|
message->append( nachricht );
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
if( weiter->chatroomNachricht( accountId, message->getText(), chatroomId ) )
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
else
|
|
|
@@ -1740,7 +1733,7 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
if( weiter->getLetzterFehler() )
|
|
|
{
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( weiter->getLetzterFehler() );
|
|
|
}
|
|
|
@@ -1759,14 +1752,14 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
}
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int chatroomId = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&chatroomId, 4 );
|
|
|
int aktion = cs->zDB()->chatroomVerlassen( accountId, chatroomId );
|
|
|
if( !aktion )
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
@@ -1774,13 +1767,13 @@ void CSKlient::thread()
|
|
|
{
|
|
|
if( aktion == 3 )
|
|
|
{
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->chatroomAdmin( chatroomId, cs->zDB()->getChatroomAdmin( chatroomId ) );
|
|
|
delete weiter;
|
|
|
}
|
|
|
if( aktion != 2 )
|
|
|
{
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->spielerLeavestChatroom( accountId, chatroomId );
|
|
|
delete weiter;
|
|
|
}
|
|
|
@@ -1794,7 +1787,7 @@ void CSKlient::thread()
|
|
|
if( !accountId || !klientNummer )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht identifiziert." );
|
|
|
break;
|
|
|
@@ -1802,12 +1795,12 @@ void CSKlient::thread()
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
int chatroomId = 0;
|
|
|
int accountId = 0;
|
|
|
- klient->getNachrichtEncrypted( (char *)&chatroomId, 4 );
|
|
|
- klient->getNachrichtEncrypted( (char *)&accountId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&chatroomId, 4 );
|
|
|
+ klient->getNachrichtEncrypted( (char*)&accountId, 4 );
|
|
|
if( accountId == (int)this->accountId )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du kannst dich selbst nicht kicken." );
|
|
|
break;
|
|
|
@@ -1816,7 +1809,7 @@ void CSKlient::thread()
|
|
|
{
|
|
|
if( cs->zDB()->chatroomVerlassen( accountId, chatroomId ) )
|
|
|
{
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->chatroomKick( chatroomId, accountId );
|
|
|
weiter->spielerLeavestChatroom( accountId, chatroomId );
|
|
|
delete weiter;
|
|
|
@@ -1825,7 +1818,7 @@ void CSKlient::thread()
|
|
|
else
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Der Spieler konnte nicht entfernt werden." );
|
|
|
}
|
|
|
@@ -1833,7 +1826,7 @@ void CSKlient::thread()
|
|
|
else
|
|
|
{
|
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->errorZuKlient( "Du bist nicht der Administrator dieses Chatrooms." );
|
|
|
}
|
|
|
@@ -1843,9 +1836,9 @@ void CSKlient::thread()
|
|
|
if( 1 )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
- Array< int > *freundId = new Array< int >();
|
|
|
+ Array< int >* freundId = new Array< int >();
|
|
|
int anz = cs->zDB()->getAccountFreunde( accountId, freundId );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->freunde( (char)anz, freundId );
|
|
|
freundId->release();
|
|
|
@@ -1863,10 +1856,10 @@ void CSKlient::thread()
|
|
|
if( 1 )
|
|
|
{
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
- Array< int > *vonAccount = new Array< int >();
|
|
|
- RCArray< Text > *nachricht = new RCArray< Text >();
|
|
|
+ Array< int >* vonAccount = new Array< int >();
|
|
|
+ RCArray< Text >* nachricht = new RCArray< Text >();
|
|
|
int anzahl = cs->zDB()->getChatNachrichten( accountId, vonAccount, nachricht );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
{
|
|
|
for( int i = 0; i < anzahl; i++ )
|
|
|
@@ -1892,7 +1885,7 @@ void CSKlient::thread()
|
|
|
break;
|
|
|
}
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
- CSKlient *c = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* c = cs->zSendeKlient( accountId );
|
|
|
if( c )
|
|
|
c->keepAlive();
|
|
|
}
|
|
|
@@ -1917,7 +1910,7 @@ void CSKlient::thread()
|
|
|
{
|
|
|
if( accountId )
|
|
|
{
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->accountOffline( accountId );
|
|
|
delete weiter;
|
|
|
}
|
|
|
@@ -1936,7 +1929,7 @@ bool CSKlient::kick()
|
|
|
klient->trenne();
|
|
|
warteAufThread( 100 );
|
|
|
ende();
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
|
+ MSGWeiterleitung* weiter = new MSGWeiterleitung( dynamic_cast<ChatServer*>(cs->getThis()) );
|
|
|
weiter->accountOffline( accountId );
|
|
|
delete weiter;
|
|
|
}
|
|
|
@@ -1950,7 +1943,7 @@ bool CSKlient::kick()
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-bool CSKlient::nachricht( int vonAccount, const char *txt )
|
|
|
+bool CSKlient::nachricht( int vonAccount, const char* txt )
|
|
|
{
|
|
|
if( empfangen )
|
|
|
return 0;
|
|
|
@@ -1959,7 +1952,7 @@ bool CSKlient::nachricht( int vonAccount, const char *txt )
|
|
|
{
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\4", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&vonAccount, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&vonAccount, 4 );
|
|
|
klient->sendeEncrypted( &len, 1 );
|
|
|
klient->sendeEncrypted( txt, len );
|
|
|
unlock();
|
|
|
@@ -1975,24 +1968,24 @@ bool CSKlient::gruppeEinladung( int vonAccount, int gruppeId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\5", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&vonAccount, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&vonAccount, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-bool CSKlient::accountStatusChange( int account, const char *status )
|
|
|
+bool CSKlient::accountStatusChange( int account, const char* status )
|
|
|
{
|
|
|
if( empfangen )
|
|
|
return 0;
|
|
|
- char len = (char)( status ? textLength( status ) : 0 );
|
|
|
+ char len = (char)(status ? textLength( status ) : 0);
|
|
|
if( len )
|
|
|
{
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\6", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
klient->sendeEncrypted( &len, 1 );
|
|
|
klient->sendeEncrypted( status, len );
|
|
|
unlock();
|
|
|
@@ -2002,16 +1995,16 @@ bool CSKlient::accountStatusChange( int account, const char *status )
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-bool CSKlient::accountNameChange( int account, const char *name )
|
|
|
+bool CSKlient::accountNameChange( int account, const char* name )
|
|
|
{
|
|
|
if( empfangen )
|
|
|
return 0;
|
|
|
- char len = (char)( name ? textLength( name ) : 0 );
|
|
|
+ char len = (char)(name ? textLength( name ) : 0);
|
|
|
if( len )
|
|
|
{
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\7", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
klient->sendeEncrypted( &len, 1 );
|
|
|
klient->sendeEncrypted( name, len );
|
|
|
unlock();
|
|
|
@@ -2027,7 +2020,7 @@ bool CSKlient::keinFreundMehr( int account )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x8", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2040,7 +2033,7 @@ bool CSKlient::freundesAnfrage( int vonAccount )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x9", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&vonAccount, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&vonAccount, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2053,7 +2046,7 @@ bool CSKlient::neuerFreund( int account )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\xA", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2066,7 +2059,7 @@ bool CSKlient::freundesAnfrageAbgelehnt( int account )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\xB", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2079,8 +2072,8 @@ bool CSKlient::einladungZumChatroom( int vonAccount, int chatroomId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\xC", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&vonAccount, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&vonAccount, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2093,8 +2086,8 @@ bool CSKlient::einladungZumChatroomAbgelehnt( int account, int chatroomId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\xD", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2107,25 +2100,25 @@ bool CSKlient::spielerBetrittChatroom( int chatroomId, int account )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\xE", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-bool CSKlient::chatroomNachricht( int chatroomId, int vonAccount, const char *nachricht )
|
|
|
+bool CSKlient::chatroomNachricht( int chatroomId, int vonAccount, const char* nachricht )
|
|
|
{
|
|
|
if( empfangen )
|
|
|
return 0;
|
|
|
- char len = (char)( nachricht ? textLength( nachricht ) : 0 );
|
|
|
+ char len = (char)(nachricht ? textLength( nachricht ) : 0);
|
|
|
if( len )
|
|
|
{
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\xF", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&vonAccount, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&vonAccount, 4 );
|
|
|
klient->sendeEncrypted( &len, 1 );
|
|
|
klient->sendeEncrypted( nachricht, len );
|
|
|
unlock();
|
|
|
@@ -2141,15 +2134,15 @@ bool CSKlient::spielerLeavesChatroom( int chatroomId, int accountId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x10", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-bool CSKlient::freunde( char anzahl, Array< int > *zAccountId )
|
|
|
+bool CSKlient::freunde( char anzahl, Array< int >* zAccountId )
|
|
|
{
|
|
|
if( empfangen )
|
|
|
return 0;
|
|
|
@@ -2159,7 +2152,7 @@ bool CSKlient::freunde( char anzahl, Array< int > *zAccountId )
|
|
|
for( int i = 0; i < anzahl; i++ )
|
|
|
{
|
|
|
int accId = zAccountId->get( i );
|
|
|
- klient->sendeEncrypted( (char *)&accId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&accId, 4 );
|
|
|
}
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
@@ -2167,18 +2160,18 @@ bool CSKlient::freunde( char anzahl, Array< int > *zAccountId )
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-bool CSKlient::spielerImChatroom( int chatroomId, char anzahl, Array< int > *zAccountId )
|
|
|
+bool CSKlient::spielerImChatroom( int chatroomId, char anzahl, Array< int >* zAccountId )
|
|
|
{
|
|
|
if( empfangen )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x12", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
klient->sendeEncrypted( &anzahl, 1 );
|
|
|
for( int i = 0; i < anzahl; i++ )
|
|
|
{
|
|
|
int accId = zAccountId->get( i );
|
|
|
- klient->sendeEncrypted( (char *)&accId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&accId, 4 );
|
|
|
}
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
@@ -2192,7 +2185,7 @@ bool CSKlient::freundOnline( int accountId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x13", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2205,7 +2198,7 @@ bool CSKlient::freundOffline( int accountId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x14", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2218,7 +2211,7 @@ bool CSKlient::chatroomAdmin( int chatroomId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x15", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2231,7 +2224,7 @@ bool CSKlient::chatroomKick( int chatroomId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x16", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2244,8 +2237,8 @@ bool CSKlient::spielerBertittGruppe( int accountId, int gruppeId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x17", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2258,15 +2251,15 @@ bool CSKlient::spielerLeavesGruppe( int accountId, int gruppeId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x18", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-bool CSKlient::gruppeNachricht( int gruppeId, char *nachricht )
|
|
|
+bool CSKlient::gruppeNachricht( int gruppeId, char* nachricht )
|
|
|
{
|
|
|
if( empfangen )
|
|
|
return 0;
|
|
|
@@ -2275,7 +2268,7 @@ bool CSKlient::gruppeNachricht( int gruppeId, char *nachricht )
|
|
|
return 1;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x19", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
klient->sendeEncrypted( &len, 1 );
|
|
|
klient->sendeEncrypted( nachricht, len );
|
|
|
unlock();
|
|
|
@@ -2290,7 +2283,7 @@ bool CSKlient::gruppeAnmelden( int gruppeId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x1A", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2303,7 +2296,7 @@ bool CSKlient::gruppeAbmelden( int gruppeId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x1B", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2316,7 +2309,7 @@ bool CSKlient::gruppeSpielStarten( int gruppeId, bool starten )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x1C", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
if( starten )
|
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
|
else
|
|
|
@@ -2333,8 +2326,8 @@ bool CSKlient::setGruppeAdmin( int gruppeId, int adminId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x1E", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&adminId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&adminId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2347,7 +2340,7 @@ bool CSKlient::kickAusGruppe( int gruppeId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x1D", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2360,22 +2353,22 @@ bool CSKlient::gruppeEinladungAbgelehnt( int gruppeId, int accountId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x1F", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-bool CSKlient::spielServerVerbindungsAnfrage( unsigned short port, unsigned char *ip )
|
|
|
+bool CSKlient::spielServerVerbindungsAnfrage( unsigned short port, unsigned char* ip )
|
|
|
{
|
|
|
if( empfangen )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x20", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&port, 2 );
|
|
|
- klient->sendeEncrypted( (char *)ip, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&port, 2 );
|
|
|
+ klient->sendeEncrypted( (char*)ip, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2388,8 +2381,8 @@ bool CSKlient::gruppeEinladungAbgebrochen( int gruppeId, int accountId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x21", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
@@ -2402,15 +2395,15 @@ bool CSKlient::gruppeEinladungNeu( int gruppeId, int accountId )
|
|
|
return 0;
|
|
|
lock();
|
|
|
klient->sendeEncrypted( "\x22", 1 );
|
|
|
- klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
|
- klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&gruppeId, 4 );
|
|
|
+ klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
unlock();
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-bool CSKlient::errorZuKlient( const char *nachricht ) // sendet eine Fehlernachricht zum Klient
|
|
|
+bool CSKlient::errorZuKlient( const char* nachricht ) // sendet eine Fehlernachricht zum Klient
|
|
|
{
|
|
|
char len = (char)textLength( nachricht );
|
|
|
if( len )
|
|
|
@@ -2460,7 +2453,7 @@ bool CSKlient::istEmpfang() const
|
|
|
|
|
|
// Inhalt der MSGWeiterleitung Klasse aus ChatServer.h
|
|
|
// Konstruktor
|
|
|
-MSGWeiterleitung::MSGWeiterleitung( ChatServer *cs )
|
|
|
+MSGWeiterleitung::MSGWeiterleitung( ChatServer* cs )
|
|
|
{
|
|
|
klient = 0;
|
|
|
this->cs = cs;
|
|
|
@@ -2486,7 +2479,7 @@ bool MSGWeiterleitung::kickKlient( int accountId )
|
|
|
int server = cs->zDB()->getChatServerId( accountId );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( accountId );
|
|
|
if( klient )
|
|
|
{
|
|
|
ret = klient->kick();
|
|
|
@@ -2496,29 +2489,29 @@ bool MSGWeiterleitung::kickKlient( int accountId )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\1", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
|
klient->trenne();
|
|
|
- klient = (Klient *)klient->release();
|
|
|
+ klient = (Klient*)klient->release();
|
|
|
}
|
|
|
delete[]ip;
|
|
|
}
|
|
|
@@ -2530,7 +2523,7 @@ bool MSGWeiterleitung::kickKlient( int accountId )
|
|
|
bool MSGWeiterleitung::accountOnline( int accountId )
|
|
|
{
|
|
|
bool ret = 1;
|
|
|
- Array< int > *accId = new Array< int >();
|
|
|
+ Array< int >* accId = new Array< int >();
|
|
|
int anzahl = cs->zDB()->getAccountOnlineFreunde( accountId, accId );
|
|
|
for( int i = 0; i < anzahl; i++ )
|
|
|
{
|
|
|
@@ -2538,7 +2531,7 @@ bool MSGWeiterleitung::accountOnline( int accountId )
|
|
|
int server = cs->zDB()->getChatServerId( account );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( account );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( account );
|
|
|
if( klient )
|
|
|
ret = ret & klient->freundOnline( accountId );
|
|
|
else
|
|
|
@@ -2546,23 +2539,23 @@ bool MSGWeiterleitung::accountOnline( int accountId )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = ret & cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\2", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -2583,7 +2576,7 @@ bool MSGWeiterleitung::accountOnline( int accountId )
|
|
|
bool MSGWeiterleitung::accountOffline( int accountId )
|
|
|
{
|
|
|
bool ret = 1;
|
|
|
- Array< int > *accId = new Array< int >();
|
|
|
+ Array< int >* accId = new Array< int >();
|
|
|
int anzahl = cs->zDB()->getAccountOnlineFreunde( accountId, accId );
|
|
|
for( int i = 0; i < anzahl; i++ )
|
|
|
{
|
|
|
@@ -2591,7 +2584,7 @@ bool MSGWeiterleitung::accountOffline( int accountId )
|
|
|
int server = cs->zDB()->getChatServerId( account );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( account );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( account );
|
|
|
if( klient )
|
|
|
ret = ret & klient->freundOffline( accountId );
|
|
|
else
|
|
|
@@ -2599,23 +2592,23 @@ bool MSGWeiterleitung::accountOffline( int accountId )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = ret & cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\3", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -2633,7 +2626,7 @@ bool MSGWeiterleitung::accountOffline( int accountId )
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool MSGWeiterleitung::chatNachricht( int vonAccount, int zuAccount, const char *nachricht )
|
|
|
+bool MSGWeiterleitung::chatNachricht( int vonAccount, int zuAccount, const char* nachricht )
|
|
|
{
|
|
|
bool ret = 1;
|
|
|
char len = (char)textLength( nachricht );
|
|
|
@@ -2642,7 +2635,7 @@ bool MSGWeiterleitung::chatNachricht( int vonAccount, int zuAccount, const char
|
|
|
int server = cs->zDB()->getChatServerId( zuAccount );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAccount );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAccount );
|
|
|
if( klient )
|
|
|
ret = klient->nachricht( vonAccount, nachricht );
|
|
|
else
|
|
|
@@ -2650,26 +2643,26 @@ bool MSGWeiterleitung::chatNachricht( int vonAccount, int zuAccount, const char
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\4", 2 );
|
|
|
char res = 0;
|
|
|
- ret = ret & klient->getNachrichtEncrypted( (char *)&res, 1 );
|
|
|
+ ret = ret & klient->getNachrichtEncrypted( (char*)&res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&vonAccount, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&zuAccount, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&vonAccount, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&zuAccount, 4 );
|
|
|
ret = ret & klient->sendeEncrypted( &len, 1 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)nachricht, len );
|
|
|
- ret = ret & klient->getNachrichtEncrypted( (char *)&res, 1 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)nachricht, len );
|
|
|
+ ret = ret & klient->getNachrichtEncrypted( (char*)&res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
|
@@ -2684,13 +2677,13 @@ bool MSGWeiterleitung::chatNachricht( int vonAccount, int zuAccount, const char
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool MSGWeiterleitung::accountStatusChange( int accountId, const char *status )
|
|
|
+bool MSGWeiterleitung::accountStatusChange( int accountId, const char* status )
|
|
|
{
|
|
|
bool ret = 1;
|
|
|
char len = (char)textLength( status );
|
|
|
if( !len )
|
|
|
return 1;
|
|
|
- Array< int > *accId = new Array< int >();
|
|
|
+ Array< int >* accId = new Array< int >();
|
|
|
int anzahl = cs->zDB()->getAccountOnlineFreunde( accountId, accId );
|
|
|
for( int i = 0; i < anzahl; i++ )
|
|
|
{
|
|
|
@@ -2698,7 +2691,7 @@ bool MSGWeiterleitung::accountStatusChange( int accountId, const char *status )
|
|
|
int server = cs->zDB()->getChatServerId( account );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( account );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( account );
|
|
|
if( klient )
|
|
|
ret = ret & klient->accountStatusChange( accountId, status );
|
|
|
else
|
|
|
@@ -2706,25 +2699,25 @@ bool MSGWeiterleitung::accountStatusChange( int accountId, const char *status )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = ret & cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\6", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&len, 1 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)status, len );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&len, 1 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)status, len );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -2742,13 +2735,13 @@ bool MSGWeiterleitung::accountStatusChange( int accountId, const char *status )
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool MSGWeiterleitung::accountNameChange( int accountId, const char *name )
|
|
|
+bool MSGWeiterleitung::accountNameChange( int accountId, const char* name )
|
|
|
{
|
|
|
bool ret = 1;
|
|
|
char len = (char)textLength( name );
|
|
|
if( !name )
|
|
|
return 1;
|
|
|
- Array< int > *accId = new Array< int >();
|
|
|
+ Array< int >* accId = new Array< int >();
|
|
|
int anzahl = cs->zDB()->getAccountOnlineFreunde( accountId, accId );
|
|
|
for( int i = 0; i < anzahl; i++ )
|
|
|
{
|
|
|
@@ -2756,7 +2749,7 @@ bool MSGWeiterleitung::accountNameChange( int accountId, const char *name )
|
|
|
int server = cs->zDB()->getChatServerId( account );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( account );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( account );
|
|
|
if( klient )
|
|
|
ret = ret & klient->accountNameChange( accountId, name );
|
|
|
else
|
|
|
@@ -2764,25 +2757,25 @@ bool MSGWeiterleitung::accountNameChange( int accountId, const char *name )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = ret & cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\7", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&len, 1 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)name, len );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&len, 1 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)name, len );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -2806,7 +2799,7 @@ bool MSGWeiterleitung::accountKeinFreundMehr( int accountId, int zielAccountId )
|
|
|
int server = cs->zDB()->getChatServerId( zielAccountId );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( zielAccountId );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zielAccountId );
|
|
|
if( klient )
|
|
|
ret = ret & klient->keinFreundMehr( accountId );
|
|
|
else
|
|
|
@@ -2814,23 +2807,23 @@ bool MSGWeiterleitung::accountKeinFreundMehr( int accountId, int zielAccountId )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\x8", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&zielAccountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&zielAccountId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -2852,7 +2845,7 @@ bool MSGWeiterleitung::freundesAnfrage( int vonAccountId, int zuAccountId )
|
|
|
int server = cs->zDB()->getChatServerId( zuAccountId );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAccountId );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAccountId );
|
|
|
if( klient )
|
|
|
ret = ret & klient->freundesAnfrage( vonAccountId );
|
|
|
else
|
|
|
@@ -2860,23 +2853,23 @@ bool MSGWeiterleitung::freundesAnfrage( int vonAccountId, int zuAccountId )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\x9", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&vonAccountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&zuAccountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&vonAccountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&zuAccountId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -2898,7 +2891,7 @@ bool MSGWeiterleitung::neuerFreund( int accountId, int zuAccountId )
|
|
|
int server = cs->zDB()->getChatServerId( zuAccountId );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAccountId );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAccountId );
|
|
|
if( klient )
|
|
|
ret = ret & klient->neuerFreund( accountId );
|
|
|
else
|
|
|
@@ -2906,23 +2899,23 @@ bool MSGWeiterleitung::neuerFreund( int accountId, int zuAccountId )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\xA", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&zuAccountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&zuAccountId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -2944,7 +2937,7 @@ bool MSGWeiterleitung::einladungZumChatroom( int vonAccountId, int zuAccountId,
|
|
|
int server = cs->zDB()->getChatServerId( zuAccountId );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAccountId );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAccountId );
|
|
|
if( klient )
|
|
|
ret = ret & klient->einladungZumChatroom( vonAccountId, chatroomId );
|
|
|
else
|
|
|
@@ -2952,24 +2945,24 @@ bool MSGWeiterleitung::einladungZumChatroom( int vonAccountId, int zuAccountId,
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\xB", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&vonAccountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&zuAccountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&vonAccountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&zuAccountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -2988,7 +2981,7 @@ bool MSGWeiterleitung::einladungZumChatroom( int vonAccountId, int zuAccountId,
|
|
|
bool MSGWeiterleitung::spielerBetrittChatroom( int accountId, int chatroomId )
|
|
|
{
|
|
|
bool ret = 1;
|
|
|
- Array< int > *accId = new Array< int >();
|
|
|
+ Array< int >* accId = new Array< int >();
|
|
|
int anzahl = cs->zDB()->getChatroomAccount( chatroomId, accId );
|
|
|
for( int i = 0; i < anzahl; i++ )
|
|
|
{
|
|
|
@@ -2998,7 +2991,7 @@ bool MSGWeiterleitung::spielerBetrittChatroom( int accountId, int chatroomId )
|
|
|
int server = cs->zDB()->getChatServerId( account );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( account );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( account );
|
|
|
if( klient )
|
|
|
ret = ret & klient->spielerBetrittChatroom( chatroomId, accountId );
|
|
|
else
|
|
|
@@ -3006,24 +2999,24 @@ bool MSGWeiterleitung::spielerBetrittChatroom( int accountId, int chatroomId )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = ret & cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\xC", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -3041,13 +3034,13 @@ bool MSGWeiterleitung::spielerBetrittChatroom( int accountId, int chatroomId )
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool MSGWeiterleitung::chatroomNachricht( int vonAccount, const char *nachricht, int chatroomId )
|
|
|
+bool MSGWeiterleitung::chatroomNachricht( int vonAccount, const char* nachricht, int chatroomId )
|
|
|
{
|
|
|
bool ret = 1;
|
|
|
char len = (char)textLength( nachricht );
|
|
|
if( !len )
|
|
|
return 1;
|
|
|
- Array< int > *accId = new Array< int >();
|
|
|
+ Array< int >* accId = new Array< int >();
|
|
|
int anzahl = cs->zDB()->getChatroomAccount( chatroomId, accId );
|
|
|
for( int i = 0; i < anzahl; i++ )
|
|
|
{
|
|
|
@@ -3055,7 +3048,7 @@ bool MSGWeiterleitung::chatroomNachricht( int vonAccount, const char *nachricht,
|
|
|
int server = cs->zDB()->getChatServerId( account );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( account );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( account );
|
|
|
if( klient )
|
|
|
ret = ret & klient->chatroomNachricht( chatroomId, vonAccount, nachricht );
|
|
|
else
|
|
|
@@ -3063,26 +3056,26 @@ bool MSGWeiterleitung::chatroomNachricht( int vonAccount, const char *nachricht,
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = ret & cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\xD", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&vonAccount, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&vonAccount, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
ret = ret & klient->sendeEncrypted( &len, 1 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)nachricht, len );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)nachricht, len );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -3103,7 +3096,7 @@ bool MSGWeiterleitung::chatroomNachricht( int vonAccount, const char *nachricht,
|
|
|
bool MSGWeiterleitung::spielerLeavestChatroom( int accountId, int chatroomId )
|
|
|
{
|
|
|
bool ret = 1;
|
|
|
- Array< int > *accId = new Array< int >();
|
|
|
+ Array< int >* accId = new Array< int >();
|
|
|
int anzahl = cs->zDB()->getChatroomAccount( chatroomId, accId );
|
|
|
for( int i = 0; i < anzahl; i++ )
|
|
|
{
|
|
|
@@ -3111,7 +3104,7 @@ bool MSGWeiterleitung::spielerLeavestChatroom( int accountId, int chatroomId )
|
|
|
int server = cs->zDB()->getChatServerId( account );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( account );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( account );
|
|
|
if( klient )
|
|
|
ret = ret & klient->spielerLeavesChatroom( chatroomId, accountId );
|
|
|
else
|
|
|
@@ -3119,24 +3112,24 @@ bool MSGWeiterleitung::spielerLeavestChatroom( int accountId, int chatroomId )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = ret & cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\xE", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&account, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&account, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -3160,7 +3153,7 @@ bool MSGWeiterleitung::freundEinladungAbgelehnt( int accountId, int zuAccountId
|
|
|
int server = cs->zDB()->getChatServerId( zuAccountId );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAccountId );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAccountId );
|
|
|
if( klient )
|
|
|
ret = ret & klient->freundesAnfrageAbgelehnt( accountId );
|
|
|
else
|
|
|
@@ -3168,23 +3161,23 @@ bool MSGWeiterleitung::freundEinladungAbgelehnt( int accountId, int zuAccountId
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\xF", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&zuAccountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&zuAccountId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -3206,7 +3199,7 @@ bool MSGWeiterleitung::chatroomEinladungAbgelehnt( int accountId, int chatroomId
|
|
|
int server = cs->zDB()->getChatServerId( zuAccountId );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAccountId );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAccountId );
|
|
|
if( klient )
|
|
|
ret = ret & klient->einladungZumChatroomAbgelehnt( accountId, chatroomId );
|
|
|
else
|
|
|
@@ -3214,24 +3207,24 @@ bool MSGWeiterleitung::chatroomEinladungAbgelehnt( int accountId, int chatroomId
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\x10", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&zuAccountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&zuAccountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -3247,7 +3240,7 @@ bool MSGWeiterleitung::chatroomEinladungAbgelehnt( int accountId, int chatroomId
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-bool MSGWeiterleitung::fehler( int zuAccountId, const char *fehler )
|
|
|
+bool MSGWeiterleitung::fehler( int zuAccountId, const char* fehler )
|
|
|
{
|
|
|
bool ret = 1;
|
|
|
char len = (char)textLength( fehler );
|
|
|
@@ -3256,7 +3249,7 @@ bool MSGWeiterleitung::fehler( int zuAccountId, const char *fehler )
|
|
|
int server = cs->zDB()->getChatServerId( zuAccountId );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAccountId );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAccountId );
|
|
|
if( klient )
|
|
|
ret = ret & klient->errorZuKlient( fehler );
|
|
|
else
|
|
|
@@ -3264,24 +3257,24 @@ bool MSGWeiterleitung::fehler( int zuAccountId, const char *fehler )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\x11", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&zuAccountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&zuAccountId, 4 );
|
|
|
ret = ret & klient->sendeEncrypted( &len, 1 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&fehler, len );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&fehler, len );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -3303,7 +3296,7 @@ bool MSGWeiterleitung::chatroomAdmin( int chatroomId, int zuAccountId )
|
|
|
int server = cs->zDB()->getChatServerId( zuAccountId );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( zuAccountId );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( zuAccountId );
|
|
|
if( klient )
|
|
|
ret = ret & klient->chatroomAdmin( chatroomId );
|
|
|
else
|
|
|
@@ -3311,23 +3304,23 @@ bool MSGWeiterleitung::chatroomAdmin( int chatroomId, int zuAccountId )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\x12", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&zuAccountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&zuAccountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -3349,7 +3342,7 @@ bool MSGWeiterleitung::chatroomKick( int chatroomId, int accountId )
|
|
|
int server = cs->zDB()->getChatServerId( accountId );
|
|
|
if( server == cs->getId() )
|
|
|
{
|
|
|
- CSKlient *klient = cs->zSendeKlient( accountId );
|
|
|
+ CSKlient* klient = cs->zSendeKlient( accountId );
|
|
|
if( klient )
|
|
|
ret = ret & klient->chatroomKick( chatroomId );
|
|
|
else
|
|
|
@@ -3357,23 +3350,23 @@ bool MSGWeiterleitung::chatroomKick( int chatroomId, int accountId )
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- char *ip = 0;
|
|
|
+ char* ip = 0;
|
|
|
unsigned short port = 0;
|
|
|
ret = cs->zDB()->getChatServerIpPort( server, &port, &ip );
|
|
|
if( ip )
|
|
|
{
|
|
|
klient = new Klient();
|
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
|
- klient->setSendeKey( (char *)key, 20 );
|
|
|
- klient->setEmpfangKey( (char *)key, 20 );
|
|
|
+ klient->setSendeKey( (char*)key, 20 );
|
|
|
+ klient->setEmpfangKey( (char*)key, 20 );
|
|
|
ret = ret & klient->verbinde( port, ip );
|
|
|
ret = ret & klient->sendeEncrypted( "\5\x13", 2 );
|
|
|
char res = 0;
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
if( res )
|
|
|
{
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
|
- ret = ret & klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&accountId, 4 );
|
|
|
+ ret = ret & klient->sendeEncrypted( (char*)&chatroomId, 4 );
|
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
|
}
|
|
|
ret = (char)ret & res;
|
|
|
@@ -3390,7 +3383,7 @@ bool MSGWeiterleitung::chatroomKick( int chatroomId, int accountId )
|
|
|
}
|
|
|
|
|
|
// constant
|
|
|
-const char *MSGWeiterleitung::getLetzterFehler()
|
|
|
+const char* MSGWeiterleitung::getLetzterFehler()
|
|
|
{
|
|
|
return letzterFehler->getText();
|
|
|
}
|
Kolja Strohm