Commit Graph

83 Commits

Author SHA1 Message Date
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
stan 18f196dbcd Added srand initialisation.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2848 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 20:18:57 +00:00
stan afe253b71a Added V4L2 query
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2827 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 12:57:34 +00:00
stan e6041e24a7 Uppdated copyright headers
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2611 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:33:23 +00:00
stan ee44d4b274 Updated debug format
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2513 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:43:47 +00:00
stan 7825b97cfa Cosmetic - corrected typo
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2306 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 22:44:37 +00:00
stan 9d291c0ba1 Bug 431 - Removed default args for monitor constructors and now can stream events without active monitor.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2274 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-29 18:50:53 +00:00
stan 98c3243969 Added reload option char to allowed set.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2167 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-29 17:33:06 +00:00
stan a0b3e2a5a3 Bug 308 - Added improved signal handling and backtracing.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1916 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-05 12:22:27 +00:00
stan b9940650da Bug 296 - Removed extra delete monitor
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1892 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-24 12:02:23 +00:00
stan b420c2ebd2 Bug 266 - Fixed crash, added support for displaying fle cameras and polygons.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1850 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-21 18:02:46 +00:00
stan 235dde1a80 Updated copyright statement.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1829 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 10:56:30 +00:00
stan a998599df0 Bug 251 - Fixed problem when authentication relay set to 'none'
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1801 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 13:37:11 +00:00
stan c2beb56c12 Added ZMU_ prefix to enums to avoid clashes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1760 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-03 09:59:32 +00:00
stan 05c2fb5dfd Bug 238 - Changes to do with the various enabled/disable/suspend/trigger modes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1720 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-22 16:46:25 +00:00
stan 1dd59e435a Fixed broken optional parameter to -z
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1639 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-01 16:33:51 +00:00
stan 65f7cf09b5 Bug 216 - Zone polygons
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1630 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-29 17:51:06 +00:00
stan 6e7daa90c5 Bug 202 - Added status summary --list function.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1602 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-20 12:17:45 +00:00
stan e02b7311d4 Removed check on auth methods temporarily to allow any use from command line.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1571 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-07 12:09:56 +00:00
stan 46585d9cc2 Bug 148 - Allows remote http authentication.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1531 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-20 15:42:41 +00:00
stan 74e4bd5737 Bug 73 - Made video devices use paths rather than numbers
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1519 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-17 10:58:25 +00:00
stan f089f28bd4 Added simplified direct config interface.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1406 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-05-16 09:27:06 +00:00
stan 264c23d687 Updated copyright statement
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1360 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-02-24 14:40:14 +00:00
stan 3649417b27 Merged in PTZ control feature.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1355 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-02-24 10:43:29 +00:00
stan e56123b8c0 Totally revamped authentication for zms and zmu
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1226 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-01-19 01:50:24 +00:00
stan dc3b3691a0 Revamped debug initialisation and config loading.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1208 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-01-15 17:45:51 +00:00
stan 1c5fee19d9 Merged in generic triggering.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1172 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-12-28 17:41:55 +00:00
stan 2ba1ee4eb8 Removed secondary DB user.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1171 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-12-28 17:01:25 +00:00
stan 72da78e98a Added zm.conf feature.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1170 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-12-28 16:46:48 +00:00
stan b508b2a5ce Changed strcpy to strncpy, sprintf to snprintf and query parameter checks to avoid vulnerabilities.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1017 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-04-19 16:02:17 +00:00