Commit graph

253 commits

Author SHA1 Message Date
Thulinma
0181a86901 Merge branch 'development' into LTS_development 2017-05-15 17:15:50 +02:00
Thulinma
38bbadb731 Updated API to force account creation through LSP when no accounts present 2017-05-15 17:15:36 +02:00
Thulinma
0798a6c712 Fixes for triggers 2017-05-13 15:18:21 +02:00
Thulinma
c5e961fd8d Added exitdelay in licensing system 2017-05-11 14:03:08 +02:00
Thulinma
bf382cbea0 Updated updater. Yes, the irony is not lost on me. 2017-05-11 14:03:01 +02:00
Thulinma
0eca65e433 Merge branch 'development' into LTS_development 2017-05-09 16:23:23 +02:00
Thulinma
101a8d521c Fixed debug level being null when unset 2017-05-09 15:48:05 +02:00
Thulinma
4f1e653c44 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_streams.cpp
2017-05-09 13:27:07 +02:00
Thulinma
0e0da824f7 Robustified stream/protocol related API calls 2017-05-09 11:31:24 +02:00
Thulinma
85202a0b30 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller.cpp
#	src/controller/controller_storage.cpp
#	src/controller/controller_storage.h
2017-05-08 16:10:48 +02:00
Thulinma
04e0dfeab0 Added instance ID 2017-05-08 15:56:58 +02:00
Thulinma
4bdcb24132 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_api.cpp
#	src/controller/controller_api.h
#	src/controller/controller_storage.cpp
2017-05-08 10:23:54 +02:00
Thulinma
16637b3138 Backported many Pro API calls to OS edition, improved storage method of config file 2017-05-08 10:20:41 +02:00
Thulinma
2cec1f7836 Fixed session cache race conditions 2017-05-01 11:54:02 +02:00
Thulinma
efc80123f0 Access log compile fixes 2017-04-18 19:33:40 +02:00
Thulinma
b9f60ac92c Sessions are now wiped after the disconnect timeout, if denied access 2017-04-18 12:34:00 +02:00
Thulinma
d0912c9d00 Controller now listens locally to UDP port 4242 for API commands, added always-minimal api2 request type. 2017-04-18 12:33:49 +02:00
Thulinma
3980b8c8c1 Access logs + made prometheus runtime changeable 2017-04-18 12:33:06 +02:00
Thulinma
7629b00a4c Merge branch 'development' into LTS_development 2017-04-18 12:32:39 +02:00
Thulinma
a82be2775f Added local-only auto-authorize for API 2017-04-18 12:20:20 +02:00
Thulinma
aa0e09e45b Fixed timings for license system 2017-03-30 12:22:16 +02:00
Thulinma
11f95a64fe Improved console interface 2017-03-29 12:05:42 +02:00
Thulinma
831e454ebb Improved console interface 2017-03-29 12:03:15 +02:00
Thulinma
cab87a6425 Updated triggers, implemented LIVE_BANDWIDTH trigger 2017-03-10 11:41:52 +01:00
Thulinma
6a68d86a0e Licensing fixes for long updating intervals 2017-03-10 11:41:00 +01:00
Thulinma
c58f11fb22 License system enabled. 2017-03-09 16:20:48 +01:00
Thulinma
8a66913869 Improved licensing system somewhat - not completely done yet 2017-01-31 14:44:36 +01:00
Thulinma
e4110502ee No longer measure localhost in kernel-style measurements 2017-01-31 14:44:21 +01:00
Thulinma
0c0bb5b3bf Fixed stream statistics sometimes holding invalid values 2017-01-31 14:42:25 +01:00
Thulinma
370418631c Improved controller shutdown speed 2017-01-02 12:17:17 +01:00
Thulinma
bd6034828f Merge branch 'development' into LTS_development
# Conflicts:
#	CMakeLists.txt
#	src/controller/controller_connectors.cpp
2017-01-02 12:14:16 +01:00
Thulinma
0ece6d8f26 Added ability for controller to restart without restarting connectors simultaneously 2017-01-02 12:11:05 +01:00
Thulinma
23550232b9 Fixed compile error 2016-11-21 09:59:51 +01:00
Thulinma
781cad41c8 Added auto-recovery of push list on crash and/or restart 2016-11-18 15:35:21 +01:00
Thulinma
6254c285d6 Added duplicate checking for manual pushes 2016-11-18 15:35:15 +01:00
Thulinma
3f14db4b12 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
#	src/output/output.cpp
2016-11-14 11:29:24 +01:00
Thulinma
0e649b7c72 Fixed creating accounts on wrong login attempt 2016-11-14 10:53:07 +01:00
Thulinma
fdb5fbad45 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/socket.cpp
#	lib/socket.h
2016-11-03 15:17:30 +01:00
Thulinma
629b24853a Added hostBytesToStr function to socket library, fixed code style, fixed UDP Cygwin support 2016-11-03 15:15:42 +01:00
Thulinma
df4a71719d Removed extra newline from STREAM_READY trigger, removed superfluous log message. 2016-11-03 12:01:17 +01:00
Thulinma
0b78a57e40 Added shared memory session cache + instant-sync for sessions in cache. 2016-10-11 16:42:47 +02:00
Thulinma
028c485c3e Fixed stats issue for quick switching connections. 2016-10-11 16:41:42 +02:00
Thulinma
59ae4f5aca Merge branch 'development' into LTS_development 2016-10-11 16:41:15 +02:00
Thulinma
8f6d75e51e Fixed stats issue for quick switching connections. 2016-10-11 16:36:22 +02:00
Thulinma
e10a22503d Added per-output statistics 2016-10-11 15:19:14 +02:00
Thulinma
c316fe4e0b Merge branch 'development' into LTS_development 2016-10-10 15:08:08 +02:00
Thulinma
bbcf178e7f Fixed reboot loop when aborting startup. 2016-10-10 15:08:01 +02:00
Thulinma
2062d83858 New licensing system
By Wouter Spruit and Balder Viëtor with minor edits by me
2016-09-27 13:43:53 +02:00
Thulinma
d504324b8f Added stop_sessions API call 2016-09-22 09:52:08 +02:00
Thulinma
69bb08a10a MistInTS now shuts down after 20 seconds of no data 2016-09-22 09:51:48 +02:00