Merge with develop
This commit is contained in:
parent
ed8afa1b6c
commit
708c5d0d41
3 changed files with 20 additions and 21 deletions
code
|
@ -323,12 +323,12 @@ void CInetAddress::init()
|
|||
|
||||
// IPv4
|
||||
_SockAddr = new sockaddr_in;
|
||||
memset(_SockAddr, 0, sizeof(_SockAddr));
|
||||
memset(_SockAddr, 0, sizeof(sockaddr_in));
|
||||
_SockAddr->sin_family = AF_INET;
|
||||
|
||||
// IPv6
|
||||
_SockAddr6 = new sockaddr_in6;
|
||||
memset(_SockAddr6, 0, sizeof(_SockAddr6));
|
||||
memset(_SockAddr6, 0, sizeof(sockaddr_in6));
|
||||
_SockAddr6->sin6_family = AF_INET6;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
|
||||
#include "stdpch.h"
|
||||
#include "user_agent.h"
|
||||
|
||||
//////////////
|
||||
// INCLUDES //
|
||||
|
@ -45,7 +44,6 @@
|
|||
|
||||
//#define TEST_CRASH_COUNTER
|
||||
#ifdef TEST_CRASH_COUNTER
|
||||
#include "nel/net/email.h"
|
||||
#undef FINAL_VERSION
|
||||
#define FINAL_VERSION 1
|
||||
#endif // TEST_CRASH_COUNTER
|
||||
|
@ -61,6 +59,7 @@
|
|||
#include "release.h"
|
||||
#include "client_cfg.h"
|
||||
#include "far_tp.h"
|
||||
#include "user_agent.h"
|
||||
|
||||
#ifdef RZ_USE_STEAM
|
||||
#include "steam_client.h"
|
||||
|
@ -181,6 +180,12 @@ int main(int argc, char **argv)
|
|||
Args.addAdditionalArg("password", "Password to use", true, false);
|
||||
Args.addAdditionalArg("shard_id", "Shard ID to use", true, false);
|
||||
|
||||
#ifdef TEST_CRASH_COUNTER
|
||||
Args.addArg("", "crash", "", "Crash client before init");
|
||||
Args.addArg("", "break", "", "Create a break point");
|
||||
Args.addArg("", "release", "", "Crash client after init");
|
||||
#endif // TEST_CRASH_COUNTER
|
||||
|
||||
#ifdef NL_OS_WINDOWS
|
||||
if (!Args.parse(cmdline)) return 1;
|
||||
#else
|
||||
|
@ -218,6 +223,13 @@ int main(int argc, char **argv)
|
|||
CPath::setCurrentPath(currentPath);
|
||||
}
|
||||
|
||||
#ifdef TEST_CRASH_COUNTER
|
||||
if (Args.haveLongArg("crash"))
|
||||
{
|
||||
volatile int toto = *(int*)0;
|
||||
}
|
||||
#endif // TEST_CRASH_COUNTER
|
||||
|
||||
#ifdef NL_OS_MAC
|
||||
struct rlimit rlp, rlp2, rlp3;
|
||||
|
||||
|
@ -237,19 +249,8 @@ int main(int argc, char **argv)
|
|||
|
||||
#if defined(NL_OS_WINDOWS)
|
||||
|
||||
#if FINAL_VERSION
|
||||
//initCrashReport ();
|
||||
#endif // FINAL_VERSION
|
||||
|
||||
// Set default email value for reporting error
|
||||
#ifdef TEST_CRASH_COUNTER
|
||||
// initCrashReport ();
|
||||
// setReportEmailFunction ((void*)sendEmail);
|
||||
// setDefaultEmailParams ("smtp.nevrax.com", "", "hulud@nevrax.com");
|
||||
|
||||
if (string(cmdline) == "/crash")
|
||||
volatile int toto = *(int*)0;
|
||||
if (string(cmdline) == "/break")
|
||||
if (Args.haveLongArg("break"))
|
||||
{
|
||||
__debugbreak();
|
||||
}
|
||||
|
@ -417,8 +418,10 @@ int main(int argc, char **argv)
|
|||
//CFile::createEmptyFile(getLogDirectory() + "during_release");
|
||||
|
||||
#ifdef TEST_CRASH_COUNTER
|
||||
if (string(cmdline) == "/release")
|
||||
if (Args.haveLongArg("release"))
|
||||
{
|
||||
volatile int toto = *(int*)0;
|
||||
}
|
||||
#endif // TEST_CRASH_COUNTER
|
||||
|
||||
// Final release
|
||||
|
|
|
@ -896,10 +896,6 @@ void prelogInit()
|
|||
|
||||
FPU_CHECKER_ONCE
|
||||
|
||||
// Set default email value for reporting error
|
||||
// setReportEmailFunction ((void*)sendEmail);
|
||||
// setDefaultEmailParams ("smtp.nevrax.com", "", "ryzombug@nevrax.com");
|
||||
|
||||
// create the save dir.
|
||||
if (!CFile::isExists("save")) CFile::createDirectory("save");
|
||||
|
||||
|
|
Loading…
Reference in a new issue