Commit graph

150 commits

Author SHA1 Message Date
heinrich5991 0244640aca Also don't send the token magic to unsupported clients
Since only the client can initiate the secure session, there's basically
no reason to send this magic to clients which didn't advertise the
feature.
2016-06-08 09:57:17 +02:00
Dennis Felsing 3dd2f23d45 Merge pull request #499 from heinrich5991/pr_ddnet_no_tokens_for_vanilla
Don't send token to harmless vanilla clients
2016-06-07 16:22:29 +02:00
heinrich5991 a2e64f0a16 Don't send token to harmless vanilla clients 2016-06-07 15:52:57 +02:00
heinrich5991 4d6657e3f1 Fix CRC of dummy map 2016-05-26 11:06:56 +02:00
heinrich5991 b075f1ff1b Use a dummy map with background 2016-05-25 23:47:34 +02:00
heinrich5991 702ed7e023 Reduce dummy map size from 549 bytes to 191 bytes
Also include a tool to generate said map; the map is generated without
any hacks. It could likely be made smaller using a few tricks.
2016-05-24 01:47:04 +02:00
heinrich5991 e353aa80b2 Don't send uninitialized memory over the network 2016-05-23 11:48:23 +02:00
def 1645310750 Keep reading packets after invalid control packet 2016-05-17 23:44:57 +02:00
east 1cbaa0c4ef copy resendbuffer on timeout protection 2016-05-07 19:28:16 +02:00
def 61e47422f6 Clean up debug messages a bit (lower case, no useless errors) 2016-05-02 21:35:32 +02:00
def 86a0f46937 Add a connection limit (fixes #408) 2016-04-27 22:09:18 +02:00
east a5de7596fa comments added 2016-04-23 17:44:42 +02:00
east 32ba1c9239 Antispoof dm1 fallback on flood added 2016-04-23 17:23:01 +02:00
def c78ade00c1 Fix bug where timed out people can connect more than sv_max_clients_per_ip times 2016-01-03 01:42:28 +01:00
east c1cbfcacf4 correctly reset network connection 2015-08-23 18:12:13 +02:00
east cf9e1373d7 correctly reset client 2015-08-23 17:51:28 +02:00
east c47697bdef session rejoin 2015-08-23 17:01:01 +02:00
east 09166494a5 Antispoof: fix error state 2015-08-23 12:29:41 +02:00
east 79a523e8a8 websocket support fixed 2015-08-21 13:08:40 +02:00
east 6ab2a558b3 Disable vanilla antispoof on password protected servers 2015-08-17 17:06:32 +02:00
def 51dda4e72b Fix aliasing warning 2015-08-16 19:14:17 +02:00
def e21d6e8574 Remove useless variable 2015-08-16 19:08:33 +02:00
east e9a1c3ef92 vanilla handshake: add vital flags and use correct sequence (support for 0.6.4) 2015-08-15 10:38:39 +02:00
east a084f1e31e use complete map as dummy map 2015-08-14 18:37:00 +02:00
east 48fc0f93bb added enable/disable conf var for vanilla antispoof 2015-08-14 18:36:28 +02:00
east 051ec30832 vanilla handshake: ignore unknown sequence 2015-08-14 18:36:13 +02:00
east 9f1ab9a7bf added simple flooding detection (temprorary) 2015-08-14 18:34:22 +02:00
east aabd777858 fixed includes 2015-08-14 18:33:42 +02:00
east d1382349f5 vanilla token handshake implemented 2015-08-14 18:30:49 +02:00
east a2174bf179 anti spoof for token protocol added 2015-08-14 18:30:12 +02:00
heinrich5991 71548fc0d6 If no rcon password is set, generate one
After the generation (using the OS random number generator), the password is
displayed to the user on stdout.
2015-06-21 19:56:35 +02:00
def 5dd83b58ff Fix security token conversion in a platform independent way 2015-04-18 23:54:19 +02:00
def 0ffa79671b Get rid of all GCC warnings 2015-04-18 21:33:51 +02:00
eeeee 0dc332c931 fix timeout protection with tokens
timeout protection code now transfers the token properly
2015-03-05 22:33:01 -08:00
heinrich5991 fa0708b99d Make the secure random stuff platform-independent 2015-03-06 01:35:08 +01:00
eeeee 85acfd9d77 added security token to protocol
to prevent packet injection from spoofed source ips
2015-03-05 11:07:03 -08:00
def efeb2b9417 Minor fix 2014-09-11 21:38:13 +02:00
def 5b72302672 Instead of banning players for reconnecting too often, make them wait 3 seconds (fixes #27) 2014-09-09 23:27:28 +02:00
def c9d70ed81b Try to fix crash related to bad connection and reconnecting 2014-08-18 23:50:24 +02:00
def f1e4700ae8 Add a timeout protection message 2014-08-17 05:04:37 +02:00
def ce0eb1a2c2 try fix 2014-08-17 04:20:36 +02:00
def 2bdc6a1f4d Some more tries to fix timeout stuff 2014-08-16 15:43:49 +02:00
def 07aa08703d Remove (probably buggy) implicit timeout protection 2014-08-16 14:43:22 +02:00
def e90d84b89f Fix the wrong "Timeout Protection over" error 2014-08-11 22:22:01 +02:00
def 85b7475ae4 remove debug output 2014-08-09 18:13:21 +02:00
def a39c46ea1d Only extend timeout when code was entered 2014-08-09 18:08:00 +02:00
def f04537dee5 Working great 2014-08-09 17:53:24 +02:00
def f859f350ca Kind of working with timeout code 2014-08-09 17:25:29 +02:00
def 459c25c656 Some renames 2014-08-09 16:30:12 +02:00
def a8a247116d Only on real timeouts 2014-08-09 15:37:10 +02:00
def 127dc1c196 Try timeout 2014-07-28 20:44:17 +02:00
def f5590aecbc Oops 2014-01-16 20:31:00 +01:00
def 601604c55b Ban players for abusing join/leave 2014-01-16 15:11:42 +01:00
def d158267e92 Better broadcasting for spectators 2014-01-13 17:00:49 +01:00
def 3d70e203c5 Remove connfilter because of too many false positives 2014-01-12 16:32:06 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
2013-12-26 18:02:22 +01:00
def 2b343624d4 Don't drop clients in any case 2013-11-17 02:27:28 +01:00
def 5a2bd2e4df Revert "No network connect limit"
This reverts commit 888b23a3e4.
2013-09-09 21:53:13 +02:00
def 888b23a3e4 No network connect limit 2013-09-05 23:50:24 +02:00
def 43c963ad2f Less strict connection limit 2013-09-03 22:07:15 +02:00
def 4f79d90212 More reasonable netfiltering hopefully 2013-08-10 04:10:39 +02:00
def c259c2752c Don't drop clients 2013-08-10 04:05:33 +02:00
def 34b7ea6193 Only ban if trying to connect within 0.5 seconds 2013-08-06 04:04:36 +02:00
def 60865b7dbf More advanced netlimit 2013-08-04 17:50:12 +02:00
def 71ba923133 Move netlimit over to regular server 2013-08-04 04:24:03 +02:00
def 82f3734dd7 Try to implement netlimit (level too high, map downloads might fail) 2013-07-31 05:36:52 +02:00
def e871fbbaad Try to prevent network spamming issues 2013-07-30 22:48:31 +02:00
oy 678863fa7e increased minimum required connect time for clients to 1 second. #1070 2013-03-20 22:47:48 +01:00
oy ea2898e94a prevent quick join/quit flood. #1070 2013-02-24 19:13:45 +01:00
oy f1fc3337f5 prevent that the server uses close messages from clients. Closes #950 2013-02-24 17:32:48 +01:00
eeeee ee2647de41 turns out that Drop was needed after all :S 2012-12-23 20:10:31 +03:00
eeeee cae8c68d87 send ahead window for maps downloading. works with vanilla client. 2012-11-12 21:50:46 +02:00
Ravomavain 52ba9eea04 remove other banmaster related code 2012-05-02 01:18:11 +02:00
GreYFoX ee670118a5 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
Conflicts:
	src/engine/console.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
@heinrich5991 todo
2012-01-01 00:11:56 +02:00
oy b44ee3d975 reworked ban system 2011-12-29 23:36:53 +01:00
eeeee 385be8a716 updating existing bans' expiration would break ordering in bans sorted list 2011-12-14 13:48:41 +01:00
eeeee 8f5f45c18f keep lifebans at the tail of bans list. Fixes #131 2011-12-14 13:47:23 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
2011-12-05 11:32:01 +02:00
Choupom b2a825652d added a command to unban all 2011-12-04 14:22:59 +01:00
GreYFoX 5b27758650 Removed level stuff
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
2011-08-13 02:11:06 +02:00
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
2011-08-13 02:01:40 +02:00
oy 1705c90e14 fixed ban for life on the server 2011-07-31 12:43:35 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
2011-05-09 18:36:13 +02:00
oy 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +02:00
GreYFoX 0d61c87fa1 Added 0.6.0 banmaster by @heinrich5991 #31 2011-04-26 11:51:02 +02:00
GreYFoX f322f65f45 fixed ban for life 2011-04-20 21:25:59 +02:00
GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
Conflicts:
	bam.lua
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/game/client/components/binds.cpp
	src/game/client/components/chat.h
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/controls.cpp
	src/game/client/components/emoticon.h
	src/game/client/components/maplayers.cpp
	src/game/client/components/menus.h
	src/game/client/components/scoreboard.h
	src/game/client/components/spectator.h
	src/game/client/components/voting.h
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/client/render.h
	src/game/collision.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/gamecore.cpp
	src/game/gamecore.h
	src/game/layers.cpp
	src/game/layers.h
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/laser.h
	src/game/server/entities/pickup.cpp
	src/game/server/entities/pickup.h
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gameworld.cpp
	src/game/server/gameworld.h
	src/game/server/player.cpp
	src/game/variables.h
2011-04-14 01:27:49 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
GreYFoX f7f6058a92 Merged Oy, Cleaned up, removed some useless features and code parts
Added Icon by landil
alot more...
2011-04-09 22:32:17 +02:00
oy 59d56cd332 finished IPv6 support (master servers aren't compatible with 0.5 and older). Closes #233 2011-03-30 12:08:33 +02:00
oy 34a9ca20a7 added ipv6 support from the old lua branch 2011-03-28 20:11:28 +02:00
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
heinrich5991 825eca4bab added saving of the banreason. 2011-02-13 13:31:58 +01:00
GreYFoXGTi d7e4153ec4 Added banmaster by heinrich5991 2011-02-07 08:25:38 +02:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
Choupom 7aefbca742 made so we can add the reason for a kick/ban (fixes #123) 2010-10-11 00:31:14 +02:00
oy cabecb7fa9 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-18 00:06:00 +02:00
oy 5988b9d388 - show connecting players with rcon status command
- make it possible to limit the number of clients with the same ip that can connect to the server
2010-06-03 14:48:32 +02:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Renamed from src/engine/e_network_server.cpp (Browse further)