mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-31 13:37:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12062] Cleanup MaNGOS sources

Browse source
This commit is contained in:
Schmoozerd 2012-07-19 22:03:32 +02:00
parent a4cbed3199
commit aeff8f9d1a
46 changed files with 1982 additions and 1864 deletions
Download patch file Download diff file Expand all files Collapse all files

97
src/mangosd/RASocket.cpp
View file

@ -33,18 +33,18 @@
/// RASocket constructor
RASocket::RASocket()
:RAHandler(),
pendingCommands(0, USYNC_THREAD, "pendingCommands"),
outActive(false),
inputBufferLen(0),
outputBufferLen(0),
stage(NONE)
:RAHandler(),
pendingCommands(0, USYNC_THREAD, "pendingCommands"),
outActive(false),
inputBufferLen(0),
outputBufferLen(0),
stage(NONE)
{
///- Get the config parameters
bSecure = sConfig.GetBoolDefault( "RA.Secure", true );
bStricted = sConfig.GetBoolDefault( "RA.Stricted", false );
iMinLevel = AccountTypes(sConfig.GetIntDefault( "RA.MinLevel", SEC_ADMINISTRATOR ));
reference_counting_policy ().value (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
bSecure = sConfig.GetBoolDefault("RA.Secure", true);
bStricted = sConfig.GetBoolDefault("RA.Stricted", false);
iMinLevel = AccountTypes(sConfig.GetIntDefault("RA.MinLevel", SEC_ADMINISTRATOR));
reference_counting_policy().value(ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
}
/// RASocket destructor
@ -55,19 +55,19 @@ RASocket::~RASocket()
}
/// Accept an incoming connection
int RASocket::open(void* )
int RASocket::open(void*)
{
if (reactor ()->register_handler(this, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::WRITE_MASK) == -1)
if (reactor()->register_handler(this, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::WRITE_MASK) == -1)
{
sLog.outError ("RASocket::open: unable to register client handler errno = %s", ACE_OS::strerror (errno));
sLog.outError("RASocket::open: unable to register client handler errno = %s", ACE_OS::strerror(errno));
return -1;
}
ACE_INET_Addr remote_addr;
if (peer ().get_remote_addr (remote_addr) == -1)
if (peer().get_remote_addr(remote_addr) == -1)
{
sLog.outError ("RASocket::open: peer ().get_remote_addr errno = %s", ACE_OS::strerror (errno));
sLog.outError("RASocket::open: peer ().get_remote_addr errno = %s", ACE_OS::strerror(errno));
return -1;
}
@ -84,7 +84,7 @@ int RASocket::open(void* )
int RASocket::close(int)
{
if(closing_)
if (closing_)
return -1;
DEBUG_LOG("RASocket::close");
shutdown();
@ -95,45 +95,45 @@ int RASocket::close(int)
return 0;
}
int RASocket::handle_close (ACE_HANDLE h, ACE_Reactor_Mask)
int RASocket::handle_close(ACE_HANDLE h, ACE_Reactor_Mask)
{
if(closing_)
if (closing_)
return -1;
DEBUG_LOG("RASocket::handle_close");
ACE_GUARD_RETURN (ACE_Thread_Mutex, Guard, outBufferLock, -1);
ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, outBufferLock, -1);
closing_ = true;
if (h == ACE_INVALID_HANDLE)
peer ().close_writer ();
peer().close_writer();
remove_reference();
return 0;
}
int RASocket::handle_output (ACE_HANDLE)
int RASocket::handle_output(ACE_HANDLE)
{
ACE_GUARD_RETURN (ACE_Thread_Mutex, Guard, outBufferLock, -1);
ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, outBufferLock, -1);
if(closing_)
if (closing_)
return -1;
if (!outputBufferLen)
{
if(reactor()->cancel_wakeup(this, ACE_Event_Handler::WRITE_MASK) == -1)
if (reactor()->cancel_wakeup(this, ACE_Event_Handler::WRITE_MASK) == -1)
{
sLog.outError ("RASocket::handle_output: error while cancel_wakeup");
sLog.outError("RASocket::handle_output: error while cancel_wakeup");
return -1;
}
outActive = false;
return 0;
}
#ifdef MSG_NOSIGNAL
ssize_t n = peer ().send (outputBuffer, outputBufferLen, MSG_NOSIGNAL);
ssize_t n = peer().send(outputBuffer, outputBufferLen, MSG_NOSIGNAL);
#else
ssize_t n = peer ().send (outputBuffer, outputBufferLen);
ssize_t n = peer().send(outputBuffer, outputBufferLen);
#endif // MSG_NOSIGNAL
if(n<=0)
if (n<=0)
return -1;
ACE_OS::memmove(outputBuffer, outputBuffer+n, outputBufferLen-n);
@ -147,7 +147,7 @@ int RASocket::handle_output (ACE_HANDLE)
int RASocket::handle_input(ACE_HANDLE)
{
DEBUG_LOG("RASocket::handle_input");
if(closing_)
if (closing_)
{
sLog.outError("Called RASocket::handle_input with closing_ = true");
return -1;
@ -155,7 +155,7 @@ int RASocket::handle_input(ACE_HANDLE)
size_t readBytes = peer().recv(inputBuffer+inputBufferLen, RA_BUFF_SIZE-inputBufferLen-1);
if(readBytes <= 0)
if (readBytes <= 0)
{
DEBUG_LOG("read %u bytes in RASocket::handle_input", readBytes);
return -1;
@ -163,7 +163,7 @@ int RASocket::handle_input(ACE_HANDLE)
///- Discard data after line break or line feed
bool gotenter=false;
for(; readBytes > 0 ; --readBytes)
for (; readBytes > 0 ; --readBytes)
{
char c = inputBuffer[inputBufferLen];
if (c=='\r'|| c=='\n')
@ -178,9 +178,9 @@ int RASocket::handle_input(ACE_HANDLE)
{
inputBuffer[inputBufferLen]=0;
inputBufferLen=0;
switch(stage)
switch (stage)
{
/// <ul> <li> If the input is '<username>'
/// <ul> <li> If the input is '<username>'
case NONE:
{
std::string szLogin=inputBuffer;
@ -188,11 +188,11 @@ int RASocket::handle_input(ACE_HANDLE)
accId = sAccountMgr.GetId(szLogin);
///- If the user is not found, deny access
if(!accId)
if (!accId)
{
sendf("-No such user.\r\n");
sLog.outRALog("User %s does not exist.",szLogin.c_str());
if(bSecure)
if (bSecure)
{
handle_output();
return -1;
@ -209,7 +209,7 @@ int RASocket::handle_input(ACE_HANDLE)
{
sendf("-Not enough privileges.\r\n");
sLog.outRALog("User %s has no privilege.",szLogin.c_str());
if(bSecure)
if (bSecure)
{
handle_output();
return -1;
@ -229,7 +229,8 @@ int RASocket::handle_input(ACE_HANDLE)
}
///<li> If the input is '<password>' (and the user already gave his username)
case LG:
{ //login+pass ok
{
//login+pass ok
std::string pw = inputBuffer;
if (sAccountMgr.CheckPassword(accId, pw))
@ -245,7 +246,7 @@ int RASocket::handle_input(ACE_HANDLE)
///- Else deny access
sendf("-Wrong pass.\r\n");
sLog.outRALog("User account %u has failed to log in.", accId);
if(bSecure)
if (bSecure)
{
handle_output();
return -1;
@ -272,7 +273,7 @@ int RASocket::handle_input(ACE_HANDLE)
else
sendf("mangos>");
break;
///</ul>
///</ul>
};
}
@ -281,9 +282,9 @@ int RASocket::handle_input(ACE_HANDLE)
}
/// Output function
void RASocket::zprint(void* callbackArg, const char * szText )
void RASocket::zprint(void* callbackArg, const char* szText)
{
if( !szText )
if (!szText)
return;
((RASocket*)callbackArg)->sendf(szText);
@ -298,25 +299,25 @@ void RASocket::commandFinished(void* callbackArg, bool success)
int RASocket::sendf(const char* msg)
{
ACE_GUARD_RETURN (ACE_Thread_Mutex, Guard, outBufferLock, -1);
ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, outBufferLock, -1);
if(closing_)
if (closing_)
return -1;
int msgLen = strlen(msg);
if(msgLen+outputBufferLen > RA_BUFF_SIZE)
if (msgLen+outputBufferLen > RA_BUFF_SIZE)
return -1;
ACE_OS::memcpy(outputBuffer+outputBufferLen, msg, msgLen);
outputBufferLen += msgLen;
if(!outActive)
if (!outActive)
{
if (reactor ()->schedule_wakeup
(this, ACE_Event_Handler::WRITE_MASK) == -1)
if (reactor()->schedule_wakeup
(this, ACE_Event_Handler::WRITE_MASK) == -1)
{
sLog.outError ("RASocket::sendf error while schedule_wakeup");
sLog.outError("RASocket::sendf error while schedule_wakeup");
return -1;
}
outActive = true;