Commit Graph

21093 Commits (d9babda8adb2e2f28c2bac0b1fc4959c5bc6dd4a)

Author SHA1 Message Date
Doug Nazar 9c40e2bb86 CI: Remove CI workflow for Debian Stretch
Debian Stretch has finished LTS and is too old for current code base.
2022-07-22 10:36:16 -04:00
Doug Nazar 447fd3efd0 CI/Cirrus: Update to FreeBSD 12.3 2022-07-22 10:20:10 -04:00
parvit (Vittorio Parrella) e4a8017b6b
added configuring of authentication for rstp cameras 2022-07-22 07:08:22 -04:00
Isaac Connor 95530a4f7d
Merge pull request #3529 from dougnazar/fix_printf_formats
Fix printf formats & enable large file support for 32-bit
2022-07-20 11:44:26 -07:00
ovargasp 981769b9db
Allows users to set an specific "Onvif alarm text" for each monitor (#3535)
* Allows users to set an specific "Onvif alarm text" for each monitor

With this personalization the cameras that use strings different to "MotionAlarm"
such as Dahua, will be able to process their Onvif alarms. To make it easier, the change
sets a default "Alarm Text"  value for it to work out of the box and then allows to
modify it according to the particular necessities of each brand. It consists of
a new column on table Monitors, changes on Monitors.h, Monitors.cpp and a change
on UI to manage the value of Alarm Text per camera.

Updated es_la.php language file.

Co-authored-by: ovargasp <ovargasp@hoitmail.com>
2022-07-20 12:51:13 -05:00
Isaac Connor 2c32d09759
Merge pull request #3530 from dougnazar/disable_systemd
Add option to disable auto detection of systemd.
2022-07-16 09:24:54 -07:00
Isaac Connor 84ac9f592f
Merge pull request #3531 from dougnazar/fix_freebsd
Fix compile FreeBSD 13.0
2022-07-16 09:24:22 -07:00
Doug Nazar 5b44ee729d Fix sendfile calling convention taking into account possible null offset parameter. 2022-07-16 10:05:46 +00:00
Doug Nazar df414fc028 Need to cast duration to system_clock resolution. 2022-07-16 10:03:54 +00:00
Doug Nazar 3c5e44dfe5 Need unistd.h for getpid(). 2022-07-16 10:03:16 +00:00
Doug Nazar 0db4a18ff6 Switch to unsigned int for loop to restrict size of printf.
GCC 12 incorrectly detects a format truncation.

src/zm_logger.cpp:86:39: warning: ‘%d’ directive output may be truncated writing between 1 and 11 bytes into a region of size 2 [-Wformat-truncation=]
   86 |       snprintf(code, sizeof(code), "DB%d", i);
      |                                       ^~
src/zm_logger.cpp:86:36: note: directive argument in the range [-2147483647, 9]
   86 |       snprintf(code, sizeof(code), "DB%d", i);
      |                                    ^~~~~~
2022-07-16 03:21:25 -04:00
Doug Nazar ca1cca2ff4 Add _FILE_OFFSET_BITS=64 define to enable large file support on 32-bit. 2022-07-16 03:20:20 -04:00
Doug Nazar 3b21153757 Fix various printf formats for 32bit, 32bit w/_FILE_OFFSET_BITS=64 and 64-bit 2022-07-16 03:18:18 -04:00
Doug Nazar 02a79f79f0 Add option to disable auto detection of systemd. 2022-07-16 03:12:27 -04:00
Isaac Connor 2d335f6e12 Don't reload img steam on auth hash change. Just update the global variable. 2022-07-15 06:47:45 -04:00
Isaac Connor 227b9d0919
Merge pull request #3527 from ovargasp/master
es_la V3
2022-07-14 17:51:22 -04:00
Isaac Connor dd1ee09994 Set C++ standard to 17 2022-07-14 17:48:12 -04:00
ovargasp 00a005e990
Merge pull request #1 from ovargasp/ovargasp-patch-1-(Lang-File-with-OLANG-format)
Version 3 of es_la with OLANG format for prompts
2022-07-14 15:37:00 -06:00
Isaac Connor d8b3be0cc9 delete booleval 2022-07-14 17:33:54 -04:00
Isaac Connor 53931037ed remove booleval 2022-07-14 17:28:15 -04:00
Isaac Connor 1798d95b8b Have working monitorlink expressions 2022-07-14 17:25:51 -04:00
Isaac Connor e4bd2d351a Merge branch 'master' into monitorlink_expressions 2022-07-14 14:42:56 -04:00
Isaac Connor 54a0f5d8df Fixup verifyToken to use refs for strings 2022-07-14 13:53:23 -04:00
Isaac Connor 4caffe4674 Include iostream since we use it 2022-07-14 13:42:54 -04:00
Isaac Connor 3d541eee99 Remove comments about locale 2022-07-14 13:19:39 -04:00
Isaac Connor e84a1477ff put back ?> 2022-07-14 13:19:10 -04:00
Isaac Connor 9ad7ce3823 Remove remaining locale stuff from language files 2022-07-14 13:16:49 -04:00
Isaac Connor 576448e906 Fix memleak when not doing passthrough 2022-07-14 13:10:43 -04:00
Isaac Connor d0ca677207 Fix %u instead of %d for id which is unsigned. Pass string instead of c_str 2022-07-14 12:07:26 -04:00
Isaac Connor 9db65f5c5f Remove unneeded = assignments 2022-07-14 12:03:49 -04:00
Isaac Connor 66f5b9b93d Remove zm_rtsp_server_thread as it isn't used anymore 2022-07-14 12:01:10 -04:00
Isaac Connor fbe70df1b6 use const and just pass string 2022-07-14 11:57:35 -04:00
Isaac Connor 129e712692 Remove redundant assignment 2022-07-14 11:53:05 -04:00
Isaac Connor 61fcd60a40 initialize all members and make lostInterval an int since we can get negative numbers when doing subtraction 2022-07-14 10:58:42 -04:00
Isaac Connor fd566b2212 Pass std::strings by ref 2022-07-14 10:53:47 -04:00
Isaac Connor b29e61b30e Don't need to check for mAuthenticator, can just delete it 2022-07-14 10:52:14 -04:00
Isaac Connor eb8646f1de Pass std::strings by ref 2022-07-14 10:51:49 -04:00
Isaac Connor 90e27e9d3a Just pass the std::string not c_str() 2022-07-14 10:51:39 -04:00
Isaac Connor 774adcf7cc Use nullptr instead of 0 when initialising hp 2022-07-14 10:44:00 -04:00
Isaac Connor 64a9120ea7 packet_counts is always true here 2022-07-14 10:42:01 -04:00
Isaac Connor 4f2dc894d5 get rid of got_packet to quiet cppcheck 2022-07-14 10:35:22 -04:00
Isaac Connor 4ab8166665 Init Janus_Healthy although it is never used 2022-07-14 10:29:10 -04:00
Isaac Connor 0cd315c6a4 reduce scope of CurlMsg m 2022-07-14 10:26:55 -04:00
Isaac Connor 43649e1e36 Don't need to test for event 2022-07-14 10:25:19 -04:00
Isaac Connor b4c832c789 Code style, initialize Amcrest_Alarmed to false in constructor 2022-07-14 10:25:05 -04:00
Isaac Connor e589171138 mFormatContext is already in Camera 2022-07-14 10:18:53 -04:00
Isaac Connor f96e5e526d MOptArgV points into opVect so it needs to stick around. 2022-07-14 10:14:29 -04:00
Isaac Connor e6de9c3e01 A polygon must have 3 vertices at minimum 2022-07-14 10:06:26 -04:00
Isaac Connor 4805064d61 Remove always false condition 2022-07-14 10:02:58 -04:00
Isaac Connor 173cc8af21 Make AmcrestAPI and JanusManager explicit to satisfy cppcheck 2022-07-14 10:00:23 -04:00