|
@@ -35,7 +35,6 @@ ChatServer::ChatServer( InitDatei *zIni )
|
|
db->setServerStatus( id, 2 );
|
|
db->setServerStatus( id, 2 );
|
|
end = 0;
|
|
end = 0;
|
|
nichtPausiert = 0;
|
|
nichtPausiert = 0;
|
|
- ref = 1;
|
|
|
|
if( zIni->zWert( "Aktiv" )->istGleich( "TRUE" ) )
|
|
if( zIni->zWert( "Aktiv" )->istGleich( "TRUE" ) )
|
|
{
|
|
{
|
|
serverStarten();
|
|
serverStarten();
|
|
@@ -73,7 +72,7 @@ void ChatServer::runn()
|
|
}
|
|
}
|
|
if( !klient )
|
|
if( !klient )
|
|
continue;
|
|
continue;
|
|
- CSAKlient *clHandle = new CSAKlient( klient, getThis() );
|
|
|
|
|
|
+ CSAKlient * clHandle = new CSAKlient( klient, (ChatServer *)getThis() );
|
|
clHandle->start();
|
|
clHandle->start();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -87,7 +86,7 @@ void ChatServer::thread()
|
|
if( !klient )
|
|
if( !klient )
|
|
continue;
|
|
continue;
|
|
Framework::getThreadRegister()->cleanUpClosedThreads();
|
|
Framework::getThreadRegister()->cleanUpClosedThreads();
|
|
- CSKlient *clHandle = new CSKlient( klient, getThis() );
|
|
|
|
|
|
+ CSKlient * clHandle = new CSKlient( klient, (ChatServer *)getThis() );
|
|
cs.lock();
|
|
cs.lock();
|
|
klients->set( clHandle, klientAnzahl );
|
|
klients->set( clHandle, klientAnzahl );
|
|
klientAnzahl++;
|
|
klientAnzahl++;
|
|
@@ -112,7 +111,7 @@ void ChatServer::close()
|
|
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();
|
|
@@ -262,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();
|
|
@@ -291,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;
|
|
@@ -314,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();
|
|
@@ -361,25 +360,10 @@ char *ChatServer::getLetzterFehler() const
|
|
return fehler->getText();
|
|
return fehler->getText();
|
|
}
|
|
}
|
|
|
|
|
|
-// Reference Counting
|
|
|
|
-ChatServer *ChatServer::getThis()
|
|
|
|
-{
|
|
|
|
- ref++;
|
|
|
|
- return this;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-ChatServer *ChatServer::release()
|
|
|
|
-{
|
|
|
|
- ref--;
|
|
|
|
- if( !ref )
|
|
|
|
- delete this;
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
|
|
|
|
// 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;
|
|
@@ -417,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 )
|
|
@@ -519,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;
|
|
@@ -615,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 ) )
|
|
@@ -637,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 );
|
|
@@ -670,13 +654,13 @@ 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;
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
klientNummer = 0;
|
|
klientNummer = 0;
|
|
this->cs = cs;
|
|
this->cs = cs;
|
|
accountId = 0;
|
|
accountId = 0;
|
|
@@ -716,7 +700,7 @@ void CSKlient::absturz()
|
|
if( empfangen )
|
|
if( empfangen )
|
|
{
|
|
{
|
|
cs->zDB()->unregisterKlient( klientNummer, cs->getId() );
|
|
cs->zDB()->unregisterKlient( klientNummer, cs->getId() );
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
weiter->accountOffline( accountId );
|
|
weiter->accountOffline( accountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
@@ -736,7 +720,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;
|
|
@@ -773,7 +757,7 @@ void CSKlient::thread()
|
|
if( status == 1 )
|
|
if( status == 1 )
|
|
{
|
|
{
|
|
empfangen = 0;
|
|
empfangen = 0;
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
weiter->accountOnline( accountId );
|
|
weiter->accountOnline( accountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
br = 1;
|
|
br = 1;
|
|
@@ -794,8 +778,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 );
|
|
@@ -841,7 +825,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 )
|
|
{
|
|
{
|
|
@@ -857,8 +841,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 ) );
|
|
@@ -872,8 +856,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 ) );
|
|
@@ -889,9 +873,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 ];
|
|
@@ -913,9 +897,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 ) );
|
|
@@ -931,9 +915,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 ];
|
|
@@ -956,9 +940,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 ];
|
|
@@ -979,8 +963,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 ) );
|
|
@@ -994,8 +978,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 ) );
|
|
@@ -1009,8 +993,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 ) );
|
|
@@ -1025,9 +1009,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 ) );
|
|
@@ -1042,9 +1026,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 ) );
|
|
@@ -1061,10 +1045,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 ];
|
|
@@ -1086,9 +1070,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 ) );
|
|
@@ -1102,8 +1086,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 ) );
|
|
@@ -1118,9 +1102,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 ) );
|
|
@@ -1135,8 +1119,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 ];
|
|
@@ -1157,8 +1141,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 ) );
|
|
@@ -1172,8 +1156,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 ) );
|
|
@@ -1188,9 +1172,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 ) );
|
|
@@ -1205,9 +1189,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 ) );
|
|
@@ -1221,8 +1205,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 ) );
|
|
@@ -1236,8 +1220,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 ) );
|
|
@@ -1251,8 +1235,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 ) );
|
|
@@ -1267,14 +1251,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
|
|
@@ -1289,8 +1273,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 )
|
|
@@ -1306,9 +1290,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 ) );
|
|
@@ -1323,9 +1307,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 ) );
|
|
@@ -1340,9 +1324,9 @@ 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*)ip, 4 ) );
|
|
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)& zuAcc, 4 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)& port, 2 ) );
|
|
|
|
+ res = (char)( res & (char)klient->getNachrichtEncrypted( (char *)ip, 4 ) );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
CSKlient *klient = cs->zSendeKlient( zuAcc );
|
|
if( klient )
|
|
if( klient )
|
|
res = (char)( res & (char)klient->spielServerVerbindungsAnfrage( port, ip ) );
|
|
res = (char)( res & (char)klient->spielServerVerbindungsAnfrage( port, ip ) );
|
|
@@ -1358,9 +1342,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 ) );
|
|
@@ -1375,9 +1359,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 ) );
|
|
@@ -1407,14 +1391,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( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (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 );
|
|
@@ -1441,7 +1425,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 ];
|
|
@@ -1450,7 +1434,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( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
weiter->accountNameChange( accountId, name );
|
|
weiter->accountNameChange( accountId, name );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
@@ -1478,11 +1462,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( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
weiter->accountKeinFreundMehr( accountId, freundId );
|
|
weiter->accountKeinFreundMehr( accountId, freundId );
|
|
weiter->accountKeinFreundMehr( freundId, accountId );
|
|
weiter->accountKeinFreundMehr( freundId, accountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
@@ -1509,10 +1493,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( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (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 );
|
|
@@ -1541,9 +1525,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( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
if( !ok )
|
|
if( !ok )
|
|
{
|
|
{
|
|
weiter->freundEinladungAbgelehnt( accountId, zuAccount );
|
|
weiter->freundEinladungAbgelehnt( accountId, zuAccount );
|
|
@@ -1588,7 +1572,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 ];
|
|
@@ -1606,7 +1590,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 );
|
|
@@ -1640,11 +1624,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( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (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
|
|
@@ -1682,9 +1666,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( cs->getThis() );
|
|
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)& zuAccountId, 4 );
|
|
|
|
+ klient->getNachrichtEncrypted( (char *)& chatroomId, 4 );
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (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 );
|
|
@@ -1703,10 +1687,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( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
weiter->spielerBetrittChatroom( accountId, chatroomId );
|
|
weiter->spielerBetrittChatroom( accountId, chatroomId );
|
|
delete weiter;
|
|
delete weiter;
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
klient->sendeEncrypted( "\1", 1 );
|
|
@@ -1739,8 +1723,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 ];
|
|
@@ -1749,7 +1733,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( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (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
|
|
@@ -1783,7 +1767,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 );
|
|
@@ -1791,13 +1775,13 @@ void CSKlient::thread()
|
|
{
|
|
{
|
|
if( aktion == 3 )
|
|
if( aktion == 3 )
|
|
{
|
|
{
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (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( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
weiter->spielerLeavestChatroom( accountId, chatroomId );
|
|
weiter->spielerLeavestChatroom( accountId, chatroomId );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
@@ -1819,8 +1803,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 );
|
|
@@ -1833,7 +1817,7 @@ void CSKlient::thread()
|
|
{
|
|
{
|
|
if( cs->zDB()->chatroomVerlassen( accountId, chatroomId ) )
|
|
if( cs->zDB()->chatroomVerlassen( accountId, chatroomId ) )
|
|
{
|
|
{
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
weiter->chatroomKick( chatroomId, accountId );
|
|
weiter->chatroomKick( chatroomId, accountId );
|
|
weiter->spielerLeavestChatroom( accountId, chatroomId );
|
|
weiter->spielerLeavestChatroom( accountId, chatroomId );
|
|
delete weiter;
|
|
delete weiter;
|
|
@@ -1934,7 +1918,7 @@ void CSKlient::thread()
|
|
{
|
|
{
|
|
if( accountId )
|
|
if( accountId )
|
|
{
|
|
{
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
weiter->accountOffline( accountId );
|
|
weiter->accountOffline( accountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
@@ -1953,7 +1937,7 @@ bool CSKlient::kick()
|
|
klient->trenne();
|
|
klient->trenne();
|
|
warteAufThread( 100 );
|
|
warteAufThread( 100 );
|
|
ende();
|
|
ende();
|
|
- MSGWeiterleitung *weiter = new MSGWeiterleitung( cs->getThis() );
|
|
|
|
|
|
+ MSGWeiterleitung *weiter = new MSGWeiterleitung( (ChatServer *)cs->getThis() );
|
|
weiter->accountOffline( accountId );
|
|
weiter->accountOffline( accountId );
|
|
delete weiter;
|
|
delete weiter;
|
|
}
|
|
}
|
|
@@ -1976,7 +1960,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();
|
|
@@ -1992,8 +1976,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 ) );
|
|
@@ -2009,7 +1993,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();
|
|
@@ -2028,7 +2012,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();
|
|
@@ -2044,7 +2028,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 ) );
|
|
@@ -2057,7 +2041,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 ) );
|
|
@@ -2070,7 +2054,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 ) );
|
|
@@ -2083,7 +2067,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 ) );
|
|
@@ -2096,8 +2080,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 ) );
|
|
@@ -2110,8 +2094,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 ) );
|
|
@@ -2124,8 +2108,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 ) );
|
|
@@ -2141,8 +2125,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();
|
|
@@ -2158,15 +2142,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;
|
|
@@ -2176,7 +2160,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 ) );
|
|
@@ -2184,18 +2168,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 ) );
|
|
@@ -2209,7 +2193,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 ) );
|
|
@@ -2222,7 +2206,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 ) );
|
|
@@ -2235,7 +2219,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 ) );
|
|
@@ -2248,7 +2232,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 ) );
|
|
@@ -2261,8 +2245,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 ) );
|
|
@@ -2275,8 +2259,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 ) );
|
|
@@ -2292,7 +2276,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();
|
|
@@ -2307,7 +2291,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 ) );
|
|
@@ -2320,7 +2304,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 ) );
|
|
@@ -2333,7 +2317,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
|
|
@@ -2350,8 +2334,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 ) );
|
|
@@ -2364,7 +2348,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 ) );
|
|
@@ -2377,8 +2361,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 ) );
|
|
@@ -2391,8 +2375,8 @@ 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*)ip, 4 );
|
|
|
|
|
|
+ klient->sendeEncrypted( (char *)& port, 2 );
|
|
|
|
+ klient->sendeEncrypted( (char *)ip, 4 );
|
|
unlock();
|
|
unlock();
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addEmpfangen( klient->getDownloadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
cs->addGesendet( klient->getUploadBytes( 1 ) );
|
|
@@ -2405,8 +2389,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 ) );
|
|
@@ -2419,8 +2403,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 ) );
|
|
@@ -2474,25 +2458,10 @@ bool CSKlient::istEmpfang() const
|
|
return empfangen;
|
|
return empfangen;
|
|
}
|
|
}
|
|
|
|
|
|
-// Reference Counting
|
|
|
|
-CSKlient *CSKlient::getThis()
|
|
|
|
-{
|
|
|
|
- ref++;
|
|
|
|
- return this;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-CSKlient *CSKlient::release()
|
|
|
|
-{
|
|
|
|
- ref--;
|
|
|
|
- if( !ref )
|
|
|
|
- delete this;
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
|
|
|
|
// 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;
|
|
@@ -2535,15 +2504,15 @@ bool MSGWeiterleitung::kickKlient( int accountId )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\1", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\1", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -2585,16 +2554,16 @@ bool MSGWeiterleitung::accountOnline( int accountId )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\2", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\2", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -2638,16 +2607,16 @@ bool MSGWeiterleitung::accountOffline( int accountId )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\3", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\3", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -2689,19 +2658,19 @@ bool MSGWeiterleitung::chatNachricht( int vonAccount, int zuAccount, const char
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->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->getNachrichtEncrypted( (char*)&res, 1 );
|
|
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)nachricht, len );
|
|
|
|
+ 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 ) );
|
|
@@ -2722,7 +2691,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++ )
|
|
{
|
|
{
|
|
@@ -2745,18 +2714,18 @@ bool MSGWeiterleitung::accountStatusChange( int accountId, const char *status )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\6", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\6", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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*)status, len );
|
|
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)& accountId, 4 );
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)& account, 4 );
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)& len, 1 );
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)status, len );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
@@ -2780,7 +2749,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++ )
|
|
{
|
|
{
|
|
@@ -2803,18 +2772,18 @@ bool MSGWeiterleitung::accountNameChange( int accountId, const char *name )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\7", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\7", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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*)name, len );
|
|
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)& accountId, 4 );
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)& account, 4 );
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)& len, 1 );
|
|
|
|
+ ret = ret & klient->sendeEncrypted( (char *)name, len );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
ret = ret & klient->getNachrichtEncrypted( &res, 1 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
@@ -2853,16 +2822,16 @@ bool MSGWeiterleitung::accountKeinFreundMehr( int accountId, int zielAccountId )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\x8", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\x8", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -2899,16 +2868,16 @@ bool MSGWeiterleitung::freundesAnfrage( int vonAccountId, int zuAccountId )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\x9", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\x9", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -2945,16 +2914,16 @@ bool MSGWeiterleitung::neuerFreund( int accountId, int zuAccountId )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\xA", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\xA", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -2991,17 +2960,17 @@ bool MSGWeiterleitung::einladungZumChatroom( int vonAccountId, int zuAccountId,
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\xB", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\xB", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -3045,17 +3014,17 @@ bool MSGWeiterleitung::spielerBetrittChatroom( int accountId, int chatroomId )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\xC", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\xC", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -3079,7 +3048,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++ )
|
|
{
|
|
{
|
|
@@ -3102,19 +3071,19 @@ bool MSGWeiterleitung::chatroomNachricht( int vonAccount, const char *nachricht,
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\xD", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\xD", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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 );
|
|
}
|
|
}
|
|
ret = (char)ret & res;
|
|
ret = (char)ret & res;
|
|
@@ -3158,17 +3127,17 @@ bool MSGWeiterleitung::spielerLeavestChatroom( int accountId, int chatroomId )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\xE", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\xE", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -3207,16 +3176,16 @@ bool MSGWeiterleitung::freundEinladungAbgelehnt( int accountId, int zuAccountId
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\xF", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\xF", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -3253,17 +3222,17 @@ bool MSGWeiterleitung::chatroomEinladungAbgelehnt( int accountId, int chatroomId
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\x10", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\x10", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -3303,17 +3272,17 @@ bool MSGWeiterleitung::fehler( int zuAccountId, const char *fehler )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\x11", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\x11", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -3350,16 +3319,16 @@ bool MSGWeiterleitung::chatroomAdmin( int chatroomId, int zuAccountId )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\x12", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\x12", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|
|
@@ -3396,16 +3365,16 @@ bool MSGWeiterleitung::chatroomKick( int chatroomId, int accountId )
|
|
{
|
|
{
|
|
klient = new Klient();
|
|
klient = new Klient();
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
unsigned char key[ 20 ] = { 78, 20, 190, 133, 10, 175, 51, 96, 62, 1, 180, 194, 126, 50, 211, 154, 105, 227, 22, 101 };
|
|
- klient->setSendeKey( (char*)key, 20 );
|
|
|
|
- klient->setEmpfangKey( (char*)key, 20 );
|
|
|
|
|
|
+ klient->setSendeKey( (char *)key, 20 );
|
|
|
|
+ klient->setEmpfangKey( (char *)key, 20 );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->verbinde( port, ip );
|
|
ret = ret & klient->sendeEncrypted( "\5\x13", 2 );
|
|
ret = ret & klient->sendeEncrypted( "\5\x13", 2 );
|
|
char res = 0;
|
|
char res = 0;
|
|
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;
|