mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-06 13:45:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,203 Commits 94 Branches 104 Tags
33fef4223333dc19725ff2bfcc8058d46b74b2b5
Commit Graph

1007 Commits

Author SHA1 Message Date
Isaac Connor
4613fd46a4 fix a reorder warning 2015-02-05 11:03:26 -05:00
Andrew Bauer
92b3cdbadb Merge pull request #691 from ZoneMinder/rtsp_auth_fixes 
this fixes Digest Auth for the mjpeg stream on a TV-IP302PI
 2015-02-04 13:46:37 -06:00
Isaac Connor
65701f0956 add missing + 2015-02-04 14:22:53 -05:00
Isaac Connor
4c7e8592d0 fix content-type parsing when there are options on it 2015-02-04 13:53:42 -05:00
Isaac Connor
b22608fb07 this fixes Digest Auth for the mjpeg stream on a TV-IP302PI 
Digest Auth worked for the RTSP stream, but not http.
This adds quotes around the cnonce value, which matches what curl and wget do and adds the algorithm line which also matches what curl and wget do.  With these two changes the auth is accepted.
 2015-02-04 13:50:19 -05:00
Isaac Connor
1abe35c576 change Debug level of this line to something higher 2015-02-03 14:33:23 -05:00
Isaac Connor
d2865f625b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-02-02 19:06:57 -05:00
Isaac Connor
c2d429aae0 Add some comments, change log level of some debug lines. Don't die on a timeout. 2015-01-30 09:44:10 -05:00
Isaac Connor
7e685bb04a Merge pull request #675 from ZoneMinder/small_performance_improvement 
small performance improvement when streaming.
 2015-01-29 16:27:34 -05:00
Isaac Connor
da54867ea2 better log message, trivial 2015-01-29 16:21:43 -05:00
Isaac Connor
9d636ad128 fix zms crash due to buffer_copy_size never being initialized 2015-01-29 15:32:50 -05:00
Isaac Connor
321196e206 fix to reset timeout flag upon receiving something 2015-01-28 14:04:31 -05:00
Isaac Connor
b97f2fa4f6 Send an RTCP RR packet when we get a timeout to see if we are really dead. 2015-01-28 12:36:11 -05:00
Isaac Connor
56c82cfbb5 Save 1 or more calls to time(NULL) 2015-01-28 12:33:05 -05:00
Isaac Connor
facda38871 add corresponding free 2015-01-13 19:52:15 -05:00
Isaac Connor
509de3ec27 need to cast malloc, get rid of perl code, only swap_path checks if we are going to use it 2015-01-13 15:16:38 -05:00
Andrew Bauer
f1fa8a3d92 fix typo 2015-01-08 12:48:19 -06:00
Andrew Bauer
53244aff0d Don't fail if an unexpected rtp packet type is received 2015-01-07 16:01:38 -06:00
Isaac Connor
1adb147899 add version command line argument to zmstreamer. Also add -h for consistency with other programs 2015-01-06 20:59:03 -05:00
Isaac Connor
258c97f75f add version command line argument to zmf 2015-01-06 20:54:49 -05:00
Isaac Connor
85e51528a6 add version command line argument to zma 2015-01-06 20:52:18 -05:00
Isaac Connor
6f42f1c6d8 add version command line argument to zmc 2015-01-06 20:49:33 -05:00
Isaac Connor
56b1a50b2b revert 2015-01-03 14:07:18 -05:00
Isaac Connor
af570259d1 got these swapped, should be the other way around 2015-01-03 13:59:23 -05:00
Isaac Connor
14c65aefd2 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 
Conflicts:
	src/zm_comms.cpp
 2015-01-03 13:56:40 -05:00
Isaac Connor
e02da8833a ifdef's for BSD 2015-01-02 17:08:51 -05:00
Isaac Connor
92e6d940bc ifdef's for BSD and cleanup 2015-01-02 17:07:49 -05:00
Isaac Connor
1137c3907e ifdef's for BSD 2015-01-02 17:06:16 -05:00
Isaac Connor
e460c6f448 BSD uses some different includes, these are from FreeBSD ports 2015-01-01 17:18:12 -05:00
Andrew Bauer
62b75808b3 Output to stderror when zmu can't read zm.conf 2014-12-10 17:54:09 -06:00
Isaac Connor
48f4d7eb93 Merge branch 'master' into BSD_device 2014-12-08 16:53:39 -05:00
Andrew Bauer
97ee989a94 Parse multiple streams in RTP-Info 2014-12-02 19:33:05 -06:00
Andrew Bauer
a6a779978a move seq and rtpTime declarations outside conditional 2014-12-01 17:21:49 -06:00
Andrew Bauer
0099b54248 Make lack of RTP-Info non-fatal 2014-12-01 17:15:08 -06:00
Andrew Bauer
4a248cc3aa add rtsp mediatype of application 2014-12-01 17:05:10 -06:00
Andrew Bauer
32e818e860 Check for RTSP timeout in PLAY command response 2014-12-01 16:58:42 -06:00
Isaac Connor
02cdc37e3c Merge pull request #607 from manupap1/memory_fix_leaks 
Fix some memory leaks in zma
 2014-11-29 10:18:17 -05:00
Isaac Connor
51aa4e67ea Merge pull request #608 from knnniggett/RTSP_mUrl 
echo the URL to the RTSP device during the OPTIONS directive
 2014-11-29 10:14:26 -05:00
Andrew Bauer
e4fa475d87 Merge pull request #588 from ZoneMinder/digest_auth 
Digest auth
 2014-11-29 08:32:08 -06:00
Andrew Bauer
1cff253dde echo the URL to the RTSP device during the OPTIONS directive 2014-11-29 08:13:06 -06:00
Emmanuel Papin
346015f472 Fix some indentations in zm_monitor.h 2014-11-29 14:39:57 +01:00
Emmanuel Papin
c313e2e389 Fix a memory leak in Monitor::Analyse() 2014-11-29 06:06:10 +01:00
Emmanuel Papin
73b25a1de0 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_mismatches 2014-11-29 03:39:05 +01:00
Emmanuel Papin
41edb4d958 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_leaks 2014-11-29 03:38:45 +01:00
Isaac Connor
e6d47781d3 add Digest Authentication handling for simple http method. 2014-11-28 15:56:58 -05:00
Isaac Connor
87c741b165 Merge pull request #574 from manupap1/rtsp_fix 
Fix memory leaks with rtsp and a bug
 2014-11-26 15:13:39 -05:00
Isaac Connor
51703f5c37 Merge pull request #575 from manupap1/memory_fix 
Close logger and database on exit
 2014-11-26 15:08:21 -05:00
Isaac Connor
00287ab5dd more debug output when buffer is undersized. 2014-11-25 14:51:20 -05:00
Isaac Connor
9eda71570a merge the rest of my Digest-AUth fixes: This should solve #399 2014-11-20 10:44:31 -05:00
Isaac Connor
0b5a0df7dc implement http_Digest Auth, and improve it for rtsp 
Conflicts:
	src/zm_remote_camera_http.cpp
	src/zm_rtsp.cpp
 2014-11-20 10:33:58 -05:00