|
@@ -19,7 +19,7 @@ ChatServer::ChatServer( InitDatei *zIni )
|
|
empfangen = 0;
|
|
empfangen = 0;
|
|
gesendet = 0;
|
|
gesendet = 0;
|
|
fehler = new Text();
|
|
fehler = new Text();
|
|
- ini = zIni->getThis();
|
|
|
|
|
|
+ ini = dynamic_cast<InitDatei *>( zIni->getThis() );
|
|
id = *zIni->zWert( "ServerId" );
|
|
id = *zIni->zWert( "ServerId" );
|
|
server = new Server();
|
|
server = new Server();
|
|
aServer = new SSLServer();
|
|
aServer = new SSLServer();
|
|
@@ -66,13 +66,13 @@ void ChatServer::runn()
|
|
if( end && klient )
|
|
if( end && klient )
|
|
{
|
|
{
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (SSLSKlient *)klient->release();
|
|
Sleep( 1000 );
|
|
Sleep( 1000 );
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
if( !klient )
|
|
if( !klient )
|
|
continue;
|
|
continue;
|
|
- CSAKlient * clHandle = new CSAKlient( klient, (ChatServer *)getThis() );
|
|
|
|
|
|
+ CSAKlient *clHandle = new CSAKlient( klient, dynamic_cast<ChatServer *>( getThis() ) );
|
|
clHandle->start();
|
|
clHandle->start();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -86,7 +86,7 @@ void ChatServer::thread()
|
|
if( !klient )
|
|
if( !klient )
|
|
continue;
|
|
continue;
|
|
Framework::getThreadRegister()->cleanUpClosedThreads();
|
|
Framework::getThreadRegister()->cleanUpClosedThreads();
|
|
- CSKlient * clHandle = new CSKlient( klient, (ChatServer *)getThis() );
|
|
|
|
|
|
+ CSKlient *clHandle = new CSKlient( klient, dynamic_cast<ChatServer *>( getThis() ) );
|
|
cs.lock();
|
|
cs.lock();
|
|
klients->set( clHandle, klientAnzahl );
|
|
klients->set( clHandle, klientAnzahl );
|
|
klientAnzahl++;
|
|
klientAnzahl++;
|
|
@@ -105,13 +105,13 @@ void ChatServer::close()
|
|
cs.lock();
|
|
cs.lock();
|
|
for( int i = 0; i < klientAnzahl; i++ )
|
|
for( int i = 0; i < klientAnzahl; i++ )
|
|
klients->z( i )->absturz();
|
|
klients->z( i )->absturz();
|
|
- klients = klients->release();
|
|
|
|
|
|
+ klients = ( RCArray<CSKlient> * )klients->release();
|
|
klientAnzahl = 0;
|
|
klientAnzahl = 0;
|
|
cs.unlock();
|
|
cs.unlock();
|
|
ende();
|
|
ende();
|
|
run = 0;
|
|
run = 0;
|
|
end = 1;
|
|
end = 1;
|
|
- Klient * klient = new Klient();
|
|
|
|
|
|
+ Klient *klient = new Klient();
|
|
klient->verbinde( aServer->getPort(), "127.0.0.1" );
|
|
klient->verbinde( aServer->getPort(), "127.0.0.1" );
|
|
Sleep( 500 );
|
|
Sleep( 500 );
|
|
aServer->trenne();
|
|
aServer->trenne();
|
|
@@ -261,7 +261,7 @@ bool ChatServer::removeKlient( int klientId )
|
|
return gefunden;
|
|
return gefunden;
|
|
}
|
|
}
|
|
|
|
|
|
-bool ChatServer::removeKlient( CSKlient * zKlient )
|
|
|
|
|
|
+bool ChatServer::removeKlient( CSKlient *zKlient )
|
|
{
|
|
{
|
|
bool gefunden = 0;
|
|
bool gefunden = 0;
|
|
cs.lock();
|
|
cs.lock();
|
|
@@ -290,7 +290,7 @@ void ChatServer::addEmpfangen( int bytes )
|
|
empfangen += bytes;
|
|
empfangen += bytes;
|
|
}
|
|
}
|
|
|
|
|
|
-int ChatServer::getKlientStatus( int klientNummer, CSKlient * zKlient )
|
|
|
|
|
|
+int ChatServer::getKlientStatus( int klientNummer, CSKlient *zKlient )
|
|
{
|
|
{
|
|
bool empf = 0;
|
|
bool empf = 0;
|
|
bool send = 0;
|
|
bool send = 0;
|
|
@@ -313,7 +313,7 @@ int ChatServer::getKlientStatus( int klientNummer, CSKlient * zKlient )
|
|
return 2;
|
|
return 2;
|
|
}
|
|
}
|
|
|
|
|
|
-CSKlient * ChatServer::zSendeKlient( int accountId )
|
|
|
|
|
|
+CSKlient *ChatServer::zSendeKlient( int accountId )
|
|
{
|
|
{
|
|
CSKlient *ret = 0;
|
|
CSKlient *ret = 0;
|
|
cs.lock();
|
|
cs.lock();
|
|
@@ -363,7 +363,7 @@ char *ChatServer::getLetzterFehler() const
|
|
|
|
|
|
// Inhalt der CSAKlient Klasse aus ChatServer.h
|
|
// Inhalt der CSAKlient Klasse aus ChatServer.h
|
|
// Konstruktor
|
|
// Konstruktor
|
|
-CSAKlient::CSAKlient( SSLSKlient * klient, ChatServer * cs )
|
|
|
|
|
|
+CSAKlient::CSAKlient( SSLSKlient *klient, ChatServer *cs )
|
|
: Thread()
|
|
: Thread()
|
|
{
|
|
{
|
|
this->klient = klient;
|
|
this->klient = klient;
|
|
@@ -401,13 +401,13 @@ void CSAKlient::thread()
|
|
{
|
|
{
|
|
klient->sende( "\1", 1 );
|
|
klient->sende( "\1", 1 );
|
|
unsigned char nLen = 0;
|
|
unsigned char nLen = 0;
|
|
- klient->getNachricht( (char *)& nLen, 1 );
|
|
|
|
|
|
+ klient->getNachricht( (char *)&nLen, 1 );
|
|
char *n = new char[ nLen + 1 ];
|
|
char *n = new char[ nLen + 1 ];
|
|
n[ (int)nLen ] = 0;
|
|
n[ (int)nLen ] = 0;
|
|
if( nLen )
|
|
if( nLen )
|
|
klient->getNachricht( n, nLen );
|
|
klient->getNachricht( n, nLen );
|
|
unsigned char pLen = 0;
|
|
unsigned char pLen = 0;
|
|
- klient->getNachricht( (char *)& pLen, 1 );
|
|
|
|
|
|
+ klient->getNachricht( (char *)&pLen, 1 );
|
|
char *p = new char[ pLen + 1 ];
|
|
char *p = new char[ pLen + 1 ];
|
|
p[ (int)pLen ] = 0;
|
|
p[ (int)pLen ] = 0;
|
|
if( pLen )
|
|
if( pLen )
|
|
@@ -503,7 +503,7 @@ void CSAKlient::thread()
|
|
}
|
|
}
|
|
else
|
|
else
|
|
ok = 1;
|
|
ok = 1;
|
|
- if( ok &&cs->hatClients() )
|
|
|
|
|
|
+ if( ok && cs->hatClients() )
|
|
{
|
|
{
|
|
errorZuKlient( "Es sind noch Klients Online. Bitte versuche es später erneut." );
|
|
errorZuKlient( "Es sind noch Klients Online. Bitte versuche es später erneut." );
|
|
break;
|
|
break;
|
|
@@ -599,7 +599,7 @@ void CSAKlient::thread()
|
|
{
|
|
{
|
|
klient->sende( "\1", 1 );
|
|
klient->sende( "\1", 1 );
|
|
int maxC = 0;
|
|
int maxC = 0;
|
|
- klient->getNachricht( (char *)& maxC, 4 );
|
|
|
|
|
|
+ klient->getNachricht( (char *)&maxC, 4 );
|
|
if( cs->zDB()->adminHatRecht( adminId, Admin_Recht::CSMCChange ) )
|
|
if( cs->zDB()->adminHatRecht( adminId, Admin_Recht::CSMCChange ) )
|
|
{
|
|
{
|
|
if( cs->setMaxKlients( maxC ) )
|
|
if( cs->setMaxKlients( maxC ) )
|
|
@@ -621,8 +621,8 @@ void CSAKlient::thread()
|
|
{
|
|
{
|
|
klient->sende( "\1", 1 );
|
|
klient->sende( "\1", 1 );
|
|
int klientId = 0;
|
|
int klientId = 0;
|
|
- klient->getNachricht( (char *)& klientId, 4 );
|
|
|
|
- if( klientId &&cs->absturzKlient( klientId ) )
|
|
|
|
|
|
+ klient->getNachricht( (char *)&klientId, 4 );
|
|
|
|
+ if( klientId && cs->absturzKlient( klientId ) )
|
|
klient->sende( "\1", 1 );
|
|
klient->sende( "\1", 1 );
|
|
else
|
|
else
|
|
klient->sende( "\0", 1 );
|
|
klient->sende( "\0", 1 );
|
|
@@ -654,7 +654,7 @@ void CSAKlient::errorZuKlient( const char *nachricht ) const // sendet eine Fehl
|
|
|
|
|
|
// Inhalt der CSKlient aus ChatServer.h
|
|
// Inhalt der CSKlient aus ChatServer.h
|
|
// Konstruktor
|
|
// Konstruktor
|
|
-CSKlient::CSKlient( SKlient * klient, ChatServer * cs )
|
|
|
|
|
|
+CSKlient::CSKlient( SKlient *klient, ChatServer *cs )
|
|
: Thread()
|
|
: Thread()
|
|
{
|
|
{
|
|
this->klient = klient;
|
|
this->klient = klient;
|
|
@@ -699,7 +699,7 @@ void CSKlient::absturz()
|
|
if( empfangen )
|
|
if( empfangen )
|
|
{
|
|
{
|
|
cs->zDB()->unregisterKlient( klientNummer, cs->getId() );
|
|
cs->zDB()->unregisterKlient( klientNummer, cs->getId() );
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
weiter->accountOffline( accountId );
|
|
weiter->accountOffline( accountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
@@ -719,7 +719,7 @@ void CSKlient::thread()
|
|
switch( c )
|
|
switch( c )
|
|
{
|
|
{
|
|
case 1: // Klient identifikation
|
|
case 1: // Klient identifikation
|
|
- klient->getNachrichtEncrypted( (char *)& klientNummer, 4 );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&klientNummer, 4 );
|
|
if( !cs->zDB()->proveKlient( klientNummer, cs->getId() ) )
|
|
if( !cs->zDB()->proveKlient( klientNummer, cs->getId() ) )
|
|
{
|
|
{
|
|
klientNummer = 0;
|
|
klientNummer = 0;
|
|
@@ -756,7 +756,7 @@ void CSKlient::thread()
|
|
if( status == 1 )
|
|
if( status == 1 )
|
|
{
|
|
{
|
|
empfangen = 0;
|
|
empfangen = 0;
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
weiter->accountOnline( accountId );
|
|
weiter->accountOnline( accountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
br = 1;
|
|
br = 1;
|
|
@@ -777,8 +777,8 @@ void CSKlient::thread()
|
|
if( 1 )
|
|
if( 1 )
|
|
{
|
|
{
|
|
int klientId = 0;
|
|
int klientId = 0;
|
|
- klient->getNachrichtEncrypted( (char *)& klientId, 4 );
|
|
|
|
- if( klientId &&cs->absturzKlient( klientId ) )
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&klientId, 4 );
|
|
|
|
+ if( klientId && cs->absturzKlient( klientId ) )
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
else
|
|
else
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
@@ -824,7 +824,7 @@ void CSKlient::thread()
|
|
{
|
|
{
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int id = 0;
|
|
int id = 0;
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)& id, 4 ) );
|
|
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&id, 4 ) );
|
|
CSKlient *c = cs->zSendeKlient( id );
|
|
CSKlient *c = cs->zSendeKlient( id );
|
|
if( c )
|
|
if( c )
|
|
{
|
|
{
|
|
@@ -840,8 +840,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int accId = 0;
|
|
int accId = 0;
|
|
int freundId = 0;
|
|
int freundId = 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 *)&accId, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->freundOnline( accId ) );
|
|
res = (char)( res & (char)klient->freundOnline( accId ) );
|
|
@@ -855,8 +855,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int accId = 0;
|
|
int accId = 0;
|
|
int freundId = 0;
|
|
int freundId = 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 *)&accId, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->freundOffline( accId ) );
|
|
res = (char)( res & (char)klient->freundOffline( accId ) );
|
|
@@ -872,9 +872,9 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
unsigned char len = 0;
|
|
unsigned char len = 0;
|
|
char *nachricht = 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 ) );
|
|
|
|
|
|
+ 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 )
|
|
if( len )
|
|
{
|
|
{
|
|
nachricht = new char[ len + 1 ];
|
|
nachricht = new char[ len + 1 ];
|
|
@@ -896,9 +896,9 @@ void CSKlient::thread()
|
|
int vonAcc = 0;
|
|
int vonAcc = 0;
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int gruppeId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->gruppeEinladung( vonAcc, gruppeId ) );
|
|
res = (char)( res & (char)klient->gruppeEinladung( vonAcc, gruppeId ) );
|
|
@@ -914,9 +914,9 @@ void CSKlient::thread()
|
|
int freundId = 0;
|
|
int freundId = 0;
|
|
unsigned char len = 0;
|
|
unsigned char len = 0;
|
|
char *status = 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 ) );
|
|
|
|
|
|
+ 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 )
|
|
if( len )
|
|
{
|
|
{
|
|
status = new char[ len + 1 ];
|
|
status = new char[ len + 1 ];
|
|
@@ -939,9 +939,9 @@ void CSKlient::thread()
|
|
int freundId = 0;
|
|
int freundId = 0;
|
|
unsigned char len = 0;
|
|
unsigned char len = 0;
|
|
char *name = 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 ) );
|
|
|
|
|
|
+ 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 )
|
|
if( len )
|
|
{
|
|
{
|
|
name = new char[ len + 1 ];
|
|
name = new char[ len + 1 ];
|
|
@@ -962,8 +962,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int accId = 0;
|
|
int accId = 0;
|
|
int freundId = 0;
|
|
int freundId = 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 *)&accId, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->keinFreundMehr( accId ) );
|
|
res = (char)( res & (char)klient->keinFreundMehr( accId ) );
|
|
@@ -977,8 +977,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int accId = 0;
|
|
int accId = 0;
|
|
int freundId = 0;
|
|
int freundId = 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 *)&accId, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->freundesAnfrage( accId ) );
|
|
res = (char)( res & (char)klient->freundesAnfrage( accId ) );
|
|
@@ -992,8 +992,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int accId = 0;
|
|
int accId = 0;
|
|
int freundId = 0;
|
|
int freundId = 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 *)&accId, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->neuerFreund( accountId ) );
|
|
res = (char)( res & (char)klient->neuerFreund( accountId ) );
|
|
@@ -1008,9 +1008,9 @@ void CSKlient::thread()
|
|
int vonAcc = 0;
|
|
int vonAcc = 0;
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int chatroomId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->einladungZumChatroom( vonAcc, chatroomId ) );
|
|
res = (char)( res & (char)klient->einladungZumChatroom( vonAcc, chatroomId ) );
|
|
@@ -1025,9 +1025,9 @@ void CSKlient::thread()
|
|
int accId = 0;
|
|
int accId = 0;
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int chatroomId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->spielerBetrittChatroom( chatroomId, accId ) );
|
|
res = (char)( res & (char)klient->spielerBetrittChatroom( chatroomId, accId ) );
|
|
@@ -1044,10 +1044,10 @@ void CSKlient::thread()
|
|
int chatroomId = 0;
|
|
int chatroomId = 0;
|
|
unsigned char len = 0;
|
|
unsigned char len = 0;
|
|
char *nachricht = 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 ) );
|
|
|
|
|
|
+ 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 )
|
|
if( len )
|
|
{
|
|
{
|
|
nachricht = new char[ len + 1 ];
|
|
nachricht = new char[ len + 1 ];
|
|
@@ -1069,9 +1069,9 @@ void CSKlient::thread()
|
|
int accId = 0;
|
|
int accId = 0;
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int chatroomId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->spielerLeavesChatroom( chatroomId, accId ) );
|
|
res = (char)( res & (char)klient->spielerLeavesChatroom( chatroomId, accId ) );
|
|
@@ -1085,8 +1085,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int accId = 0;
|
|
int accId = 0;
|
|
int freundId = 0;
|
|
int freundId = 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 *)&accId, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&freundId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
CSKlient *klient = cs->zSendeKlient( freundId );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->freundesAnfrageAbgelehnt( accId ) );
|
|
res = (char)( res & (char)klient->freundesAnfrageAbgelehnt( accId ) );
|
|
@@ -1101,9 +1101,9 @@ void CSKlient::thread()
|
|
int accId = 0;
|
|
int accId = 0;
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int chatroomId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->einladungZumChatroomAbgelehnt( accId, chatroomId ) );
|
|
res = (char)( res & (char)klient->einladungZumChatroomAbgelehnt( accId, chatroomId ) );
|
|
@@ -1118,8 +1118,8 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
unsigned char len = 0;
|
|
unsigned char len = 0;
|
|
char *nachricht = 0;
|
|
char *nachricht = 0;
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)& zuAcc, 4 ) );
|
|
|
|
- res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)& len, 1 ) );
|
|
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&zuAcc, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&len, 1 ) );
|
|
if( len )
|
|
if( len )
|
|
{
|
|
{
|
|
nachricht = new char[ len + 1 ];
|
|
nachricht = new char[ len + 1 ];
|
|
@@ -1140,8 +1140,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int chatroomId = 0;
|
|
int chatroomId = 0;
|
|
- 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 *)&zuAcc, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&chatroomId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->chatroomAdmin( chatroomId ) );
|
|
res = (char)( res & (char)klient->chatroomAdmin( chatroomId ) );
|
|
@@ -1155,8 +1155,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int chatroomId = 0;
|
|
int chatroomId = 0;
|
|
- 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 *)&zuAcc, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&chatroomId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->chatroomKick( chatroomId ) );
|
|
res = (char)( res & (char)klient->chatroomKick( chatroomId ) );
|
|
@@ -1171,9 +1171,9 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int accountId = 0;
|
|
int accountId = 0;
|
|
int gruppeId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->spielerBertittGruppe( accountId, gruppeId ) );
|
|
res = (char)( res & (char)klient->spielerBertittGruppe( accountId, gruppeId ) );
|
|
@@ -1188,9 +1188,9 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int accountId = 0;
|
|
int accountId = 0;
|
|
int gruppeId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->spielerLeavesGruppe( accountId, gruppeId ) );
|
|
res = (char)( res & (char)klient->spielerLeavesGruppe( accountId, gruppeId ) );
|
|
@@ -1204,8 +1204,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int gruppeId = 0;
|
|
int gruppeId = 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 *)&zuAcc, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->kickAusGruppe( gruppeId ) );
|
|
res = (char)( res & (char)klient->kickAusGruppe( gruppeId ) );
|
|
@@ -1219,8 +1219,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int gruppeId = 0;
|
|
int gruppeId = 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 *)&zuAcc, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->gruppeAnmelden( gruppeId ) );
|
|
res = (char)( res & (char)klient->gruppeAnmelden( gruppeId ) );
|
|
@@ -1234,8 +1234,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int gruppeId = 0;
|
|
int gruppeId = 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 *)&zuAcc, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->gruppeAbmelden( gruppeId ) );
|
|
res = (char)( res & (char)klient->gruppeAbmelden( gruppeId ) );
|
|
@@ -1250,14 +1250,14 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int gruppeId = 0;
|
|
int gruppeId = 0;
|
|
unsigned char len;
|
|
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 ) );
|
|
|
|
|
|
+ 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 ];
|
|
char *nachricht = new char[ len + 1 ];
|
|
nachricht[ (int)len ] = 0;
|
|
nachricht[ (int)len ] = 0;
|
|
if( len )
|
|
if( len )
|
|
res = (char)( res & (char)klient->getNachrichtEncrypted( nachricht, len ) );
|
|
res = (char)( res & (char)klient->getNachrichtEncrypted( nachricht, len ) );
|
|
- CSKlient * klient = cs->zSendeKlient( zuAcc );
|
|
|
|
|
|
+ CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->gruppeNachricht( gruppeId, nachricht ) );
|
|
res = (char)( res & (char)klient->gruppeNachricht( gruppeId, nachricht ) );
|
|
else
|
|
else
|
|
@@ -1272,8 +1272,8 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int gruppeId = 0;
|
|
int gruppeId = 0;
|
|
char starten;
|
|
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( (char *)&zuAcc, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&gruppeId, 4 ) );
|
|
res = (char)( res & (char)klient->getNachrichtEncrypted( &starten, 1 ) );
|
|
res = (char)( res & (char)klient->getNachrichtEncrypted( &starten, 1 ) );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
@@ -1289,9 +1289,9 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int adminId = 0;
|
|
int adminId = 0;
|
|
int gruppeId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->setGruppeAdmin( gruppeId, adminId ) );
|
|
res = (char)( res & (char)klient->setGruppeAdmin( gruppeId, adminId ) );
|
|
@@ -1306,9 +1306,9 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int accountId = 0;
|
|
int accountId = 0;
|
|
int gruppeId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->gruppeEinladungAbgelehnt( gruppeId, accountId ) );
|
|
res = (char)( res & (char)klient->gruppeEinladungAbgelehnt( gruppeId, accountId ) );
|
|
@@ -1323,8 +1323,8 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
unsigned short port;
|
|
unsigned short port;
|
|
unsigned char *ip = new unsigned char[ 4 ];
|
|
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 *)&zuAcc, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)&port, 2 ) );
|
|
res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)ip, 4 ) );
|
|
res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)ip, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
@@ -1341,9 +1341,9 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int gruppeId = 0;
|
|
int gruppeId = 0;
|
|
int accountId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->gruppeEinladungAbgebrochen( gruppeId, accountId ) );
|
|
res = (char)( res & (char)klient->gruppeEinladungAbgebrochen( gruppeId, accountId ) );
|
|
@@ -1358,9 +1358,9 @@ void CSKlient::thread()
|
|
int zuAcc = 0;
|
|
int zuAcc = 0;
|
|
int gruppeId = 0;
|
|
int gruppeId = 0;
|
|
int accountId = 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 ) );
|
|
|
|
|
|
+ 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 );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->gruppeEinladungNeu( gruppeId, accountId ) );
|
|
res = (char)( res & (char)klient->gruppeEinladungNeu( gruppeId, accountId ) );
|
|
@@ -1390,14 +1390,14 @@ void CSKlient::thread()
|
|
int zuAccount = 0;
|
|
int zuAccount = 0;
|
|
unsigned char len = 0;
|
|
unsigned char len = 0;
|
|
char *nachricht = 0;
|
|
char *nachricht = 0;
|
|
- klient->getNachrichtEncrypted( (char *)& zuAccount, 4 );
|
|
|
|
- klient->getNachrichtEncrypted( (char *)& len, 1 );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&zuAccount, 4 );
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&len, 1 );
|
|
if( len )
|
|
if( len )
|
|
{
|
|
{
|
|
nachricht = new char[ len + 1 ];
|
|
nachricht = new char[ len + 1 ];
|
|
nachricht[ (int)len ] = 0;
|
|
nachricht[ (int)len ] = 0;
|
|
klient->getNachrichtEncrypted( nachricht, len );
|
|
klient->getNachrichtEncrypted( nachricht, len );
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
if( !weiter->chatNachricht( accountId, zuAccount, nachricht ) )
|
|
if( !weiter->chatNachricht( accountId, zuAccount, nachricht ) )
|
|
{
|
|
{
|
|
cs->zDB()->speicherChatNachricht( accountId, zuAccount, nachricht );
|
|
cs->zDB()->speicherChatNachricht( accountId, zuAccount, nachricht );
|
|
@@ -1424,7 +1424,7 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
unsigned char len;
|
|
unsigned char len;
|
|
char *name;
|
|
char *name;
|
|
- klient->getNachrichtEncrypted( (char *)& len, 1 );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&len, 1 );
|
|
if( len )
|
|
if( len )
|
|
{
|
|
{
|
|
name = new char[ len + 1 ];
|
|
name = new char[ len + 1 ];
|
|
@@ -1433,7 +1433,7 @@ void CSKlient::thread()
|
|
if( cs->zDB()->accountNameChange( accountId, name ) )
|
|
if( cs->zDB()->accountNameChange( accountId, name ) )
|
|
{
|
|
{
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
weiter->accountNameChange( accountId, name );
|
|
weiter->accountNameChange( accountId, name );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
@@ -1461,11 +1461,11 @@ void CSKlient::thread()
|
|
}
|
|
}
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int freundId = 0;
|
|
int freundId = 0;
|
|
- klient->getNachrichtEncrypted( (char *)& freundId, 4 );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&freundId, 4 );
|
|
if( cs->zDB()->beendeFreundschaft( accountId, freundId ) )
|
|
if( cs->zDB()->beendeFreundschaft( accountId, freundId ) )
|
|
{
|
|
{
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
weiter->accountKeinFreundMehr( accountId, freundId );
|
|
weiter->accountKeinFreundMehr( accountId, freundId );
|
|
weiter->accountKeinFreundMehr( freundId, accountId );
|
|
weiter->accountKeinFreundMehr( freundId, accountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
@@ -1492,10 +1492,10 @@ void CSKlient::thread()
|
|
}
|
|
}
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int freundId = 0;
|
|
int freundId = 0;
|
|
- klient->getNachrichtEncrypted( (char *)& freundId, 4 );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&freundId, 4 );
|
|
if( cs->zDB()->proveFreundschaftsAnfrage( accountId, freundId ) )
|
|
if( cs->zDB()->proveFreundschaftsAnfrage( accountId, freundId ) )
|
|
{
|
|
{
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
if( !weiter->freundesAnfrage( accountId, freundId ) )
|
|
if( !weiter->freundesAnfrage( accountId, freundId ) )
|
|
cs->zDB()->saveFreundschaftsAnfrage( accountId, freundId );
|
|
cs->zDB()->saveFreundschaftsAnfrage( accountId, freundId );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
@@ -1524,9 +1524,9 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int zuAccount = 0;
|
|
int zuAccount = 0;
|
|
char ok = 0;
|
|
char ok = 0;
|
|
- klient->getNachrichtEncrypted( (char *)& zuAccount, 4 );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&zuAccount, 4 );
|
|
klient->getNachrichtEncrypted( &ok, 1 );
|
|
klient->getNachrichtEncrypted( &ok, 1 );
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
if( !ok )
|
|
if( !ok )
|
|
{
|
|
{
|
|
weiter->freundEinladungAbgelehnt( accountId, zuAccount );
|
|
weiter->freundEinladungAbgelehnt( accountId, zuAccount );
|
|
@@ -1571,7 +1571,7 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
unsigned char nLen = 0;
|
|
unsigned char nLen = 0;
|
|
char *name = 0;
|
|
char *name = 0;
|
|
- klient->getNachrichtEncrypted( (char *)& nLen, 1 );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&nLen, 1 );
|
|
if( nLen )
|
|
if( nLen )
|
|
{
|
|
{
|
|
name = new char[ nLen + 1 ];
|
|
name = new char[ nLen + 1 ];
|
|
@@ -1589,7 +1589,7 @@ void CSKlient::thread()
|
|
{
|
|
{
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int id = cs->zDB()->chatroomErstellen( accountId, name );
|
|
int id = cs->zDB()->chatroomErstellen( accountId, name );
|
|
- klient->sendeEncrypted( (char *)& id, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&id, 4 );
|
|
if( !id )
|
|
if( !id )
|
|
{
|
|
{
|
|
CSKlient *c = cs->zSendeKlient( accountId );
|
|
CSKlient *c = cs->zSendeKlient( accountId );
|
|
@@ -1623,11 +1623,11 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int zuAccountId = 0;
|
|
int zuAccountId = 0;
|
|
int chatroomId = 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 ) )
|
|
if( cs->zDB()->proveChatroomEinladung( accountId, zuAccountId, chatroomId ) )
|
|
{
|
|
{
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
if( weiter->einladungZumChatroom( accountId, zuAccountId, chatroomId ) )
|
|
if( weiter->einladungZumChatroom( accountId, zuAccountId, chatroomId ) )
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
else
|
|
else
|
|
@@ -1665,9 +1665,9 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int zuAccountId = 0;
|
|
int zuAccountId = 0;
|
|
int chatroomId = 0;
|
|
int chatroomId = 0;
|
|
- klient->getNachrichtEncrypted( (char *)& zuAccountId, 4 );
|
|
|
|
- klient->getNachrichtEncrypted( (char *)& chatroomId, 4 );
|
|
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (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 );
|
|
weiter->chatroomEinladungAbgelehnt( accountId, chatroomId, zuAccountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
@@ -1686,10 +1686,10 @@ void CSKlient::thread()
|
|
}
|
|
}
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int chatroomId = 0;
|
|
int chatroomId = 0;
|
|
- klient->getNachrichtEncrypted( (char *)& chatroomId, 4 );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&chatroomId, 4 );
|
|
if( cs->zDB()->chatroomBeitreten( accountId, chatroomId ) )
|
|
if( cs->zDB()->chatroomBeitreten( accountId, chatroomId ) )
|
|
{
|
|
{
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
weiter->spielerBetrittChatroom( accountId, chatroomId );
|
|
weiter->spielerBetrittChatroom( accountId, chatroomId );
|
|
delete weiter;
|
|
delete weiter;
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
@@ -1722,8 +1722,8 @@ void CSKlient::thread()
|
|
int chatroomId = 0;
|
|
int chatroomId = 0;
|
|
unsigned char len = 0;
|
|
unsigned char len = 0;
|
|
char *nachricht = 0;
|
|
char *nachricht = 0;
|
|
- klient->getNachrichtEncrypted( (char *)& chatroomId, 4 );
|
|
|
|
- klient->getNachrichtEncrypted( (char *)& len, 1 );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&chatroomId, 4 );
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&len, 1 );
|
|
if( len )
|
|
if( len )
|
|
{
|
|
{
|
|
nachricht = new char[ len + 1 ];
|
|
nachricht = new char[ len + 1 ];
|
|
@@ -1732,7 +1732,7 @@ void CSKlient::thread()
|
|
Text *message = cs->zDB()->getAccountRufName( accountId );
|
|
Text *message = cs->zDB()->getAccountRufName( accountId );
|
|
message->append( ": " );
|
|
message->append( ": " );
|
|
message->append( nachricht );
|
|
message->append( nachricht );
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
if( weiter->chatroomNachricht( accountId, message->getText(), chatroomId ) )
|
|
if( weiter->chatroomNachricht( accountId, message->getText(), chatroomId ) )
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
else
|
|
else
|
|
@@ -1766,7 +1766,7 @@ void CSKlient::thread()
|
|
}
|
|
}
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int chatroomId = 0;
|
|
int chatroomId = 0;
|
|
- klient->getNachrichtEncrypted( (char *)& chatroomId, 4 );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)&chatroomId, 4 );
|
|
int aktion = cs->zDB()->chatroomVerlassen( accountId, chatroomId );
|
|
int aktion = cs->zDB()->chatroomVerlassen( accountId, chatroomId );
|
|
if( !aktion )
|
|
if( !aktion )
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
@@ -1774,13 +1774,13 @@ void CSKlient::thread()
|
|
{
|
|
{
|
|
if( aktion == 3 )
|
|
if( aktion == 3 )
|
|
{
|
|
{
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
weiter->chatroomAdmin( chatroomId, cs->zDB()->getChatroomAdmin( chatroomId ) );
|
|
weiter->chatroomAdmin( chatroomId, cs->zDB()->getChatroomAdmin( chatroomId ) );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
if( aktion != 2 )
|
|
if( aktion != 2 )
|
|
{
|
|
{
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
weiter->spielerLeavestChatroom( accountId, chatroomId );
|
|
weiter->spielerLeavestChatroom( accountId, chatroomId );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
@@ -1802,8 +1802,8 @@ void CSKlient::thread()
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
int chatroomId = 0;
|
|
int chatroomId = 0;
|
|
int accountId = 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 )
|
|
if( accountId == (int)this->accountId )
|
|
{
|
|
{
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
klient->sendeEncrypted( "\0", 1 );
|
|
@@ -1816,7 +1816,7 @@ void CSKlient::thread()
|
|
{
|
|
{
|
|
if( cs->zDB()->chatroomVerlassen( accountId, chatroomId ) )
|
|
if( cs->zDB()->chatroomVerlassen( accountId, chatroomId ) )
|
|
{
|
|
{
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
weiter->chatroomKick( chatroomId, accountId );
|
|
weiter->chatroomKick( chatroomId, accountId );
|
|
weiter->spielerLeavestChatroom( accountId, chatroomId );
|
|
weiter->spielerLeavestChatroom( accountId, chatroomId );
|
|
delete weiter;
|
|
delete weiter;
|
|
@@ -1917,7 +1917,7 @@ void CSKlient::thread()
|
|
{
|
|
{
|
|
if( accountId )
|
|
if( accountId )
|
|
{
|
|
{
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
weiter->accountOffline( accountId );
|
|
weiter->accountOffline( accountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
@@ -1936,7 +1936,7 @@ bool CSKlient::kick()
|
|
klient->trenne();
|
|
klient->trenne();
|
|
warteAufThread( 100 );
|
|
warteAufThread( 100 );
|
|
ende();
|
|
ende();
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( dynamic_cast<ChatServer *>( cs->getThis() ) );
|
|
weiter->accountOffline( accountId );
|
|
weiter->accountOffline( accountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
@@ -1959,7 +1959,7 @@ bool CSKlient::nachricht( int vonAccount, const char *txt )
|
|
{
|
|
{
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\4", 1 );
|
|
klient->sendeEncrypted( "\4", 1 );
|
|
- klient->sendeEncrypted( (char *)& vonAccount, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&vonAccount, 4 );
|
|
klient->sendeEncrypted( &len, 1 );
|
|
klient->sendeEncrypted( &len, 1 );
|
|
klient->sendeEncrypted( txt, len );
|
|
klient->sendeEncrypted( txt, len );
|
|
unlock();
|
|
unlock();
|
|
@@ -1975,8 +1975,8 @@ bool CSKlient::gruppeEinladung( int vonAccount, int gruppeId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\5", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -1992,7 +1992,7 @@ bool CSKlient::accountStatusChange( int account, const char *status )
|
|
{
|
|
{
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\6", 1 );
|
|
klient->sendeEncrypted( "\6", 1 );
|
|
- klient->sendeEncrypted( (char *)& account, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&account, 4 );
|
|
klient->sendeEncrypted( &len, 1 );
|
|
klient->sendeEncrypted( &len, 1 );
|
|
klient->sendeEncrypted( status, len );
|
|
klient->sendeEncrypted( status, len );
|
|
unlock();
|
|
unlock();
|
|
@@ -2011,7 +2011,7 @@ bool CSKlient::accountNameChange( int account, const char *name )
|
|
{
|
|
{
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\7", 1 );
|
|
klient->sendeEncrypted( "\7", 1 );
|
|
- klient->sendeEncrypted( (char *)& account, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&account, 4 );
|
|
klient->sendeEncrypted( &len, 1 );
|
|
klient->sendeEncrypted( &len, 1 );
|
|
klient->sendeEncrypted( name, len );
|
|
klient->sendeEncrypted( name, len );
|
|
unlock();
|
|
unlock();
|
|
@@ -2027,7 +2027,7 @@ bool CSKlient::keinFreundMehr( int account )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x8", 1 );
|
|
klient->sendeEncrypted( "\x8", 1 );
|
|
- klient->sendeEncrypted( (char *)& account, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&account, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2040,7 +2040,7 @@ bool CSKlient::freundesAnfrage( int vonAccount )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x9", 1 );
|
|
klient->sendeEncrypted( "\x9", 1 );
|
|
- klient->sendeEncrypted( (char *)& vonAccount, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&vonAccount, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2053,7 +2053,7 @@ bool CSKlient::neuerFreund( int account )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\xA", 1 );
|
|
klient->sendeEncrypted( "\xA", 1 );
|
|
- klient->sendeEncrypted( (char *)& account, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&account, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2066,7 +2066,7 @@ bool CSKlient::freundesAnfrageAbgelehnt( int account )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\xB", 1 );
|
|
klient->sendeEncrypted( "\xB", 1 );
|
|
- klient->sendeEncrypted( (char *)& account, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&account, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2079,8 +2079,8 @@ bool CSKlient::einladungZumChatroom( int vonAccount, int chatroomId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\xC", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2093,8 +2093,8 @@ bool CSKlient::einladungZumChatroomAbgelehnt( int account, int chatroomId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\xD", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2107,8 +2107,8 @@ bool CSKlient::spielerBetrittChatroom( int chatroomId, int account )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\xE", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2124,8 +2124,8 @@ bool CSKlient::chatroomNachricht( int chatroomId, int vonAccount, const char *na
|
|
{
|
|
{
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\xF", 1 );
|
|
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( &len, 1 );
|
|
klient->sendeEncrypted( nachricht, len );
|
|
klient->sendeEncrypted( nachricht, len );
|
|
unlock();
|
|
unlock();
|
|
@@ -2141,15 +2141,15 @@ bool CSKlient::spielerLeavesChatroom( int chatroomId, int accountId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x10", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
|
|
-bool CSKlient::freunde( char anzahl, Array< int > * zAccountId )
|
|
|
|
|
|
+bool CSKlient::freunde( char anzahl, Array< int > *zAccountId )
|
|
{
|
|
{
|
|
if( empfangen )
|
|
if( empfangen )
|
|
return 0;
|
|
return 0;
|
|
@@ -2159,7 +2159,7 @@ bool CSKlient::freunde( char anzahl, Array< int > * zAccountId )
|
|
for( int i = 0; i < anzahl; i++ )
|
|
for( int i = 0; i < anzahl; i++ )
|
|
{
|
|
{
|
|
int accId = zAccountId->get( i );
|
|
int accId = zAccountId->get( i );
|
|
- klient->sendeEncrypted( (char *)& accId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&accId, 4 );
|
|
}
|
|
}
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
@@ -2167,18 +2167,18 @@ bool CSKlient::freunde( char anzahl, Array< int > * zAccountId )
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
|
|
-bool CSKlient::spielerImChatroom( int chatroomId, char anzahl, Array< int > * zAccountId )
|
|
|
|
|
|
+bool CSKlient::spielerImChatroom( int chatroomId, char anzahl, Array< int > *zAccountId )
|
|
{
|
|
{
|
|
if( empfangen )
|
|
if( empfangen )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x12", 1 );
|
|
klient->sendeEncrypted( "\x12", 1 );
|
|
- klient->sendeEncrypted( (char *)& chatroomId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
klient->sendeEncrypted( &anzahl, 1 );
|
|
klient->sendeEncrypted( &anzahl, 1 );
|
|
for( int i = 0; i < anzahl; i++ )
|
|
for( int i = 0; i < anzahl; i++ )
|
|
{
|
|
{
|
|
int accId = zAccountId->get( i );
|
|
int accId = zAccountId->get( i );
|
|
- klient->sendeEncrypted( (char *)& accId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&accId, 4 );
|
|
}
|
|
}
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
@@ -2192,7 +2192,7 @@ bool CSKlient::freundOnline( int accountId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x13", 1 );
|
|
klient->sendeEncrypted( "\x13", 1 );
|
|
- klient->sendeEncrypted( (char *)& accountId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2205,7 +2205,7 @@ bool CSKlient::freundOffline( int accountId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x14", 1 );
|
|
klient->sendeEncrypted( "\x14", 1 );
|
|
- klient->sendeEncrypted( (char *)& accountId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2218,7 +2218,7 @@ bool CSKlient::chatroomAdmin( int chatroomId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x15", 1 );
|
|
klient->sendeEncrypted( "\x15", 1 );
|
|
- klient->sendeEncrypted( (char *)& chatroomId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2231,7 +2231,7 @@ bool CSKlient::chatroomKick( int chatroomId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x16", 1 );
|
|
klient->sendeEncrypted( "\x16", 1 );
|
|
- klient->sendeEncrypted( (char *)& chatroomId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&chatroomId, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2244,8 +2244,8 @@ bool CSKlient::spielerBertittGruppe( int accountId, int gruppeId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x17", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2258,8 +2258,8 @@ bool CSKlient::spielerLeavesGruppe( int accountId, int gruppeId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x18", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2275,7 +2275,7 @@ bool CSKlient::gruppeNachricht( int gruppeId, char *nachricht )
|
|
return 1;
|
|
return 1;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x19", 1 );
|
|
klient->sendeEncrypted( "\x19", 1 );
|
|
- klient->sendeEncrypted( (char *)& gruppeId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
klient->sendeEncrypted( &len, 1 );
|
|
klient->sendeEncrypted( &len, 1 );
|
|
klient->sendeEncrypted( nachricht, len );
|
|
klient->sendeEncrypted( nachricht, len );
|
|
unlock();
|
|
unlock();
|
|
@@ -2290,7 +2290,7 @@ bool CSKlient::gruppeAnmelden( int gruppeId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x1A", 1 );
|
|
klient->sendeEncrypted( "\x1A", 1 );
|
|
- klient->sendeEncrypted( (char *)& gruppeId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2303,7 +2303,7 @@ bool CSKlient::gruppeAbmelden( int gruppeId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x1B", 1 );
|
|
klient->sendeEncrypted( "\x1B", 1 );
|
|
- klient->sendeEncrypted( (char *)& gruppeId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2316,7 +2316,7 @@ bool CSKlient::gruppeSpielStarten( int gruppeId, bool starten )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x1C", 1 );
|
|
klient->sendeEncrypted( "\x1C", 1 );
|
|
- klient->sendeEncrypted( (char *)& gruppeId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
if( starten )
|
|
if( starten )
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
else
|
|
else
|
|
@@ -2333,8 +2333,8 @@ bool CSKlient::setGruppeAdmin( int gruppeId, int adminId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x1E", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2347,7 +2347,7 @@ bool CSKlient::kickAusGruppe( int gruppeId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x1D", 1 );
|
|
klient->sendeEncrypted( "\x1D", 1 );
|
|
- klient->sendeEncrypted( (char *)& gruppeId, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&gruppeId, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2360,8 +2360,8 @@ bool CSKlient::gruppeEinladungAbgelehnt( int gruppeId, int accountId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x1F", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2374,7 +2374,7 @@ bool CSKlient::spielServerVerbindungsAnfrage( unsigned short port, unsigned char
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x20", 1 );
|
|
klient->sendeEncrypted( "\x20", 1 );
|
|
- klient->sendeEncrypted( (char *)& port, 2 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)&port, 2 );
|
|
klient->sendeEncrypted( (char *)ip, 4 );
|
|
klient->sendeEncrypted( (char *)ip, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
@@ -2388,8 +2388,8 @@ bool CSKlient::gruppeEinladungAbgebrochen( int gruppeId, int accountId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x21", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2402,8 +2402,8 @@ bool CSKlient::gruppeEinladungNeu( int gruppeId, int accountId )
|
|
return 0;
|
|
return 0;
|
|
lock();
|
|
lock();
|
|
klient->sendeEncrypted( "\x22", 1 );
|
|
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();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2460,7 +2460,7 @@ bool CSKlient::istEmpfang() const
|
|
|
|
|
|
// Inhalt der MSGWeiterleitung Klasse aus ChatServer.h
|
|
// Inhalt der MSGWeiterleitung Klasse aus ChatServer.h
|
|
// Konstruktor
|
|
// Konstruktor
|
|
-MSGWeiterleitung::MSGWeiterleitung( ChatServer * cs )
|
|
|
|
|
|
+MSGWeiterleitung::MSGWeiterleitung( ChatServer *cs )
|
|
{
|
|
{
|
|
klient = 0;
|
|
klient = 0;
|
|
this->cs = cs;
|
|
this->cs = cs;
|
|
@@ -2511,14 +2511,14 @@ bool MSGWeiterleitung::kickKlient( int accountId )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
if( res )
|
|
{
|
|
{
|
|
- ret = ret & klient->sendeEncrypted( (char *)& accountId, 4 );
|
|
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)&accountId, 4 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient *)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -2561,15 +2561,15 @@ bool MSGWeiterleitung::accountOnline( int accountId )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -2614,15 +2614,15 @@ bool MSGWeiterleitung::accountOffline( int accountId )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -2662,20 +2662,20 @@ bool MSGWeiterleitung::chatNachricht( int vonAccount, int zuAccount, const char
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\4", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\4", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
- ret = ret & klient->getNachrichtEncrypted( (char *)& res, 1 );
|
|
|
|
|
|
+ ret = ret & klient->getNachrichtEncrypted( (char *)&res, 1 );
|
|
if( res )
|
|
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( &len, 1 );
|
|
ret = ret & klient->sendeEncrypted( (char *)nachricht, len );
|
|
ret = ret & klient->sendeEncrypted( (char *)nachricht, len );
|
|
- ret = ret & klient->getNachrichtEncrypted( (char *)& res, 1 );
|
|
|
|
|
|
+ ret = ret & klient->getNachrichtEncrypted( (char *)&res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -2690,7 +2690,7 @@ bool MSGWeiterleitung::accountStatusChange( int accountId, const char *status )
|
|
char len = (char)textLength( status );
|
|
char len = (char)textLength( status );
|
|
if( !len )
|
|
if( !len )
|
|
return 1;
|
|
return 1;
|
|
- Array< int > * accId = new Array< int >();
|
|
|
|
|
|
+ Array< int > *accId = new Array< int >();
|
|
int anzahl = cs->zDB()->getAccountOnlineFreunde( accountId, accId );
|
|
int anzahl = cs->zDB()->getAccountOnlineFreunde( accountId, accId );
|
|
for( int i = 0; i < anzahl; i++ )
|
|
for( int i = 0; i < anzahl; i++ )
|
|
{
|
|
{
|
|
@@ -2721,9 +2721,9 @@ bool MSGWeiterleitung::accountStatusChange( int accountId, const char *status )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 *)&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 *)status, len );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
@@ -2731,7 +2731,7 @@ bool MSGWeiterleitung::accountStatusChange( int accountId, const char *status )
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -2748,7 +2748,7 @@ bool MSGWeiterleitung::accountNameChange( int accountId, const char *name )
|
|
char len = (char)textLength( name );
|
|
char len = (char)textLength( name );
|
|
if( !name )
|
|
if( !name )
|
|
return 1;
|
|
return 1;
|
|
- Array< int > * accId = new Array< int >();
|
|
|
|
|
|
+ Array< int > *accId = new Array< int >();
|
|
int anzahl = cs->zDB()->getAccountOnlineFreunde( accountId, accId );
|
|
int anzahl = cs->zDB()->getAccountOnlineFreunde( accountId, accId );
|
|
for( int i = 0; i < anzahl; i++ )
|
|
for( int i = 0; i < anzahl; i++ )
|
|
{
|
|
{
|
|
@@ -2779,9 +2779,9 @@ bool MSGWeiterleitung::accountNameChange( int accountId, const char *name )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 *)&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 *)name, len );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
@@ -2789,7 +2789,7 @@ bool MSGWeiterleitung::accountNameChange( int accountId, const char *name )
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -2829,15 +2829,15 @@ bool MSGWeiterleitung::accountKeinFreundMehr( int accountId, int zielAccountId )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -2875,15 +2875,15 @@ bool MSGWeiterleitung::freundesAnfrage( int vonAccountId, int zuAccountId )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -2921,15 +2921,15 @@ bool MSGWeiterleitung::neuerFreund( int accountId, int zuAccountId )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -2967,16 +2967,16 @@ bool MSGWeiterleitung::einladungZumChatroom( int vonAccountId, int zuAccountId,
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -3021,16 +3021,16 @@ bool MSGWeiterleitung::spielerBetrittChatroom( int accountId, int chatroomId )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -3047,7 +3047,7 @@ bool MSGWeiterleitung::chatroomNachricht( int vonAccount, const char *nachricht,
|
|
char len = (char)textLength( nachricht );
|
|
char len = (char)textLength( nachricht );
|
|
if( !len )
|
|
if( !len )
|
|
return 1;
|
|
return 1;
|
|
- Array< int > * accId = new Array< int >();
|
|
|
|
|
|
+ Array< int > *accId = new Array< int >();
|
|
int anzahl = cs->zDB()->getChatroomAccount( chatroomId, accId );
|
|
int anzahl = cs->zDB()->getChatroomAccount( chatroomId, accId );
|
|
for( int i = 0; i < anzahl; i++ )
|
|
for( int i = 0; i < anzahl; i++ )
|
|
{
|
|
{
|
|
@@ -3078,9 +3078,9 @@ bool MSGWeiterleitung::chatroomNachricht( int vonAccount, const char *nachricht,
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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( &len, 1 );
|
|
ret = ret & klient->sendeEncrypted( (char *)nachricht, len );
|
|
ret = ret & klient->sendeEncrypted( (char *)nachricht, len );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
@@ -3089,7 +3089,7 @@ bool MSGWeiterleitung::chatroomNachricht( int vonAccount, const char *nachricht,
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -3134,16 +3134,16 @@ bool MSGWeiterleitung::spielerLeavestChatroom( int accountId, int chatroomId )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -3183,15 +3183,15 @@ bool MSGWeiterleitung::freundEinladungAbgelehnt( int accountId, int zuAccountId
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -3229,16 +3229,16 @@ bool MSGWeiterleitung::chatroomEinladungAbgelehnt( int accountId, int chatroomId
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -3279,16 +3279,16 @@ bool MSGWeiterleitung::fehler( int zuAccountId, const char *fehler )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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( &len, 1 );
|
|
- ret = ret & klient->sendeEncrypted( (char *)& fehler, len );
|
|
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)&fehler, len );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -3326,15 +3326,15 @@ bool MSGWeiterleitung::chatroomAdmin( int chatroomId, int zuAccountId )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|
|
@@ -3372,15 +3372,15 @@ bool MSGWeiterleitung::chatroomKick( int chatroomId, int accountId )
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
if( res )
|
|
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 = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
klient->trenne();
|
|
klient->trenne();
|
|
- klient = klient->release();
|
|
|
|
|
|
+ klient = (Klient*)klient->release();
|
|
}
|
|
}
|
|
delete[]ip;
|
|
delete[]ip;
|
|
}
|
|
}
|