sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use unix linefeeds for all files. Finally. It's about time.

Browse Source
This commit is contained in:
lotodore
2007-11-16 15:24:25 +00:00
parent f428fb7904
commit a24a93caba
83 changed files with 18044 additions and 18044 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/avatarmanager.cpp
+553 -553
View File
File diff suppressed because it is too large Load Diff
src/core/common/crypthelper.cpp
+132 -132
View File
@@ -1,132 +1,132 @@
/***************************************************************************
* Copyright (C) 2007 by Lothar May *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "crypthelper.h"
#include <openssl/md5.h>
#include <cstring>
#include <cstdio>
using namespace std;
// Helper function.
static int
fromHex(int ch)
{
int retVal = -1;
if (ch >= '0' && ch <= '9')
retVal = ch - '0';
else if (ch >= 'a' && ch <= 'f')
retVal = ch - 'a' + 10;
else if (ch >= 'A' && ch <= 'F')
retVal = ch - 'A' + 10;
return retVal;
}
MD5Buf::MD5Buf()
{
memset(data, 0, sizeof(data));
}
std::string
MD5Buf::ToString() const
{
// Create a hex-based string from the MD5 data.
string retValue;
char tmpBuf[2 + 1];
tmpBuf[sizeof(tmpBuf) - 1] = 0;
for (int i = 0; i < MD5_DATA_SIZE; i++)
{
sprintf(tmpBuf, "%02x", data[i]);
retValue += tmpBuf;
}
return retValue;
}
bool
MD5Buf::FromString(const std::string &text)
{
// Convert hex-based string to MD5 data.
bool retVal = false;
if (text.size() == 2 * MD5_DATA_SIZE)
{
unsigned char *tmpData = data;
const char *t = text.c_str();
int i = 0;
for (; i < MD5_DATA_SIZE; i++) {
int part1 = fromHex(*t++);
if (part1 == -1)
break;
int part2 = fromHex(*t++);
if (part2 == -1)
break;
*tmpData++ = (part1<<4) + part2;
}
retVal = i == MD5_DATA_SIZE;
}
return retVal;
}
bool
MD5Buf::IsZero() const
{
return *this == MD5Buf();
}
bool
MD5Buf::operator==(const MD5Buf &other) const
{
return memcmp(data, other.data, MD5_DATA_SIZE) == 0;
}
bool
MD5Buf::operator<(const MD5Buf &other) const
{
return memcmp(data, other.data, MD5_DATA_SIZE) < 0;
}
bool
CryptHelper::MD5Sum(const std::string &fileName, MD5Buf &buf)
{
bool retVal = false;
FILE *file = fopen(fileName.c_str(), "rb");
if (file)
{
// Calculate MD5 sum of file.
unsigned char readBuf[8192];
MD5_CTX context;
int numBytes;
MD5_Init(&context);
while ((numBytes = fread(readBuf, 1, sizeof(readBuf), file)) > 0)
MD5_Update(&context, readBuf, numBytes);
MD5_Final(buf.data, &context);
retVal = ferror(file) == 0;
fclose(file);
}
return retVal;
}
/***************************************************************************
* Copyright (C) 2007 by Lothar May *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "crypthelper.h"
#include <openssl/md5.h>
#include <cstring>
#include <cstdio>
using namespace std;
// Helper function.
static int
fromHex(int ch)
{
int retVal = -1;
if (ch >= '0' && ch <= '9')
retVal = ch - '0';
else if (ch >= 'a' && ch <= 'f')
retVal = ch - 'a' + 10;
else if (ch >= 'A' && ch <= 'F')
retVal = ch - 'A' + 10;
return retVal;
}
MD5Buf::MD5Buf()
{
memset(data, 0, sizeof(data));
}
std::string
MD5Buf::ToString() const
{
// Create a hex-based string from the MD5 data.
string retValue;
char tmpBuf[2 + 1];
tmpBuf[sizeof(tmpBuf) - 1] = 0;
for (int i = 0; i < MD5_DATA_SIZE; i++)
{
sprintf(tmpBuf, "%02x", data[i]);
retValue += tmpBuf;
}
return retValue;
}
bool
MD5Buf::FromString(const std::string &text)
{
// Convert hex-based string to MD5 data.
bool retVal = false;
if (text.size() == 2 * MD5_DATA_SIZE)
{
unsigned char *tmpData = data;
const char *t = text.c_str();
int i = 0;
for (; i < MD5_DATA_SIZE; i++) {
int part1 = fromHex(*t++);
if (part1 == -1)
break;
int part2 = fromHex(*t++);
if (part2 == -1)
break;
*tmpData++ = (part1<<4) + part2;
}
retVal = i == MD5_DATA_SIZE;
}
return retVal;
}
bool
MD5Buf::IsZero() const
{
return *this == MD5Buf();
}
bool
MD5Buf::operator==(const MD5Buf &other) const
{
return memcmp(data, other.data, MD5_DATA_SIZE) == 0;
}
bool
MD5Buf::operator<(const MD5Buf &other) const
{
return memcmp(data, other.data, MD5_DATA_SIZE) < 0;
}
bool
CryptHelper::MD5Sum(const std::string &fileName, MD5Buf &buf)
{
bool retVal = false;
FILE *file = fopen(fileName.c_str(), "rb");
if (file)
{
// Calculate MD5 sum of file.
unsigned char readBuf[8192];
MD5_CTX context;
int numBytes;
MD5_Init(&context);
while ((numBytes = fread(readBuf, 1, sizeof(readBuf), file)) > 0)
MD5_Update(&context, readBuf, numBytes);
MD5_Final(buf.data, &context);
retVal = ferror(file) == 0;
fclose(file);
}
return retVal;
}
src/core/common/thread.cpp
+154 -154
View File
@@ -1,154 +1,154 @@
/***************************************************************************
* Copyright (C) 2007 by Lothar May *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "thread.h"
// This is ugly, but I can't help it.
inline void ADD_MSEC_TO_XTIME(boost::xtime &xt, unsigned msec)
{
xt.sec += msec / 1000;
xt.nsec += (msec % 1000) * 1000000;
if (xt.nsec > NANOSECONDS_PER_SECOND)
{
xt.sec++;
xt.nsec -= NANOSECONDS_PER_SECOND;
}
}
// Helper class for thread creation.
class ThreadStarter
{
public:
ThreadStarter(Thread &thread) : m_thread(thread) {}
void operator()()
{
m_thread.MainWrapper();
}
private:
Thread &m_thread;
};
Thread::Thread()
{
}
Thread::~Thread()
{
}
void
Thread::Run()
{
boost::mutex::scoped_lock threadLock(m_threadObjMutex);
// Create the boost thread object.
if (!m_threadObj.get())
{
// Initialise data structures within the context of the thread
// who runs/terminates this thread.
m_userReqTerminateLock.reset(new boost::timed_mutex::scoped_try_lock(m_shouldTerminateMutex));
m_threadStartBarrier.reset(new boost::barrier(2));
m_threadObj.reset(new boost::thread(ThreadStarter(*this)));
m_threadStartBarrier->wait();
}
}
void
Thread::SignalTermination()
{
// Unlock the shouldTerminateMutex.
if (m_userReqTerminateLock.get()) // cannot signal before calling Run
m_userReqTerminateLock->unlock();
}
bool
Thread::Join(unsigned msecTimeout)
{
if (!IsRunning())
return true;
bool tmpIsTerminated;
if (msecTimeout == THREAD_WAIT_INFINITE)
{
// Wait infinitely.
boost::timed_mutex::scoped_lock lock(m_isTerminatedMutex);
tmpIsTerminated = true;
}
else
{
// Calculate time after timeout
boost::xtime t;
boost::xtime_get(&t, boost::TIME_UTC);
ADD_MSEC_TO_XTIME(t, msecTimeout);
// Wait for the termination of the application code.
boost::timed_mutex::scoped_timed_lock lock(m_isTerminatedMutex, t);
tmpIsTerminated = lock.locked();
}
if (tmpIsTerminated)
{
boost::mutex::scoped_lock lock(m_threadObjMutex);
// Wait for "real" termination of the thread.
if (m_threadObj.get())
{
m_threadObj->join();
m_threadObj.reset();
}
}
return tmpIsTerminated;
}
void
Thread::Msleep(unsigned msecs)
{
boost::xtime t;
boost::xtime_get(&t, boost::TIME_UTC);
ADD_MSEC_TO_XTIME(t, msecs);
boost::thread::sleep(t);
}
void
Thread::MainWrapper()
{
boost::timed_mutex::scoped_lock lock(m_isTerminatedMutex);
assert(m_threadStartBarrier.get());
m_threadStartBarrier->wait();
this->Main();
}
bool
Thread::ShouldTerminate() const
{
boost::timed_mutex::scoped_try_lock lock(m_shouldTerminateMutex);
return lock.locked();
}
bool
Thread::IsRunning() const
{
boost::mutex::scoped_lock threadLock(m_threadObjMutex);
return (m_threadObj.get() != NULL);
}
/***************************************************************************
* Copyright (C) 2007 by Lothar May *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "thread.h"
// This is ugly, but I can't help it.
inline void ADD_MSEC_TO_XTIME(boost::xtime &xt, unsigned msec)
{
xt.sec += msec / 1000;
xt.nsec += (msec % 1000) * 1000000;
if (xt.nsec > NANOSECONDS_PER_SECOND)
{
xt.sec++;
xt.nsec -= NANOSECONDS_PER_SECOND;
}
}
// Helper class for thread creation.
class ThreadStarter
{
public:
ThreadStarter(Thread &thread) : m_thread(thread) {}
void operator()()
{
m_thread.MainWrapper();
}
private:
Thread &m_thread;
};
Thread::Thread()
{
}
Thread::~Thread()
{
}
void
Thread::Run()
{
boost::mutex::scoped_lock threadLock(m_threadObjMutex);
// Create the boost thread object.
if (!m_threadObj.get())
{
// Initialise data structures within the context of the thread
// who runs/terminates this thread.
m_userReqTerminateLock.reset(new boost::timed_mutex::scoped_try_lock(m_shouldTerminateMutex));
m_threadStartBarrier.reset(new boost::barrier(2));
m_threadObj.reset(new boost::thread(ThreadStarter(*this)));
m_threadStartBarrier->wait();
}
}
void
Thread::SignalTermination()
{
// Unlock the shouldTerminateMutex.
if (m_userReqTerminateLock.get()) // cannot signal before calling Run
m_userReqTerminateLock->unlock();
}
bool
Thread::Join(unsigned msecTimeout)
{
if (!IsRunning())
return true;
bool tmpIsTerminated;
if (msecTimeout == THREAD_WAIT_INFINITE)
{
// Wait infinitely.
boost::timed_mutex::scoped_lock lock(m_isTerminatedMutex);
tmpIsTerminated = true;
}
else
{
// Calculate time after timeout
boost::xtime t;
boost::xtime_get(&t, boost::TIME_UTC);
ADD_MSEC_TO_XTIME(t, msecTimeout);
// Wait for the termination of the application code.
boost::timed_mutex::scoped_timed_lock lock(m_isTerminatedMutex, t);
tmpIsTerminated = lock.locked();
}
if (tmpIsTerminated)
{
boost::mutex::scoped_lock lock(m_threadObjMutex);
// Wait for "real" termination of the thread.
if (m_threadObj.get())
{
m_threadObj->join();
m_threadObj.reset();
}
}
return tmpIsTerminated;
}
void
Thread::Msleep(unsigned msecs)
{
boost::xtime t;
boost::xtime_get(&t, boost::TIME_UTC);
ADD_MSEC_TO_XTIME(t, msecs);
boost::thread::sleep(t);
}
void
Thread::MainWrapper()
{
boost::timed_mutex::scoped_lock lock(m_isTerminatedMutex);
assert(m_threadStartBarrier.get());
m_threadStartBarrier->wait();
this->Main();
}
bool
Thread::ShouldTerminate() const
{
boost::timed_mutex::scoped_try_lock lock(m_shouldTerminateMutex);
return lock.locked();
}
bool
Thread::IsRunning() const
{
boost::mutex::scoped_lock threadLock(m_threadObjMutex);
return (m_threadObj.get() != NULL);
}