Commit Graph

112 Commits

Author SHA1 Message Date
Isaac Connor 1257a7ea37 improvements reported by cppcheck 2020-11-01 16:11:19 -05:00
Peter Keresztes Schmidt 8f980a1168 Convert NULL/0 to nullptr
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
Isaac Connor ce9e2c8b27 Merge branch 'release-1.34' 2020-05-15 11:53:09 -04:00
Isaac Connor 9ea1c637f9 Remove debug Exiting message 2020-05-15 11:48:41 -04:00
Isaac Connor 6bb2c09a72 Merge branch 'release-1.34' 2020-05-15 11:41:34 -04:00
Isaac Connor 7a85be59be Remove errant closing db debug output 2020-05-15 10:22:58 -04:00
Isaac Connor d92772343a Merge branch 'release-1.34' 2020-05-14 12:02:50 -04:00
Isaac Connor 25a772c5eb reorder logic a bit to make it easier to read. Make exit_zmu not return a value. 2020-05-14 12:02:02 -04:00
Isaac Connor e274aa471a Use fputc instead of printf for separator to be a tiny bit more efficient. Report current state when forcing alarm on 2020-04-23 18:13:34 -04:00
Isaac Connor 7fcd71e684 Use fputc instead of printf for separator to be a tiny bit more efficient. Report current state when forcing alarm on 2020-03-24 15:19:16 -04:00
Isaac Connor ad61a0e385 Escape Function to fix mysql8. Fixes #2885 2020-03-16 21:06:31 -04:00
Isaac Connor f05dbd3b89 Fix zmu not respecting jwt token auth when AUTH_RELAY set to none 2020-02-25 14:40:47 -05:00
Isaac Connor 33951ae584 Print out an error when a monitor is in MONITOR mode because we can't handle alarms. Allow signals to terminate zmu by checking zm_terminate. 2019-06-19 08:36:37 -04:00
Pliable Pixels bb18c305ab add token to command line for zmu 2019-05-08 11:08:27 -04:00
Pliable Pixels b293592e4c added token validation to zms/zmu/zmuser 2019-05-08 10:55:32 -04:00
Isaac Connor f3d0c4e643 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-04-04 09:37:13 -04:00
Isaac Connor 8de7d576a5 spacing and use Error instead of fprintf(stderr) so that things get logged. 2019-04-04 09:35:37 -04:00
Isaac Connor b794c2ca20 fix crash by checking username without checking if it is NULL 2019-03-18 12:01:51 -04:00
Steve Gilvarry 924d5235d0 Validate zmu Username and Password lengths (#2484)
* Validate zmu Username and Password lengths
Ensure user provided values are not larger than allowed and error if
they are, therefore further preventing overflow.

* Check username and password functions for zmu and zms

* Check username and password functions for zmu and zms
2019-02-13 10:40:43 -05:00
Isaac Connor 8404f0ef64 When forcing an alarm, print out the event id 2018-11-26 16:21:32 -05:00
Isaac Connor 8a80cf686b Merge branch 'master' into storageareas 2018-04-26 21:58:34 -04:00
Isaac Connor 356badf21d Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-26 11:57:46 -04:00
Andy Bauer 678503b992 fix ftbs on el7 2018-04-24 12:16:19 -05:00
Isaac Connor 3ab0755e03 google code style plus other cleanups 2018-04-23 13:50:10 -04:00
Isaac Connor 235fc640be exit_zmu must come before use 2018-04-23 11:15:33 -04:00
Isaac Connor 11cacebb3b use a function called exit_zmu instead of exit() to properly close logs and db. The reason is just to reduce connection lost logs in mysql. 2018-04-23 11:14:44 -04:00
Isaac Connor fd1c69d48a switch to uint64_t for event_id because long long can actually be 128 bit 2018-04-17 13:51:20 -04:00
Isaac Connor 344539f5dc cleanup 2017-11-28 11:55:47 -05:00
Isaac Connor 64816aa005 fixes from cppcheck. 2017-11-18 16:00:10 -05:00
Isaac Connor b9f65c9f50 remove merge marker 2017-06-05 09:26:05 -04:00
Isaac Connor 451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor bc32837e3a fix braces 2017-05-31 13:55:21 -04:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 59406fd03a Merge branch 'master' into storageareas 2016-04-28 09:24:36 -04:00
Isaac Connor 24e3306955 master master 2016-04-28 09:20:56 -04:00
Isaac Connor 7d7249f328 use std::string instead of C strings. Mostly this will quiet build warnings on FreeBSD and removes the potential for buffer overflows 2016-04-26 15:48:21 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Isaac Connor 1262e831ac rework zmu to load data from the last event with frames when it can't connect to zmc 2016-03-29 14:36:16 -04:00
Isaac Connor 33a9fc6175 fix utf8 ' characters 2015-07-15 10:37:08 -04:00
Andrew Bauer 4deb0d53c8 Add pod documentation to C binaries 2015-06-20 17:11:20 -05:00
Andrew Bauer 62b75808b3 Output to stderror when zmu can't read zm.conf 2014-12-10 17:54:09 -06:00
manupap1 b4732e4750 Close logger and database on exit 2014-11-14 22:17:44 +01:00
Isaac Connor 57e5b4fee8 Fix segfault on zmu -l due to not connectig to the shared mem 2014-10-23 09:00:53 -04:00
root cca01dc357 connect to the monitor, because instantiating the object no longer does that 2014-07-30 14:20:48 -04:00
Kfir Itzhak 0bb2ee7efc More signal improvements:
1) Cleaner code
2) Fixed the path displayed in the addr2line line
3) Improved dependency checking for backtrace
4) Few more improvements
2013-10-07 02:37:50 +03:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 21:59:06 +00:00
stan 46d777398e Updated to use fixed buffer sizes rather than relying on o/s defined.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3189 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:22:35 +00:00
stan cd16c91ccd Tweaked zone image dumping.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3066 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-05-27 12:18:43 +00:00