aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4622 commits 1 branch 0 tags 51 MiB
Commit graph

612 commits

Author SHA1 Message Date
Fabio Bas
af9140d8c4 make gcc an happy puppy 2015-07-01 20:13:38 +02:00
Fabio Bas
8cac72158a MSVC fixes 2015-06-30 22:33:29 +02:00
Fabio Bas
6cf3db7e6b Servatrice: refactor signal handling and permit config reloading 2015-06-30 22:21:26 +02:00
Fabio Bas
02dcaff356 Publish username rules in login failure, too 2015-06-30 18:44:40 +02:00
Fabio Bas
4c27304047 publish username rules in registration failure 2015-06-29 23:35:27 +02:00
woogerboy21
304835c526 Activation Email Misspelling 
Corrected the misspelling of the word "activating' in the servatrice.ini example file.
 2015-06-29 17:05:48 -04:00
Matt Lowe
23b163341e Escaped additional punctuation 2015-06-24 13:08:38 +02:00
Matt Lowe
d76073cdd1 Added default values 2015-06-22 22:02:36 +02:00
Matt Lowe
a795d7d884 Moved username formatting to INI file 
Rather than having the username limitations hard coded, I have moved it
into the ini file. I have added some examples to the code and also to
the ini.

This is only and example and can be expanded on by others.
 2015-06-20 23:14:45 +02:00
Fabio Bas
25a202b6fc Typo 2015-06-03 08:38:50 +02:00
Fabio Bas
0688dce449 Sql: Added "IF NOT EXISTS" where missing 2015-06-01 14:48:38 +02:00
Fabio Bas
135205d368 Implement migrations; fix #153 2015-05-31 17:36:15 +02:00
Fabio Bas
83773e5e37 Fix #1119 2015-05-31 16:52:22 +02:00
Fabio Bas
657a5164e9 Fix servatrice compilation with msvc 2015-05-25 17:07:47 +02:00
Fabio Bas
13b8fd4516 gcc -Werror=unused-parameter 2015-05-24 23:15:23 +02:00
Fabio Bas
471f6371b5 More work 
* Refactored code out of common/ into servatrice/
 * added smtp client library
 * disable registration when connected
 * validate email address
 * send activation token via email
 2015-05-24 23:02:51 +02:00
Fabio Bas
8cf4461616 fix qt4 compilation 2015-05-24 01:00:55 +02:00
Fabio Bas
ff1aed717e Added token generation, user activation command and response. 2015-05-24 00:37:45 +02:00
Fabio Bas
d7b6f76191 missing file from previous commit 2015-05-23 20:13:21 +02:00
Fabio Bas
5ace0dd892 Almost completed registration 
* added missing bits of serverside code;
 * added fronted in client;
 * removed demo python scripts;
 2015-05-23 20:13:03 +02:00
Gavin Bises
735fcbf311 Add first draft of protocol extension for registration 
Stub for registration command handling in server

First draft of handling registration requests

WIP (will be rebased)

clean up bad imports (rebase this later)

Finish checkUserIsBanned method

Add username validity check

Check servatrice registration settings

WIP

Finish(?) server side of registration

Needs testing

Fix switch case compile failure

I have no idea why I have to do this

WIP for registration testing python script

Stub register script initial attempt

Rearrange register script

First try at sending reg

register.py sends commands correctly now

Add more debug to register.py

Pack bytes the right way - servatrice can parse py script sends now

register.py should be working now

Parse xml hack correctly

Log registration enabled settings on server start

Insert gender correctly on register

Show tcpserver error message on failed gameserver listen

Fail startup if db configured and can't be opened.

TIL qt5 comes without mysql by default in homebrew...
 2015-05-22 18:55:51 +02:00
Fabio Bas
590894d283 Fix macro for MSVC; fix #1063 2015-05-11 09:00:25 +02:00
Fabio Bas
c605948975 Catch std exceptions thrown by protobuf and try to pretty print them 2015-05-02 21:17:55 +02:00
tooomm
a6970d9624 svg+png updates 
-updated and cleaned up cockatrice+servatrice svg's
-added old original svg's for future adjustments
-updated cockatrice+servatrice png's

ico+icns updates

-see #925 for more details
-updated svg's as source for new icon files

bmp updates

-updated svg's as source for new installer logos

cleaned up oracle.svg

cleaned up oracle.svg /2

svg updates /2

removed sensible data

`inkscape:export-filename` removed

removed sensible data

inkscape:export-filename

removed sensible data

inkscape:export-filename

removed sensible data

inkscape:export-filename

fix

fix2
 2015-04-28 16:06:36 +02:00
Matt Lowe
66f854fe1d Changed to check every 10 mins 2015-04-23 00:26:21 +02:00
Matt Lowe
e646122f55 Updated server shutdown timer logic 
Will follow the following rules

+ send a message initially
+ send a message every 20 mins
+ send a message every min when time <= 5

Updated client popup

Updated client to close any previous popups and bring up a new one.

NEEDS TO BE TESTED

added missing include

Added delete on close
 2015-04-22 19:14:14 +02:00
Fabio Bas
55c174a823 Remove warning in server_logger; fix #993 2015-04-21 08:38:31 +02:00
Fabio Bas
70296dde9a Simple stack trace for singla handler (unix only) 2015-04-19 19:39:05 +02:00
Matt Lowe
1f9b1d78bc Double escaped "." 2015-04-17 17:47:58 +02:00
Matt Lowe
bba9539229 Updated regex 2015-04-17 00:17:03 +02:00
Matt Lowe
d5a1264bcb Updated server to support "." 
Now uses regex.
Added "."
Updated login message
 2015-04-16 23:50:05 +02:00
poixen
f79d0666e3 Merge pull request #964 from poixen/unreg_usernames 
Updated server side user name check
 2015-04-13 22:39:45 +02:00
Matt Lowe
0979f8fa34 Updated return value 2015-04-13 22:09:47 +02:00
poixen
72222c0b39 Merge pull request #963 from poixen/unreg_usernames 
Added "-" to allowed names
 2015-04-13 21:14:43 +02:00
Matt Lowe
53352c5f71 Added "-" to allowed names 2015-04-13 20:51:34 +02:00
Zach
5117c0e6c9 Merge pull request #956 from poixen/unreg_usernames 
Restricted unreg usernames
 2015-04-12 19:02:31 -04:00
poixen
a2f416bb51 Merge pull request #959 from poixen/server_command_limit 
Server was using message limit for commands
 2015-04-13 00:32:25 +02:00
Matt Lowe
b9cda5e36e Updated ini 2015-04-12 23:01:29 +02:00
Matt Lowe
f46d68b5c6 Server was using message limit for commands 
Server was using getMaxMessageCountPerInterval over
getMaxCommandCountPerInterval.

Raised command limit from 10 to 20
 2015-04-12 22:55:38 +02:00
Matt Lowe
70ef95931e Restricted unreg usernames 
Can now only be made up of [a-z][A-Z][0-9][-_]
 2015-04-12 21:29:40 +02:00
Matt Lowe
8e61fb0bae Updated message limit from 10 -> 15 
I have updated the `maxMessageCountPerInterval` from 10 to 15. This will
allow some faster play from exp users.

NOTE:
If you have an existing server and update to this version, you will need
to manually change the value in the ini file, or have no ini file to
begin with. Otherwise the old ini will load in 10.
 2015-04-12 19:01:16 +02:00
Fabio Bas
7bbb5dec52 fix #947 2015-04-11 15:19:16 +02:00
pepi
05424a4c0e Removed NULL conversion warnings caused by #926 2015-04-08 10:36:33 +00:00
pepi
e136c11b65 Removed compile time ssize_t warnings 2015-04-08 09:39:32 +00:00
Fabio Bas
a4cf7a71e3 fix server deck storage; fix #744 2015-03-27 15:47:38 +01:00
ctrlaltca
88b242b34d Merge pull request #829 from ctrlaltca/antiflood 
Anti flood for game commands; fix #753
 2015-03-22 22:08:25 +01:00
Zach
b1231e6442 Merge pull request #801 from Cockatrice/woogerboy21-setup_firstadmin 
Script to add the first admin account
 2015-03-16 22:30:58 -04:00
Fabio Bas
0e437cf13b Anti flood for game commands 2015-03-14 19:44:32 +01:00
woogerboy21
ebaeae0048 Script to add the first admin account 
Script to add the first admin account to the servatrice database.  Running this script after setting up a servatrice server will add the user account "servatrice" with the password of "password".
 2015-03-06 11:08:32 -05:00
woogerboy21
38b6235242 Cleanup script to delete unactivated user accounts 
Fix #782
The script will remove any registered user accounts that are not active that are 5 days old or older (by default). You can change the time frame to whatever liking you desire.
 2015-02-26 10:37:08 -05:00
Gavin Bisesi
62e0bc9bb1 Merge pull request #707 from ctrlaltca/servatrice_locking 
Improvement to servatrice database interface
 2015-02-18 13:16:48 -05:00
Fabio Bas
ca9fffcf7e Fix "QMYSQLResult::data: column 7 out of range" error 2015-02-12 22:39:06 +01:00
Fabio Bas
3f38e780f4 Fix #674 2015-02-04 12:48:08 +01:00
Fabio Bas
1ffb5bf76d removed hardcoded table name prefix from query 2015-01-29 13:54:15 +01:00
Fabio Bas
0f58e8bcde Servatrice: reuse prepared statements 2015-01-29 13:47:55 +01:00
Fabio Bas
3c65fba539 Avoid double locking of sessions, users table 
QSqlQuery already executes not-empty queries, no need to call exec()
 2015-01-29 09:54:48 +01:00
Gavin Bisesi
69e6aa355f Merge pull request #534 from poixen/accountage 
Added account age to user info window
 2015-01-11 21:37:07 -05:00
Matt Lowe
02043ad4f9 Added Account Age 
+ Added the ability to see the account age of registered users. Changes
are both in server and client. The server will now send back the
registration date along with the user data. The client will then use
this to calculate the account age and display it in the user details
window.
 2015-01-11 00:45:12 +01:00
Fabio Bas
51735613e5 force NULL as unregistered users's id 2015-01-01 16:42:20 +01:00
Fabio Bas
cd69bc8f9d Add configuration options to enable database logging 2015-01-01 15:48:53 +01:00
Fabio Bas
2896f05823 Merge remote-tracking branch 'upstream/master' into message_log 
Conflicts:
	servatrice/CMakeLists.txt
 2015-01-01 15:02:17 +01:00
ctrlaltca
16bbc5e8c0 Merge pull request #516 from mcallahan/compilation-warnings 
Clean up a small pile of compiler warnings.
 2015-01-01 14:32:53 +01:00
Michael Callahan
3a0c86938c Clean up a small pile of compiler warnings. 2014-12-30 15:54:38 -07:00
Fabio Bas
54ce135e0c Optimize qt plugins installation 
* Always install “release” plugins
 * install only plugins actually used
 2014-12-28 22:21:45 +01:00
Fabio Bas
02978ce404 Implement the logging method 2014-12-13 18:43:31 +01:00
Fabio Bas
ba71d3a256 Add db schema and fix sql plugins installation 2014-12-13 18:43:05 +01:00
woogerboy21
ff8e25bb7e removed qdebug line for >= maxuser (no need to fill log) 2014-11-18 18:31:06 -05:00
woogerboy21
1195e4c77b corrected default ini value 2014-11-18 17:32:10 -05:00
woogerboy21
37e08cfbb6 added logic to only write debug if max user value is reached 2014-11-18 17:27:57 -05:00
woogerboy21
197ae9213c corrected invalid variable call & added log file debug information 2014-11-18 17:20:45 -05:00
woogerboy21
26f5110fea convert file tab to 4 space indent 2014-11-18 16:59:08 -05:00
woogerboy21
3c513b4bfc moved code logic to callling function & indent fix 2014-11-18 16:55:19 -05:00
woogerboy21
44a302a2d6 added trusted sources to servatrice 2014-11-18 15:39:11 -05:00
wcollins
da98d24d8c added trusted sources to servatrice 2014-11-18 15:09:21 -05:00
woogerboy21
84a5117b4c Default logging to enable with no config file 
If no configuration file is found, default the logger to logging enabled.
 2014-11-11 14:15:02 -05:00
Fabio Bas
c0ee060af4 Fixed vendor name 2014-11-09 23:14:36 +01:00
Fabio Bas
a716d73a42 OSX: Add proper infos to info.plist 
fixes #411
 2014-11-09 21:03:10 +01:00
woogerboy21
950fc01363 Correct gametype primary key 
Updated rooms_gametype to reflect proper column as primary key.
 2014-10-24 21:02:45 -04:00
Fabio Bas
754b97f212 Servatrice: open in a terminal window when started from the menu 2014-10-11 13:38:07 +02:00
Fabio Bas
c0abb347ac Servatrice: Install icons and desktop file under linux 2014-10-11 13:37:52 +02:00
Gavin Bisesi
0f5f82d492 Merge pull request #358 from poixen/serverlogo2 
Servatrice logo
 2014-10-09 11:27:15 -04:00
Matt Lowe
359714214d Added .desktop file 2014-10-08 18:46:31 +02:00
Gavin Bisesi
3c0a09bf5c Merge pull request #361 from woogerboy21/servatrice-dbtable-fix 
correct _room db table, add _rooms_gametypes table
 2014-10-08 08:50:00 -04:00
woogerboy21
9cd1a5b33f correct _room db table, add _rooms_gametypes table 
Corrected table column in _rooms db table and added _rooms_gametypes
table.
 2014-10-07 14:49:24 -04:00
Fabio Bas
22af789c9e Servatrice: log to console authentication method on startup 2014-10-07 17:04:22 +02:00
Matt Lowe
90c2101a43 Removed png file 2014-10-07 16:50:19 +02:00
Matt Lowe
4866e94c86 Renamed resources 
+ renamed the resources to servatrice.*
 2014-10-07 16:49:40 +02:00
Fabio Bas
15555c16fd Fix servatrice's regonly mode 2014-10-06 22:56:09 +02:00
Fabio Bas
0d35488c21 Added schema for _rooms table 2014-10-06 21:49:38 +02:00
Fabio Bas
01bd26d228 Misc typos fixing 2014-10-06 21:44:20 +02:00
Matt Lowe
5b50aa0f0a Servatrice logo 
+ added resources needed for servatrice logo
~ updated CMakeLists.txt to include the new resources
 2014-10-06 21:04:37 +02:00
Fabio Bas
91dafdb3e8 Move server network settings to the bottom and add a disclaimer 2014-10-04 18:21:07 +02:00
Fabio Bas
29cf353913 Give servatrice example configuration some love 
added "password" settings
commented all settings
 2014-10-04 17:51:27 +02:00
Fabio Bas
0d9eec4b64 Servatrice: added authentication type "password" 2014-10-04 17:50:01 +02:00
Fabio Bas
0261862b1b Fix configuration loading 2014-10-04 10:33:55 +02:00
Fabio Bas
871f5f7c94 use qWarning instead of std::err 2014-10-02 23:45:42 +02:00
Fabio Bas
8d8ccaad7f use 4 spaces instead of tabs 2014-10-02 23:42:51 +02:00
Fabio Bas
37eaeaae13 servatrice: as a third choice, check for a config in /etc/servatrice/ 2014-10-02 23:41:24 +02:00
Fabio Bas
b348068369 Servatrice: Add a default option for every config value 
add an empty room swell, if none had been defined in the config (or we
are running with no config at all)
 2014-10-02 23:11:49 +02:00
Fabio Bas
4b38187d20 Fix logfile option in servatrice.ini 
servatrice was using hardcocded filename “server.log” even if a custom
value was specified
 2014-10-02 23:00:17 +02:00
Fabio Bas
a1b6600fe1 Servatrice: group all the use of QSettings in a single file 
and add a method to guess the path of servatrice.ini
 2014-10-02 22:37:50 +02:00
Gavin Bisesi
263b5a40f5 Merge pull request #341 from ctrlaltca/servatrice_install_configs 
Servatrice: install example ini and sql schema file
 2014-10-02 10:06:03 -04:00
Fabio Bas
7afdff1b3b Servatrice: install example ini and sql schema file 
WIN: in the binary directory
OSX: in the app bundle’s Resources subdirectory
LINUX: in $PREFIX/share/servatrice
 2014-10-02 08:34:21 +02:00
Fabio Bas
355de8fba4 Drop libgcrypt dependency for qt5 2014-10-01 20:21:22 +02:00
Gavin Bisesi
5c46cfc169 Merge pull request #179 from woogerboy21/registered-user-only-server 
Registered Only Server
 2014-08-11 09:03:57 -04:00
Fabio Bas
6e3c7d33da Make protobuf cleanup its resourced when servatrice ends 
Should help make valgrind’s log a bit cleaner
 2014-08-08 13:43:50 +02:00
Fabio Bas
0a5106b8ef Don't leak a QSettings object at every logged message 2014-08-08 09:57:07 +02:00
Fabio Bas
13bd35e020 Servatrice: add prototypes for local functions 2014-07-24 18:16:08 +02:00
Fabio Bas
036980eb44 ISO C++ forbids variable length array 2014-07-24 17:37:54 +02:00
woogerboy21
021f0911c4 Merge remote-tracking branch 'upstream/master' into registered-user-only-server 
Conflicts:
	common/server.cpp
	common/server_protocolhandler.cpp
	servatrice/src/servatrice.cpp
 2014-07-18 23:46:56 -04:00
Fabio Bas
d894c53265 Servatrice: fix handling of incoming connections on qt5 2014-07-08 22:05:06 +02:00
Fabio Bas
e9895d643f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-07-03 16:40:04 +02:00
woogerboy21
0a1fe7f5a8 Requested Cleanup 
Corrected tab to 4 space (per request)
Moved regonly option under authentication ini location (per request)
 2014-07-02 22:27:05 -04:00
woogerboy21
d246fa39fe Registered Only Server 
Implemented the ability to set the server to only allow registered
users.  Also updated client to reflect the log-in rejection as well as
put a check in place for the server to not start if db connection is not
available yet registration is required.
 2014-07-02 20:52:22 -04:00
woogerboy21
9ba74fee5c Example Update 
Renamed mysql configuration file to include example extension and set
git to ignore mysql.cnf per request.
 2014-07-02 13:23:50 -04:00
woogerboy21
b27873667b Optimization 
Updates for performance improvements per request
 2014-07-02 11:11:17 -04:00
woogerboy21
2b55170110 DB Maint Scripts 
External shell script to help maintain the cockatrice database tables.
 2014-07-01 13:11:52 -04:00
Fabio Bas
fc24ffdec2 Cmake reorganization 
* Move all cmake-related files in a new “cmake” folder
* move nsis files in there, too, since they are templates parsed by cake
* retrieve git version once when cmake is run, and use it for both
creating version_string.h/cpp and for package naming
 2014-06-28 19:39:26 +02:00
Daenyth
09d6d26fb2 Merge branch 'master' into cmake_qt5 
Conflicts:
	cockatrice/src/main.cpp
 2014-06-28 09:13:10 -04:00
Gavin Bisesi
e258f8625a Merge pull request #121 from woogerboy21/serverlog-filtering 
Server log filtering
 2014-06-27 19:02:30 -04:00
woogerboy21
f685bd2abe formatting 
4 space indent + code flow rewrite for easier readability.
 2014-06-27 18:18:03 -04:00
Fabio Bas
096f200eb9 Install libraries and plugins automatically under windows 
You won’t have to copy manually all the dlls in the release directory
anymore
 2014-06-27 17:40:29 +02:00
Fabio Bas
34772cccab Compilation fix for MSVC+Qt5 2014-06-27 17:09:09 +02:00
woogerboy21
b83fe95b05 removed extra un-needed empty line. 
removed extra un-needed empty line.
 2014-06-26 14:46:22 -04:00
woogerboy21
365de1fdd0 added multiple filter capabilities 
changed the single qstring log filtering to qstringlist to allow multiple filtering capabilities
 2014-06-26 14:38:57 -04:00
woogerboy21
977cf7340a settings update/addition 
updated settings name (loglevel) to a more descriptive name (writelog)
added logfilters setting to allow user defined filters.
 2014-06-26 00:40:21 -04:00
woogerboy21
91a96643f0 updated filtering code 
rewrote filtering code to allow for user input
code only filters on single string at the moment (still needs updated).
 2014-06-26 00:38:43 -04:00
Fabio Bas
c4458b16b2 Qt5: fix plugin installation 2014-06-25 15:53:25 +02:00
Fabio Bas
809f390e2f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-25 15:46:50 +02:00
Fabio Bas
bab340f7b7 Reworked a bit message handling from previous commit 2014-06-24 18:52:04 +02:00
Fabio Bas
2953c6ba2a Ported servatrice 2014-06-24 18:42:46 +02:00
woogerboy21
ec00bdebed verbose incrementation 
removed un-used variables
changed switch case to increase verbose level as loglevel increases
captured unset loglevel to default to highest verbose log level
 2014-06-23 09:18:49 -04:00
woogerboy21
46ceeadbbd updated code structure 
cleaned code structure up for clarity
 2014-06-23 03:41:46 -04:00
woogerboy21
236e0a4197 added loglevel variable 
added log filtering variable
 2014-06-23 00:09:21 -04:00
woogerboy21
5592346979 added server log filtering 
added log filtering based on configuration file setting
0 = log everything
1 = log nothing
2 = chat logging only
 2014-06-23 00:07:12 -04:00
Fabio Bas
2eebddea9a Port "make package" fix to oracle and servatrice 2014-06-22 23:41:15 +02:00
Fabio Bas
b44365b73c This finally fixes both make install and make package 2014-06-22 23:41:15 +02:00
Fabio Bas
6d1de0c617 Partially revert previous commits; ensure the bundle is fixed up correctly 2014-06-22 23:41:15 +02:00
Fabio Bas
41c7ce8022 Fix qt.conf file creation for "make package" 2014-06-22 23:41:15 +02:00
Fabio Bas
99f3519da5 Workaround permission problem in ixup_bundle 
Without this change, make install and make package would require “sudo”
under osx
 2014-06-22 23:41:15 +02:00
Fabio Bas
d7a962c055 CMake: support fir linking against qt5 2014-06-21 14:12:55 +02:00
Mark Morschhäuser
05f46011eb Fix toLatin1() changes from 6fa94dd to toUtf8(). 2014-06-20 18:16:46 +02:00
Mark Morschhäuser
6fa94dd475 Qt5: toAscii() and fromAscii() Methods are deprecated 2014-06-20 16:55:26 +02:00
Fabio Bas
eca318c34d Make install paths relative to prepare for CPack 2014-06-12 23:29:42 +02:00
Fabio Bas
721cf6fe4f Re-indent CMakeLists.txt using spaces 2014-06-11 18:08:30 +02:00
Fabio Bas
4b49458eeb servatrice's CMakeLists.txt: major overhaul 
* Remove cockatrice_HEADERS (obsoleted by automoc)
* Remove compilation flags definition and Qt4 finding calls
* Make use of CMAKE_INSTALL_PREFIX
* use INSTALL(TARGETS) in place of INSTALL(PROGRAM)
* Osx: create a proper application bundle
* Added comments
 2014-06-10 23:34:01 +02:00
Daenyth
347d30a84b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-27 12:36:14 -05:00
Max-Wilhelm Bruker
ce642e3000 don't use Server_Room::getInfo when updating 2013-02-15 19:31:37 +01:00
Max-Wilhelm Bruker
7a30b827c8 changed Server_Room::gamesMutex to QReadWriteLock 2013-02-11 15:43:31 +01:00
Max-Wilhelm Bruker
49d2fdc93d changed users table in servatrice.sql 2013-02-11 14:40:32 +01:00
Max-Wilhelm Bruker
1f6fbfddb3 updated servatrice.sql 2013-02-03 14:55:18 +01:00
Max-Wilhelm Bruker
b2dbfeb7f3 added thread names (2) 2013-01-27 16:42:53 +01:00
Max-Wilhelm Bruker
ae01144547 added thread names 2013-01-27 16:40:30 +01:00
Max-Wilhelm Bruker
c65f327e71 server crash fixes 2013-01-27 15:15:27 +01:00
Max-Wilhelm Bruker
4f97db62d7 server deadlock fix #2 2013-01-26 17:03:31 +01:00
Max-Wilhelm Bruker
8d596619e7 server deadlock fix 2013-01-26 16:34:24 +01:00
Max-Wilhelm Bruker
d5ccda49a1 server code cleanup 2013-01-23 11:51:59 +01:00
Max-Wilhelm Bruker
2deabebc7c added PasswordHasher::initialize() to make libgcrypt warnings go away 2013-01-12 18:05:08 +01:00
Max-Wilhelm Bruker
d6cddbea13 added index to sql file 2013-01-10 02:01:19 +01:00
Max-Wilhelm Bruker
915e809eb5 changed user -> id_user in decklist_folders and decklist_files (issue #48) 2013-01-10 00:01:06 +01:00
Max-Wilhelm Bruker
2e06b95e5c deadlock fix 2013-01-09 22:28:49 +01:00
Max-Wilhelm Bruker
de87bc6546 compile fixes by hasufell 2012-10-28 21:43:41 +01:00
Max-Wilhelm Bruker
43d7cf6a1a removed recursive lock in server; moved object serialisation to worker thread 2012-10-14 13:19:03 +02:00
Daenyth
af09d0d294 Reject more invalid usernames from clients. 
Specifically this should cover people connecting with a username of
"\u200C"
 2012-07-25 00:12:35 -04:00
Max-Wilhelm Bruker
a1e35ccda5 servatrice: create correct game ids when not using a database 2012-07-17 18:47:00 +02:00
Max-Wilhelm Bruker
c8852b450d don't open database in connection pools if main database connection is not valid 2012-07-17 18:15:10 +02:00
Max-Wilhelm Bruker
2c22fc93ff Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-29 15:48:04 +02:00
Max-Wilhelm Bruker
2eb3df1cde servatrice.sql fixes 2012-06-29 15:47:53 +02:00
Max-Wilhelm Bruker
4d8d2056f6 Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-28 21:35:02 +02:00
Max-Wilhelm Bruker
ed79e8f30a added missing column in servatrice.sql 2012-06-28 21:34:55 +02:00
Max-Wilhelm Bruker
a91090a828 added missing tables in servatrice.sql 2012-06-28 10:54:08 +02:00
Max-Wilhelm Bruker
8e5f5e4cbd added missing table to servatrice.sql 2012-06-27 11:20:53 +02:00
Max-Wilhelm Bruker
e326f9613a added numberPools=0 option to make server unthreaded 2012-06-24 23:49:10 +02:00
Max-Wilhelm Bruker
7d1ad3b4fa Merge branch 'master' of git://github.com/mbruker/Cockatrice into devel 2012-06-10 13:00:58 +02:00
Daenyth
00c03d857e Fix compile error with gcc >= 4.7 2012-06-10 00:11:12 -04:00
Max-Wilhelm Bruker
80439762cf hide login passwords from server log; call logDebugMessage in S_PH thread instead of Server thread 2012-06-03 19:23:15 +02:00
Max-Wilhelm Bruker
d7e7606104 fixed 'open deck in deck editor' option in game, fixed freeze when closing local game 2012-05-28 19:34:07 +02:00
Max-Wilhelm Bruker
9af69f53af server compile fix for older Qt versions 2012-05-28 19:03:05 +02:00
Max-Wilhelm Bruker
9d0133bae6 fix for older Qt versions 2012-05-28 19:01:29 +02:00
Max-Wilhelm Bruker
520300dc86 made server threaded, fixing issue #51 2012-05-28 18:51:58 +02:00
Max-Wilhelm Bruker
b328c1ed4d database interface separated from server, multiple concurrent database connections are now possible 2012-05-28 16:32:45 +02:00
Max-Wilhelm Bruker
2b89c353bf merged security fix from master 2012-05-22 22:18:45 +02:00
Max-Wilhelm Bruker
887ee0e86d fixed server security issue concerning deck deletion 2012-05-22 21:43:22 +02:00
Max-Wilhelm Bruker
981db47f9e initial commit for connection pools 2012-05-20 18:47:28 +02:00
Max-Wilhelm Bruker
b9087715bf fixed issue #42: make 'client deprecated' message work for v13 client <-> v14 server 2012-05-09 23:13:23 +02:00
Max-Wilhelm Bruker
f7975d8ace fixed issue #50: ensure that tcp_nodelay is set 2012-05-09 21:57:06 +02:00
Max-Wilhelm Bruker
0eee6d7ab9 fixed issue #49: when editing a remote deck, be able to directly save it there 2012-05-09 21:52:09 +02:00
Max-Wilhelm Bruker
f6f8ad82b2 server code cleanup 2012-05-01 12:48:59 +02:00
Max-Wilhelm Bruker
e5a0a08569 fixed #43: add delete button to local dir view in deck storage tab and in remote dir view in replays tab 2012-05-01 12:08:09 +02:00
Max-Wilhelm Bruker
7c8b3fc5e3 fixed #45: Terminate servatrice if critical error in e.g. listen() happens during initialization 2012-05-01 10:58:08 +02:00
Max-Wilhelm Bruker
c7fa2fe985 fixed clone function, updated servatrice.ini.example to reflect changes in room creation syntax 2012-04-26 16:22:48 +02:00
Max-Wilhelm Bruker
ae19d3dc4b fixed game list update bug, minor optimizations, restrict client protocol output to QT_DEBUG mode 2012-04-06 17:52:23 +02:00
Max-Wilhelm Bruker
f553fd7456 some token code 2012-04-05 11:48:13 +02:00
Max-Wilhelm Bruker
13b992cf12 show ban duration in client 2012-03-31 12:07:25 +02:00
Max-Wilhelm Bruker
d251078feb fixed user list bug in threaded client, fixed buddy list crash in server 2012-03-26 00:54:44 +02:00
Max-Wilhelm Bruker
542fd2c5c8 added menu item: game->game information, issue #1 fixed 2012-03-24 22:09:06 +01:00
Max-Wilhelm Bruker
af8e357487 improved code for automatic joining of persistent games; disconnecting + reconnecting works as it should with ISL 2012-03-18 21:57:21 +01:00
Max-Wilhelm Bruker
5db0fcd6ae cleanups, games work with ISL, now we just need to clean up better when the ISL connection dies 2012-03-18 18:48:14 +01:00
Max-Wilhelm Bruker
c9a8429044 always get next game/replay id from database to avoid id collisions in multi-server mode 2012-03-17 23:01:56 +01:00
Max-Wilhelm Bruker
9706ecd98a added mutex for RNG, moved game command implementation from S_PH to S_Player in preparation for forwarding of game commands via tunneling interface 2012-03-17 22:26:12 +01:00
Max-Wilhelm Bruker
671214c60e mutex fixes, server shutdown works again 2012-03-17 19:05:22 +01:00
Max-Wilhelm Bruker
c23af44749 changed a lot of thread locking code in the server, rooms are working with ISL now 2012-03-17 16:09:00 +01:00
Max-Wilhelm Bruker
572e4eaafa more ISL code, mutex fixes 2012-03-12 00:36:44 +01:00
Max-Wilhelm Bruker
0ae18d7b2e more ISL code: join, leave, and userMessage work on both sides 2012-03-11 17:25:45 +01:00
Max-Wilhelm Bruker
5963c2239c renamed servernetwork to ISL (inter-server link), join/leave is working 2012-03-10 19:02:15 +01:00
Max-Wilhelm Bruker
decf1c04bd switched NetworkServerThread to new thread creation method, SSL is working 2012-03-10 16:16:31 +01:00
Max-Wilhelm Bruker
0719d4c6ed client-side SSL works, thread initialization needs fixing 2012-03-04 23:15:39 +01:00
Max-Wilhelm Bruker
c9b66e4239 more ServerNetwork code 2012-03-04 19:23:43 +01:00
Max-Wilhelm Bruker
6bbc76af2b Merge branch 'devel' into servernetwork 2012-03-04 12:23:22 +01:00
Max-Wilhelm Bruker
acb03c2bf2 replays expire after two weeks, lock can be toggled to prevent that 2012-03-04 11:35:56 +01:00
Max-Wilhelm Bruker
a876a0bf5f tell logged in clients about new replays 2012-03-03 18:10:16 +01:00
Max-Wilhelm Bruker
8481e61e8f Replays split up, one for each subgame 2012-03-02 20:45:04 +01:00
Max-Wilhelm Bruker
50e53fbe53 initial commit for server network support 2012-02-26 21:00:05 +01:00
Max-Wilhelm Bruker
65d4c77ee8 cmake fix 2012-02-25 23:18:08 +01:00
Max-Wilhelm Bruker
c6c6a970c6 interface & client tab for replay transfer 2012-02-25 19:33:44 +01:00
Max-Wilhelm Bruker
89eaa14ec2 cmake fix 2012-02-25 14:48:31 +01:00
Max-Wilhelm Bruker
89c920479c cmake fix 2012-02-21 01:21:32 +01:00
Max-Wilhelm Bruker
89bb8e72ee use 'git describe' to generate version info for the about box and servatrice. fixes issue #20 2012-02-21 01:08:16 +01:00
Max-Wilhelm Bruker
d50d179b2f server-side replay support 2012-02-20 22:13:48 +01:00
cockatrice
10cbe4bf2e protobuf compile fix 2012-01-30 11:02:33 +00:00
Max-Wilhelm Bruker
eb06d6b4ea when banning an ip address, terminate the connection of everyone with that address 2012-01-29 20:55:24 +01:00
Max-Wilhelm Bruker
4895f2b4fd server code cleanup, changed in-game ping event to not use any bandwidth as long as nothing changes 2012-01-29 13:36:43 +01:00
Max-Wilhelm Bruker
068658995d added compiler flags 2012-01-21 22:24:20 +01:00
Max-Wilhelm Bruker
e202d659a0 moc weirdness workaround on Unix, added install target 2012-01-21 22:13:27 +01:00
Max-Wilhelm Bruker
3c24899de6 switched from qmake to cmake 2012-01-21 19:21:57 +01:00
Max-Wilhelm Bruker
16541141bd Cleaned up decklist code 2012-01-21 16:41:46 +01:00
Max-Wilhelm Bruker
7c2c6eac14 changed creation_time to time_t to get around Qt4.7 dependency 2012-01-03 01:13:15 +01:00
Max-Wilhelm Bruker
4634787b00 converted some Player commands to command lists; added db type checks in server 2012-01-02 19:41:37 +01:00
Max-Wilhelm Bruker
d4aaf9fff5 minor cleanups, server-side deck storage code is working again 2012-01-02 00:11:33 +01:00
Max-Wilhelm Bruker
ff3eb9b5f4 display reason for ban to banned user 2012-01-01 19:38:52 +01:00
Max-Wilhelm Bruker
d3b96b1a88 PB: server compiles again, standalone RemoteClient is able to log in 2011-12-30 21:50:25 +01:00
Max-Wilhelm Bruker
10018280e5 more PB 2011-12-30 02:03:26 +01:00
Max-Wilhelm Bruker
ca9122b9fb added responses + events 2011-12-29 19:40:41 +01:00
Max-Wilhelm Bruker
26f0f0df0e name-based ban fixed 2011-12-20 11:22:31 +01:00
Max-Wilhelm Bruker
c12d7a08c2 name-based ban fixed 2011-12-20 11:15:10 +01:00
Max-Wilhelm Bruker
f115342e47 local mode is working again 2011-12-18 23:30:53 +01:00
Max-Wilhelm Bruker
38e4781624 fixed packet length calculation bug, re-enabled deck selection 2011-12-18 19:10:47 +01:00
Max-Wilhelm Bruker
314f17091d protobuf client->server communication almost working 2011-12-18 18:35:14 +01:00
Max-Wilhelm Bruker
4eb9dfc5bf server-side part of client -> server commands almost converted to ProtocolBuffers. not usable yet 2011-12-04 23:21:31 +01:00
Max-Wilhelm Bruker
eb6520a737 store network traffic statistics in database 2011-12-04 14:24:36 +01:00
Max-Wilhelm Bruker
1455c093cc store sessions in database 2011-12-04 13:36:53 +01:00
Max-Wilhelm Bruker
7efee472ed face down dragging fixed, minor french translation fix 2011-11-17 21:43:32 +01:00
Max-Wilhelm Bruker
3ea0729229 is_admin=2 fix 2011-11-13 15:06:57 +01:00
Max-Wilhelm Bruker
c7ef61f750 moderators can override game restrictions and kick players when spectating; game host privileges shift when host leaves 2011-11-13 13:13:41 +01:00
Max-Wilhelm Bruker
632e9bbff3 improved banning and deck hashing 2011-11-01 22:44:51 +01:00
unknown
3ea81dfe2b server deck hash fix 2011-10-04 17:17:49 +02:00
cockatrice
53330090fb added sha512 password hashing, protocol version 13, server version bump 2011-09-21 13:12:08 +00:00
Max-Wilhelm Bruker
f38c5f50ef server crash fix 2011-08-03 16:51:14 +02:00
Max-Wilhelm Bruker
c8813bb2aa extra server logging, server memory leak fixed, m12 2011-07-11 23:01:59 +02:00
Max-Wilhelm Bruker
07317efd46 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-07-09 12:14:24 +02:00