Isaac Connor
8799a33716
Merge pull request #3211 from Carbenium/zm-comms-cleanup
...
comms: Fix Woverloaded-virtual warnings
2021-04-10 21:24:27 -04:00
Peter Keresztes Schmidt
369fb68bb4
tests/comms: Disable tests which bind TCP sockets on CI runs
...
Those tests timeout on Cirrus. Disable them for now.
This introduces a new tag [notCI] with which tests can be marked which shouldn't be run during CI.
2021-04-11 02:46:56 +02:00
Peter Keresztes Schmidt
0ab6b04fa1
build: Enable Woverloaded-virtual on GCC
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
0c3244d011
comms/Socket: Mark methods which are not meant to be overridden as non-virtual
...
This fixes the remaining Woverloaded-virtual warnings.
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
eacd9d4d36
comms: Add override specifier where necessary
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
f84d23817e
tests/comms: Add tests for TcpInetClient/Server
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
3d2614b429
comms: Quick-fix a crash in ZM::Socket::Accept
...
mLocalAddr is always nullptr and not used anywhere. So just use a local variable for
the time being.
The comms types will need an API rework since the current one is rather convoluted.
Postpone fixing this properly until then.
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
25e6b70381
tests/comms: Add tests for ZM::UdpUnixSocket
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
17485f3547
tests/comms: Add tests for ZM::UdpInetSocket
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
45986c8ee2
tests/comms: Add some tests for SockAddrInet/Unix
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
5aa508bc74
tests/comms: Add read/write tests for ZM::Pipe
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
a06d374292
tests/comms: Add some basic tests for ZM::Pipe
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
d7224261f7
comms: Implement ZM::Pipe::isClosed so we have a non-abstract class
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
3b705c15fe
build: Store all generated sources in CMAKE_BINARY_DIR
...
config.h is already generated there so move zm_config_data.h and zm_config_define.h
there as well. Also limit the scope of CMAKE_BINARY_DIR as include directory to the zm target.
All in all this makes zm_config_data and zm_config_define available when building the tests target.
2021-04-11 01:28:23 +02:00
Peter Keresztes Schmidt
7dee86b104
comms: auto-format
2021-04-11 00:23:17 +02:00
Peter Keresztes Schmidt
3011fc3e18
utils: update packpack to current RtspServer commit
2021-04-11 00:22:38 +02:00
Peter Keresztes Schmidt
7c77ac23ba
Merge pull request #3210 from Carbenium/avframe-vector
...
FifoSource: Adapt to changed xop::AVFrame API
2021-04-11 00:19:38 +02:00
Isaac Connor
64ab6dff95
fix missing )
2021-04-10 18:16:59 -04:00
Isaac Connor
cf721ae875
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2021-04-10 18:16:17 -04:00
Peter Keresztes Schmidt
f8fc768486
FifoSource: Adapt to changed xop::AVFrame API
2021-04-11 00:08:26 +02:00
Isaac Connor
23de612faf
update RtspServer
2021-04-10 15:44:44 -04:00
Isaac Connor
4ead6886a3
Make shm debug level 3
2021-04-10 15:40:37 -04:00
Isaac Connor
da630f7534
Move shm Memory debug statements to level 2.
2021-04-10 15:35:24 -04:00
Isaac Connor
60970673c7
Implement debug levels in perl side. DEBUG==DEBUG1.
2021-04-10 15:35:04 -04:00
Isaac Connor
3f05cfadb0
update to Rtsp update
2021-04-10 12:21:26 -04:00
Isaac Connor
6319ea887c
Need to install generate update script
2021-04-09 21:55:07 -04:00
Isaac Connor
1ccc416224
Merge branch 'release-1.34'
2021-04-09 20:00:47 -04:00
Isaac Connor
35b3d236e0
Fix typo in triggers
2021-04-09 19:47:08 -04:00
Isaac Connor
1ccb8d7aef
Include Event Summaries when loading Monitors
2021-04-09 19:46:57 -04:00
Isaac Connor
3dcb71933e
Add event summary fields to Monitor Object
2021-04-09 19:46:25 -04:00
Isaac Connor
6f28c16915
Uwse the db queue for event updates
2021-04-09 19:45:55 -04:00
Isaac Connor
08d9ca453a
Bump version to 1.35.24
2021-04-09 19:45:23 -04:00
Isaac Connor
2b1e0df6be
FIx auth= not getting updated
2021-04-09 18:46:41 -04:00
Isaac Connor
492a352bed
Use updated auth_hash when sending alarm requests
2021-04-09 18:33:32 -04:00
Isaac Connor
d9dc61265d
Fix DisableAlarms. Use signal when capture fails instead of erroneously using TRIGGER_OFF. Add status to DumpSettings so that we can query it with zmu.
2021-04-09 17:46:11 -04:00
Isaac Connor
4e5ef01156
Fixup event summary column population, update triggers
2021-04-09 16:46:36 -04:00
Isaac Connor
3bdd3c0d12
Move event summaries to their own table to reduce contention on Monitor_Status
2021-04-09 10:16:35 -04:00
Isaac Connor
c5ca123042
Move event summaries to their own table to reduce contention on Monitor_Status
2021-04-09 10:16:16 -04:00
Isaac Connor
2e22cd5c3b
Mark snapshot events as Archived
2021-04-08 15:20:44 -04:00
Isaac Connor
4bd490d121
Set signal=true if capture succeeds.
2021-04-08 11:37:27 -04:00
Andrew Bauer
23bd9d7dc1
update RTSPServer commit hash for packpack
2021-04-08 09:05:01 -05:00
Isaac Connor
2d7479cb59
reintroduce Start() methods to analysis and decoding thread
2021-04-07 20:36:38 -04:00
Isaac Connor
30dfadcbf1
Add some parenthesis and use logic and/or install of binary
2021-04-07 14:15:55 -04:00
Isaac Connor
a63186444b
Replace char arrays with std::strings in monitor class.
2021-04-07 14:15:55 -04:00
Andrew Bauer
5684413eaa
packpack - download and unpack rtspserver tarball correctly
2021-04-07 13:10:53 -05:00
Andrew Bauer
663c7f51f5
don't set -Wconditionally-supported on older gcc
2021-04-07 10:01:46 -05:00
Andrew Bauer
3be21d0457
add rpm support for RtspServer submodule
2021-04-07 09:23:36 -05:00
Isaac Connor
99c28d1f9f
Change log level to debug when warning about ZM_OPT_AUTH being turned off. Fixes #3207
2021-04-07 09:47:48 -04:00
Isaac Connor
cb7e365e35
Add locking increment_it. I think we need it.
2021-04-06 13:55:09 -04:00
Isaac Connor
ffd6928292
Merge pull request #3208 from Carbenium/analysis-thread-cleanup
...
Analysis and decoder thread to auto ptr
2021-04-06 09:38:35 -04:00