120 Commits

Author SHA1 Message Date
a0518dc0a0
Merge commit 'c9522fb740200ccef6230cec452c48efb31e5394#diff-8d3ef4ba02861ab7342677303e0ef793dc2063ed69dbafe1a17e886b24499aab' into pullstream
This commit was done specially since it interfaces heavily with Lua.

First it was diffed out in a standard cuberite repo so we can tell what was changed,
and we apply this diff to a basic cuberite repo right before the commit was made.

I then promptly reverted lua changes that would conflict with applying
the patch. I also had to remove whole sections from the patchfile
afterwards but it was made easier having the actual repo with the
patches applied able to remake the diff as needed before i removed the
bigger sections.

Somehow it all worked out.
2024-02-14 05:48:18 -05:00
6c4b2e9186
Implement GPL3+ and Apache2.0 Dual License.
Commit is being made to allow additions of GPL3+ code previously
un-addable. With these changes, contributions back to cuberite are
possible with the backporting exemtion, as well as adding stuff in
minetest with minetest code properly being read through and implimented
to upgrade it to GPL3 from GPL2.

project still has Apache2.0 license and credits to all its contributers, but now has the freedom of GPL3+ and all the code that can be implimented and shared with it.
2023-03-20 11:49:56 -04:00
Tiger Wang
4ec44751e2 ProtoProxy: encrypt in-place 2021-07-06 21:33:03 +01:00
Tiger Wang
01a4e696b3
Do protocol decryption in-place (with CryptoAPI on Windows) (#5145) 2021-03-08 16:37:36 +00:00
Tiger Wang
eeb63b8901
zlib -> libdeflate (#5085)
+ Use libdeflate
+ Use std::byte
* Fix passing temporary to string_view
+ Emulate make_unique_for_overwrite
2021-01-11 16:39:43 +00:00
Tiger Wang
330626ab22 Update submodules 2020-07-23 00:32:47 +01:00
Tiger Wang
4f85931c42 Address comments 2020-07-12 22:00:07 +01:00
Tiger Wang
6317176d7e More CMake cleanup 2020-07-12 22:00:07 +01:00
Tiger Wang
78f72bbfc4 Resolve IPO flags mismatch 2020-05-31 13:05:19 +01:00
Tiger Wang
9e8598fb1c
Upgrade to C++17 [CMake] (#4717)
* Make our CMake slightly less insane
2020-05-16 20:59:10 +01:00
peterbell10
154df6b09d
Cleanup unneeded globals (#4736) 2020-05-10 16:16:38 +00:00
Mat
c710f6a4ea
Remove old Android leftovers (#4722) 2020-05-07 22:14:00 +03:00
peterbell10
57952505e5
Update fmt to 6.2.0 (#4718)
* Update fmt to 6.2.0
2020-05-05 22:52:14 +01:00
peterbell10
8e2dfce84b
Require semi-colon at end of function-like macros (#4719) 2020-05-05 20:39:59 +00:00
peterbell10
757231cc6e
Add the fmt library (#4065)
* Replaces AppendVPrintf with fmt::sprintf
* fmt::ArgList now used as a type safe alternative to varargs.
* Removed SIZE_T_FMT compatibility macros. fmt::sprintf is fully portable and supports %zu.
* Adds FLOG functions to log with fmt's native formatting style.
2018-01-03 17:41:16 +00:00
Alexander Lyons Harkness
1926181cb7 Fix style of Tools 2017-12-24 14:23:23 +00:00
peterbell10
832b394715 Fix Travis build (#4101)
Stop using gdb on osx - was breaking the build
Add clang 3.5 build as travis now defaults to 5.0
Fix unknown-warning-option errors on AppleClang
ProtoProxy: Use nullptr
UrlClientTest: add override to callback destructor
Update jsoncpp to use nullptr
2017-12-22 18:25:46 +00:00
Lukas Pioch
c5f590d460 Removed UTF-8 BOM (#4033) 2017-09-19 10:34:08 +02:00
peterbell10
84941bcc9f Update mbedtls to 2.5.1 (#3964)
* Renaming changes:
  * macro prefix "POLARSSL" -> "MBEDTLS"
  * functions now prefixed with "mbedtls_"
  * rename PolarSSL++ -> mbedTLS++
  * rename polarssl submodule

* Use mbedtls' AES-CFB8 implementation.

* Add cSslConfig to wrap mbedtls_ssl_config

* Update cTCPLink and cBlockingSslClientSocket to use cSslConfig

* Use cSslConfig in cHTTPServer

* Use cSslConfig for cMojangAPI::SecureRequest

* CI Fixes

* Set -fomit-frame-pointer on the right target
2017-08-30 15:00:06 +01:00
peterbell10
f4f2fc7c3d Add cUUID class (#3871) 2017-08-25 13:43:18 +01:00
peterbell10
759618b035 Remove double includes part 2 (#3890) 2017-08-03 15:34:19 +02:00
Mattes D
7ac3b0fa0b Removed the LeakFinder for Windows. (#3777) 2017-06-19 11:05:19 +02:00
Mattes D
d2e8643607 Fixed type-casting-related warnings. 2016-08-24 22:26:53 +02:00
Mattes D
8eaa8613da CMake: Remove needless minimum version specifications. 2016-07-18 22:11:42 +02:00
Alexander Harkness
16d0bc10a4 Removed offending tr1 references. 2015-12-22 19:55:00 +00:00
tycho
e1d5e5e165 Improved types of utf 16 strings 2015-10-02 17:26:53 +02:00
tycho
3187dbf0aa Increase robustness of the logging subsystem 2015-09-15 16:19:49 +01:00
Anthony Birkett
9dac390247 Daemon support on Linux.
Added null console log listener, avoid printf() when stdout is closed.
2015-06-05 15:47:47 +01:00
tycho
c627016ea6 Fix other clang 3.6 commit 2015-05-24 17:14:35 +01:00
tycho
7a8025eacd Disable -Werror for warnings in tools. 2015-05-24 13:24:34 +01:00
tycho
62c99145d0 Disable warnings in MCADefrag, ProtoProxy and tests 2015-05-23 12:47:54 +01:00
Tiger Wang
2919d08883 Update submodules 2015-05-02 15:57:49 +01:00
Mattes D
b913c5da69 Added VarInt64, normalized cPacketizer datatype names. 2015-03-22 23:09:23 +01:00
Mattes D
8df9f1685a ProtoProxy: Fixed connection and logging. 2015-03-22 15:00:51 +01:00
Mattes D
b1d4b3bb96 Unified cByteBuffer types.
cByteBuffer now reads and writes any of the [U]Int<N> types.
2015-03-21 13:00:20 +01:00
Creaprog
9fab1d85bc Fixed Server.cpp 2015-02-16 09:27:52 +01:00
Creaprog
6f9c62172b Fixed Server.cpp 2015-02-15 20:39:53 +01:00
Creaprog
cbd2a09135 Fixed Server.cpp 2015-02-15 18:28:33 +01:00
Creaprog
a063da9398 Fixed Server.cpp 2015-02-15 17:28:19 +01:00
Creaprog
5797f99def Fixed Server.cpp
Performance improvement.
2015-02-15 14:29:11 +01:00
Matyas Dolak
2b75c89051 ProtoProxy: Added socket startup error reporting.
Fixes CID 66433, fixes CID 66443.
2015-01-23 10:10:25 +01:00
Matyas Dolak
dc5ab256a5 ProtoProxy: Fixed warnings in Connection.cpp. 2015-01-21 14:15:35 +01:00
Matyas Dolak
b333551830 ProtoProxy: Fixed warnings in Connection.cpp. 2015-01-21 11:24:32 +01:00
Mattes D
9e4528793a ProtoProxy: Log block change packet details. 2014-12-25 20:41:12 +01:00
Mattes D
7d35e84578 Fixed tools compilation.
Fixes errors introduced in 081e7ddd028d9382bd52c2b117dae6b6f84225e5.
2014-12-25 08:47:35 +01:00
Mattes D
557dc5a93f ProtoProxy: Added a sanity check to metadata string lengths.
Fixes CID 66415.
2014-12-21 22:51:17 +01:00
Mattes D
3c3cb198f3 Fixed c++11 branch issues. 2014-12-07 15:46:27 +01:00
Mattes D
ed99216ba4 Tools: Removed unused Timer.* file from CMakeLists.txt. 2014-12-04 22:51:40 +01:00
Mattes D
c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Mattes D
8e6f98eb40 Fixed missing files in ProtoProxy. 2014-11-29 23:30:27 +01:00