Index: trunk/src/trinityrealm/AuthSocket.h
===================================================================
--- trunk/src/trinityrealm/AuthSocket.h (revision 2)
+++ trunk/src/trinityrealm/AuthSocket.h (revision 44)
@@ -1,4 +1,6 @@
/*
- * Copyright (C) 2005-2008 MaNGOS
+ * Copyright (C) 2008 Trinity
+ *
+ * Thanks to the original authors: MaNGOS
*
* This program is free software; you can redistribute it and/or modify
@@ -9,10 +11,10 @@
* 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
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Index: trunk/src/trinityrealm/RealmList.h
===================================================================
--- trunk/src/trinityrealm/RealmList.h (revision 2)
+++ trunk/src/trinityrealm/RealmList.h (revision 44)
@@ -1,4 +1,6 @@
/*
- * Copyright (C) 2005-2008 MaNGOS
+ * Copyright (C) 2008 Trinity
+ *
+ * Thanks to the original authors: MaNGOS
*
* This program is free software; you can redistribute it and/or modify
@@ -9,10 +11,10 @@
* 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
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Index: trunk/src/trinityrealm/AuthCodes.h
===================================================================
--- trunk/src/trinityrealm/AuthCodes.h (revision 34)
+++ trunk/src/trinityrealm/AuthCodes.h (revision 44)
@@ -1,4 +1,6 @@
/*
- * Copyright (C) 2005-2008 MaNGOS
+ * Copyright (C) 2008 Trinity
+ *
+ * Thanks to the original authors: MaNGOS
*
* This program is free software; you can redistribute it and/or modify
@@ -9,10 +11,10 @@
* 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
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -69,5 +71,5 @@
// will only support WoW and WoW:TBC 2.4.3 client build 8606...
-//#define EXPECTED_MANGOS_CLIENT_BUILD {8606, 0} // - commented as builds are set in config
+#define EXPECTED_TRINITY_CLIENT_BUILD {8606, 0}
#endif
Index: trunk/src/trinityrealm/Main.cpp
===================================================================
--- trunk/src/trinityrealm/Main.cpp (revision 2)
+++ trunk/src/trinityrealm/Main.cpp (revision 44)
@@ -1,4 +1,6 @@
/*
- * Copyright (C) 2005-2008 MaNGOS
+ * Copyright (C) 2008 Trinity
+ *
+ * Thanks to the original authors: MaNGOS
*
* This program is free software; you can redistribute it and/or modify
@@ -9,10 +11,10 @@
* 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
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -45,5 +47,5 @@
#include "ServiceWin32.h"
char serviceName[] = "realmd";
-char serviceLongName[] = "MaNGOS realmd service";
+char serviceLongName[] = "Trinity realm service";
char serviceDescription[] = "Massive Network Game Object Server";
/*
@@ -198,5 +200,5 @@
if ( authListenSocket.Bind(bind_ip.c_str(),rmport))
{
- sLog.outError( "MaNGOS realmd can not bind to %s:%d",bind_ip.c_str(), rmport );
+ sLog.outError( "Trinity realm can not bind to %s:%d",bind_ip.c_str(), rmport );
return 1;
}
Index: trunk/src/trinityrealm/Makefile.am
===================================================================
--- trunk/src/trinityrealm/Makefile.am (revision 23)
+++ trunk/src/trinityrealm/Makefile.am (revision 44)
@@ -5,5 +5,5 @@
# 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 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
@@ -70,2 +70,3 @@
EXTRA_DIST = trinityrealm.conf.dist
+
Index: trunk/src/trinityrealm/trinityrealm.conf.dist
===================================================================
--- trunk/src/trinityrealm/trinityrealm.conf.dist (revision 34)
+++ trunk/src/trinityrealm/trinityrealm.conf.dist (revision 44)
@@ -115,18 +115,2 @@
WrongPass.BanTime = 600
WrongPass.BanType = 0
-
-###################################################################################################################
-# CLIENT BUILD OPTIONS
-#
-# Client Builds:
-#
-# MinBuild
-# The minium client build allowed to connect
-#
-# MaxBuild
-# The maximum client build allowed to connect
-#
-###################################################################################################################
-
-MinBuild = 8606
-MaxBuild = 8606
Index: trunk/src/trinityrealm/AuthSocket.cpp
===================================================================
--- trunk/src/trinityrealm/AuthSocket.cpp (revision 35)
+++ trunk/src/trinityrealm/AuthSocket.cpp (revision 44)
@@ -1,4 +1,6 @@
/*
- * Copyright (C) 2005-2008 MaNGOS
+ * Copyright (C) 2008 Trinity
+ *
+ * Thanks to the original authors: MaNGOS
*
* This program is free software; you can redistribute it and/or modify
@@ -9,10 +11,10 @@
* 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
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -370,12 +372,11 @@
///- Check if the client has one of the expected version numbers
bool valid_version=false;
- int MinBuild = sConfig.GetIntDefault("MinBuild", 8606);
- int MaxBuild = sConfig.GetIntDefault("MaxBuild", 8606);
-
- if(ch->build >= MinBuild && ch->build <= MaxBuild) {
+ int accepted_versions[]=EXPECTED_TRINITY_CLIENT_BUILD;
+ for(int i=0;accepted_versions[i];i++)
+ if(ch->build==accepted_versions[i])
+ {
valid_version=true;
- } else {
- valid_version=false;
- };
+ break;
+ }
/// - if this is a valid version
@@ -684,5 +685,5 @@
{
uint32 acc_id = fields[0].GetUInt32();
- dbRealmServer.PExecute("INSERT INTO account_banned VALUES ('%u',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','MaNGOS realmd','Failed login autoban',1)",
+ dbRealmServer.PExecute("INSERT INTO account_banned VALUES ('%u',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','Trinity realm','Failed login autoban',1)",
acc_id, WrongPassBanTime);
sLog.outBasic("[AuthChallenge] account %s got banned for '%u' seconds because it failed to authenticate '%u' times",
@@ -693,5 +694,5 @@
std::string current_ip = GetRemoteAddress();
dbRealmServer.escape_string(current_ip);
- dbRealmServer.PExecute("INSERT INTO ip_banned VALUES ('%s',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','MaNGOS realmd','Failed login autoban')",
+ dbRealmServer.PExecute("INSERT INTO ip_banned VALUES ('%s',UNIX_TIMESTAMP(),UNIX_TIMESTAMP()+'%u','Trinity realm','Failed login autoban')",
current_ip.c_str(), WrongPassBanTime);
sLog.outBasic("[AuthChallenge] IP %s got banned for '%u' seconds because account %s failed to authenticate '%u' times",
Index: trunk/src/trinityrealm/RealmList.cpp
===================================================================
--- trunk/src/trinityrealm/RealmList.cpp (revision 2)
+++ trunk/src/trinityrealm/RealmList.cpp (revision 44)
@@ -1,4 +1,6 @@
/*
- * Copyright (C) 2005-2008 MaNGOS
+ * Copyright (C) 2008 Trinity
+ *
+ * Thanks to the original authors: MaNGOS
*
* This program is free software; you can redistribute it and/or modify
@@ -9,10 +11,10 @@
* 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
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/