Commit graph

349 commits

Author SHA1 Message Date
woogerboy21
af237c7d07 Fixed space/tabing issues. 2015-08-08 08:52:19 -04:00
woogerboy21
bc99024e4f Added server side setting to allow the requirement of a client id from clients. 2015-08-08 08:52:19 -04:00
woogerboy21
52db13a1ca Initial release of client ID generation. 2015-08-05 10:15:49 -04:00
woogerboy21
eb9ca58fd0 Updated pingClockTimeout to account for adjustments in client keep alive settings value.
Changed the default value for the client keep alive variable back to 1 (since that is what the setting is if the value is not found in the configuration ini file).
2015-07-30 16:38:02 -04:00
woogerboy21
8c7301b19f Updated server and client ping to 5 seconds. Also changed hard set 1 second value on the ping timers to read values from the settings cache. 2015-07-29 23:44:00 -04:00
Zach
c0bb640a37 Merge pull request #1295 from ctrlaltca/servatrice_email_v2
Refactor servatrice email send
2015-07-26 21:13:58 -07:00
Zach
f3ee1eac12 Merge pull request #1287 from ctrlaltca/servatrice_db_version
Fix misleading error message in servatrice; fix #1275
2015-07-25 22:36:01 -07:00
Fabio Bas
9c38b08407 Again on the same problem 2015-07-25 19:51:32 +02:00
Fabio Bas
c714932e25 Fix compilation under OSX with homebrew's qt5.5 2015-07-25 19:28:30 +02:00
Fabio Bas
1ffc9b4561 Refactor servatrice email send 2015-07-25 18:48:34 +02:00
Fabio Bas
946410de2b Fix misleading error message in servatrice; fix #1275 2015-07-22 17:51:30 +02:00
Fabio Bas
7f358d289e Fix calculation of ban expiration; fix #1283 2015-07-21 22:32:31 +02:00
Fabio Bas
5dc7c60b4d reorder parameters 2015-07-15 15:17:23 +02:00
Fabio Bas
056edd8570 Merge memory leak fix for smtp client
source:
c12f70b721
fd4feb5c0f17ddef93d5a56
2015-07-15 12:42:56 +02:00
woogerboy21
d91bbcfbce Removed Player Count Debug Line
Removed the output put to console for every logged in user.  It just cluttered things up.
2015-07-14 08:54:05 -04:00
woogerboy21
a9acb3f1cc Total Max User Restriction
Syntax correction.
2015-07-13 17:54:03 -04:00
woogerboy21
217d8fa165 Multi Server Session Functionality
Fix #1130
Adds the server id in the SQL query for userSessionExists function.
2015-07-11 23:18:37 -04:00
Matt Lowe
894d6c8d2d Refactored tabs to spaces
Removed tabs in favour of 4 spaces.
2015-07-07 21:01:19 +02:00
Fabio Bas
14bce93c7a make gcc an happy puppy 2015-07-06 09:14:29 +02:00
Fabio Bas
68f1358f54 rebased on master 2015-07-05 22:48:09 +02:00
Fabio Bas
7f5f290c93 Profile management 2015-07-05 22:44:35 +02:00
Fabio Bas
26f317ee75 Profile management 2015-07-05 16:39:55 +02:00
Zach
31890450dc Merge pull request #1205 from ZeldaZach/fix_1173
Server Name Rules Information
2015-07-04 19:37:50 -04:00
Fabio Bas
f5be6f836e Improved logging of SIGHUP and cmdReloadConfig 2015-07-03 09:09:41 +02:00
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
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
135205d368 Implement migrations; fix #153 2015-05-31 17:36:15 +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
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