Commit Graph
937 Commits
Author SHA1 Message Date
lotodore 20eb7b94bd Fixing several compiler warnings. 2013-09-16 23:11:16 +02:00
lotodore c6c044b784 Fixing crash when sending data to a closed websocket connection. 2013-09-16 22:57:12 +02:00
lotodore 496a668a15 Fixing retrieval of remote webclient address for login blocker. 2013-09-16 22:33:52 +02:00
lotodore 84b9b56d6a Fixing gcc problem with EncodeToBuf-function. 2013-09-15 23:11:15 +02:00
lotodore 36eeaee5d7 Adding missing files for websocket implementation. 2013-09-15 23:06:15 +02:00
lotodore 8e39432754 Adding websocket server code, so that a gateway is no longer required. Still kind of untested. Requires websocketpp. 2013-09-15 22:54:45 +02:00
lotodore eb571a8640 Automatically close games if only spectators are left. 2013-09-02 00:37:02 +02:00
lotodore eae6a6fae7 Trying to fix missing spectator left message when connection is closed. 2013-09-01 23:43:59 +02:00
lotodore e008ef9ad5 Send lobby etc. notifications also to players in state "spectator waiting". 2013-09-01 18:09:15 +02:00
lotodore 9686257e41 Switching from asn.1 to protobuf as chat cleaner protocol. 2013-08-29 22:18:44 +02:00
lotodore 1d0b9fc5f2 Signals/callbacks when spectators join or leave. 2013-08-19 22:50:56 +02:00
lotodore 7b305b36e2 Adding feature to leave a game as spectator. 2013-08-11 13:25:26 +02:00
lotodore be0f363af4 Spectator mode fixes. 2013-08-10 16:53:36 +02:00
lotodore 7b27213daa Waiting state for spectator mode. 2013-08-10 16:29:15 +02:00
lotodore 0be7632875 Fixing session counter with regard to spectators. 2013-06-29 23:44:00 +02:00
lotodore ef489dae8a Work on spectator mode - joining as spectator now possible (on server side). 2013-06-29 16:23:10 +02:00
lotodore cbd6b40f85 Fixing operator order when checking for state bit. 2013-06-16 15:56:34 +02:00
lotodore 00543b7560 More work on spectator mode. 2013-06-16 10:43:13 +02:00
lotodore 904069e02e Adding protocol support for spectator mode. 2013-04-01 23:37:28 +02:00
lotodore 202825ab15 Also log IP address of player who is banned. 2013-02-28 20:48:44 +01:00
lotodore 0052de02e1 Enabling banning a player from the client (as admin). 2013-02-28 20:38:37 +01:00
lotodore 44b90f9433 Adding server log messages for admin actions. 2013-02-27 22:34:30 +01:00
lotodore 2aba7cf7ed Add message callbacks to client admin functions. 2013-02-26 23:15:33 +01:00
lotodore f7777b535d Improving in-game admin functions, implementing reply packets to report results. 2013-02-25 23:02:20 +01:00
lotodore 19f27a890c Implementing packet validation for new packets and client side game removal for admin players. 2013-02-24 23:04:02 +01:00
lotodore d8dcf78ab4 Protocol changes for admin functions. Fixing generic DB implementation. 2013-02-24 18:24:38 +01:00
lotodore 883ccdcf44 Preparing admin functions in PokerTH client. 2013-02-24 16:22:51 +01:00
Sven-Hendrik Haase 36d5e02436 Fix libircclient fix to work with multiple versions 2013-01-11 15:44:03 +01:00
Sven-Hendrik Haase 02473d95b4 Fix for newer libircclient 2013-01-03 15:41:35 +01:00
lotodore 13afee52f8 Consider avatar server of server list (reverting change specific for the beta release). 2013-01-01 15:17:50 +01:00
lotodore 1e0bd74db6 Fixing validation of empty packets. 2013-01-01 15:06:09 +01:00
lotodore ccdd838900 Fixing reset timeout and show own cards messages. 2013-01-01 14:31:04 +01:00
lotodore b78f1e730f Fixing gcc warning. 2013-01-01 10:15:53 +01:00
lotodore 163014328c Fixing gcc compiler warnings in packet validation code. 2013-01-01 00:37:18 +01:00
lotodore d4c1d64eda Trying to fix game info validation. 2013-01-01 00:27:49 +01:00
lotodore fb620625b6 Testing packet validation. 2012-12-31 23:05:28 +01:00
lotodore cbed0685e9 Log packet type of invalid packets. 2012-12-31 21:40:55 +01:00
lotodore eaa64cbc8c More packet validation for google protocol buffers. 2012-12-31 19:36:18 +01:00
lotodore 196686ee0e Fixing packet validation. 2012-12-31 16:38:29 +01:00
lotodore 4431efbbd8 First steps for network server packet validation. 2012-12-31 16:31:26 +01:00
Evgeni Golov 1bbe608f50 rename major/minor to majorVersion/minorVersion
PokerTH fails to build on Debian GNU/kFreeBSD and GNU/Hurd with:
 In file included from src/third_party/protobuf/pokerth.pb.cc:4:0:
 src/third_party/protobuf/pokerth.pb.h:936:37: error: expected unqualified-id before 'int'
 src/third_party/protobuf/pokerth.pb.h:936:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:936:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:943:37: error: expected unqualified-id before 'int'
 src/third_party/protobuf/pokerth.pb.h:943:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:943:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:9618:60: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.h:9640:60: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc: In member function 'virtual void AnnounceMessage_Version::SerializeWithCachedSizes(google::protobuf::io::CodedOutputStream*) const':
 src/third_party/protobuf/pokerth.pb.cc:1581:72: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1581:72: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc:1586:72: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1586:72: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc: In member function 'virtual int AnnounceMessage_Version::ByteSize() const':
 src/third_party/protobuf/pokerth.pb.cc:1599:17: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1599:17: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc:1606:17: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1606:17: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc: In member function 'void AnnounceMessage_Version::MergeFrom(const AnnounceMessage_Version&)':
 src/third_party/protobuf/pokerth.pb.cc:1625:22: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1625:22: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc:1628:22: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1628:22: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc: At global scope:
 src/third_party/protobuf/pokerth.pb.cc:14319:6: warning: unused parameter 'output' [-Wunused-parameter]
 src/third_party/protobuf/pokerth.pb.cc:18344:6: warning: unused parameter 'output' [-Wunused-parameter]
 make[2]: *** [obj/pokerth.pb.o] Error 1

Renaming the vars to majorVersion/minorVersion fixes this issue.

The problem on kFreeBSD is, that
 /usr/include/sys/kern/types.h
has
 #define major(x)        ((int)(((u_int)(x) >> 8)&0xff)) /* major number */
 #define minor(x)        ((int)((x)&0xffff00ff))         /* minor number */
and this is included somewhere when you include stdlib.h, which protobuf's
headers do.

Hurd has similar definitions in /usr/include/i386-gnu/sys/sysmacros.h.
2012-12-28 12:14:54 +01:00
lotodore 45a5c7cef8 License change: OpenSSL exception (for Windows 8 support, because gcrypt does not work on Windows 8). 2012-12-25 15:06:23 +01:00
lotodore 805a804400 Preparing 1.0 beta1. 2012-12-23 14:38:20 +01:00
lotodore d3cd97c666 Running astyle. 2012-12-21 01:01:01 +01:00
lotodore 26507df7ef Switch to uploader thread for log file uploads. 2012-12-20 14:29:43 -08:00
lotodore b7f46d12e2 Still trying to fix "dereferencing type-punned pointer will break strict-aliasing rules"-warning. 2012-11-27 23:11:50 +01:00
lotodore 7ef3cc25bd Trying to fix "dereferencing type-punned pointer will break strict-aliasing rules"-warning. 2012-11-27 22:12:51 +01:00
lotodore 02016381ef Multiple player info requests can be placed in one packet. 2012-09-24 12:22:13 +02:00
lotodore f0ee0af6ec Some work on protocol buffer details. 2012-09-23 23:19:53 +02:00
lotodore 895a174a08 Fixing gcc compiler warnings. 2012-09-20 22:14:17 +02:00