ZoneMinder Wiki - User contributions [en]

Talk:ZoneMinder 1.24.2 Bugfixes

2010-02-23T23:01:42Z

Genanr:

''To avoid clutter, if you want to add a fix to this page, please don't copy its code directly to this page! Make a thread in User Contributions forum and add the link to this page by editing it.''

That would be fine, unfortunately forums is not a great place for patches. If a patch contains a long line, line wrapping becomes a problem. The Wiki is better (no line wrapping problems), but still not very ideal, (space/tab problems). It would be nice to have a way to upload the patch, especially for ones that are larger than 10 lines or so.

Andy (forum member "genanr")

Talk:ZoneMinder 1.24.2 Bugfixes

2010-02-23T23:01:20Z

Genanr:

To avoid clutter, if you want to add a fix to this page, please don't copy its code directly to this page! Make a thread in User Contributions forum and add the link to this page by editing it.

That would be fine, unfortunately forums is not a great place for patches. If a patch contains a long line, line wrapping becomes a problem. The Wiki is better (no line wrapping problems), but still not very ideal, (space/tab problems). It would be nice to have a way to upload the patch, especially for ones that are larger than 10 lines or so.

Andy (forum member "genanr")

Patches

2010-02-18T22:37:48Z

Genanr:

This is where patches for problems reported in ZoneMinder will be posted. This is only for patches to version 1.22.2 and above. Patches for versions prior to 1.22.2 will have been posted in the forums.

[[1.22.2 Patches]]

[[1.22.3 Patches]]

[[1.23.2 Patches]]

[[1.24.0 Patches]]

[[1.24.1 Patches]]

[[1.24.2 Patches]]

To apply any of the patches here you should do the following :-
*Open a command shell
*Download the patch and move a copy to your ZoneMinder build directory
*Change directory to your ZoneMinder build directory
*Apply the patch by typing
:patch -p0 < <patchfile>
*Check that the patch is applied correctly and you do not get any rejects
*If necessary rebuild, then reinstall

[[Third Party Patches]]

1.24.2 Patches

2010-02-18T22:37:09Z

Genanr: /* Patch to fix Incomplete frame errors in zmf.cpp */

== Fix Incomplete Image errors in zmf ==

This patch changes the socket reader in zmf from a single read, to a loop read. Incomplete reads would be reported even though the image writer wrote the whole image to the socket. The problem was when the read went to read the image frame from the socket, all the data had not yet been written to the socket by the writer, so the reader thought there was a problem. The loop reads from the socket until a full image frame is read, or there is an error.

NOTE: to patch from the top level ZM source directory type : patch -lp1 < patchname
Be sure to use the -l (ell flag, ignore whitespace), otherwise it may not patch cleanly due to tabs in the original source file.

<pre>

--- zm/src/zmf.cpp 2010-01-04 10:52:00.000000000 -0600
+++ zm-andy/src/zmf.cpp 2010-02-18 16:11:18.000000000 -0600
@@ -231,16 +231,39 @@
}
Debug( 1, "Read frame header, expecting %ld bytes of image", frame_header.image_length );
static unsigned char image_data[ZM_MAX_IMAGE_SIZE];
- n_bytes = read( sd, image_data, frame_header.image_length );
- if ( n_bytes != (ssize_t)frame_header.image_length )
+
+ // Read for pipe and loop until bytes expected have been read or an error occures
+ int bytes_read = 0;
+ do
{
- if ( n_bytes < 0 )
+ n_bytes = read( sd, image_data+bytes_read, frame_header.image_length-bytes_read );
+ if (n_bytes < 0) break; // break on error
+ if (n_bytes < frame_header.image_length)
{
- Error( "Can't read frame image data: %s", strerror(errno) );
+ // print some informational messages
+ if (bytes_read == 0)
+ {
+ Warning("Image read : Short read %d bytes of %d expected bytes",n_bytes,frame_header.image_length);
+ }
+ else if (bytes_read+n_bytes == frame_header.image_length)
+ {
+ Warning("Image read : Read rest of short read: %d bytes read total of %d bytes",n_bytes,frame_header.image_length);
+ }
+ else
+ {
+ Warning("Image read : continuing, read %d bytes (%d so far)", n_bytes, bytes_read+n_bytes);
+ }
}
- else if ( n_bytes > 0 )
+ bytes_read+= n_bytes;
+ } while (n_bytes>0 && (bytes_read < (ssize_t)frame_header.image_length) );
+
+ // Print errors if there was a problem
+ if ( n_bytes < 1 )
+ {
+ Error( "Only read %d bytes of %d\n", bytes_read, frame_header.image_length);
+ if ( n_bytes < 0 )
{
- Error( "Incomplete read of frame image data, %d bytes only", n_bytes );
+ Error( "Can't read frame image data: %s", strerror(errno) );
}
else
{
@@ -249,16 +272,18 @@
ReopenSocket( sd, monitor->Id() );
continue;
}
+
static char subpath[PATH_MAX] = "";
- if ( config.use_deep_storage )
- {
- struct tm *time = localtime( &frame_header.event_time );
- snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
- }
- else
- {
- snprintf( subpath, sizeof(subpath), "%ld", frame_header.event_id );
- }
+ if ( config.use_deep_storage )
+ {
+ struct tm *time = localtime( &frame_header.event_time );
+ snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
+ }
+ else
+ {
+ snprintf( subpath, sizeof(subpath), "%ld", frame_header.event_id );
+ }
+
static char path[PATH_MAX] = "";
snprintf( path, sizeof(path), frame_header.alarm_frame?anal_path:capt_path, subpath, frame_header.frame_id );
Debug( 1, "Got image, writing to %s", path );

</pre>

Andy ("genanr" forum member).