Commit Graph

39 Commits

Author SHA1 Message Date
Isaac Connor 732bb5416f Merge branch 'master' into onvif_updated 2020-05-09 16:26:29 -04:00
Jan M. Hochstein 5d3f5e5a4a WSDiscovery: workaround for SOAP::WSDL QName limitation 2016-04-16 19:06:36 +02:00
Jan M. Hochstein edf3f3c43a Fixed WS-Discovery Probe message header 2016-04-10 15:57:53 +02:00
Jon Burgess c1526b8fe5 ONVIF: Fix probe type header and add To header 2016-04-09 17:02:36 +01:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andrew Bauer 2365c2156f remove $result from onvif error message 2016-03-28 09:53:57 -05:00
Andrew Bauer 671326f686 Merge pull request #1347 from jburgess777/tenvis
ONVIF: Tenvis TH661 support
2016-03-21 12:47:13 -05:00
Jan M. Hochstein ae58da31ea Changed WSDiscovery from 1.1 to 1.0 2016-03-19 19:04:09 +01:00
Jan M. Hochstein 39053f9325 WSDiscovery version changed from 1.1 to 1.0 2016-03-19 18:36:12 +01:00
Jon Burgess 6fd718e2e6 ONVIF: Fix hash reference mixups which broke 1.1 detection
With these changes the script now detects my camera during the
1.1 scan and ignores the duplicate 1.2 response.

$ ~/zmonvif-probe.git.pl probe
http://192.168.1.246:8080/onvif/devices, 1.1, (Profile='Streaming', model='C6F0SeZ0N0P0L0', name='IPCAM', location/country='china')
2016-03-19 17:28:39 +00:00
Jon Burgess 909c23c38b ONVIF: Make GetStreamUri try both RTP_unicast and RTP-Unicast
The specification gives conflicting values for the unicast stream
type in different parts of the document:

http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri

Description has: StreamType = "RTP_unicast"

Input has: enum { 'RTP-Unicast', 'RTP-Multicast' }

The Tenvis TH661 only accepts RTP-Unicast but the original code was
using RTP_unicast. Try both and take the result of the first one
which works.
2016-03-19 14:50:44 +00:00
Jon Burgess ed7e3e47b7 Add more checking around xaddr parsing 2016-03-19 14:15:51 +00:00
Jon Burgess 16cf1b6245 Detect IP address in URLs like http://ip:port/
This if for devices like the Tenvis TH661 which responds with:

http://192.168.1.246:8080/onvif/devices
2016-03-19 13:31:33 +00:00
SteveGilvarry 5ff427d9e9 Removed Autotools Makefile.am
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
Kyle Johnson f4d51d01a9 Merge pull request #1273 from knnniggett/enableonvif
By default, enable ONVIF discovery support
2016-02-16 12:53:05 -07:00
Andy Bauer 37c7b71b03 add out-of-source build support to onvif/scripts folder 2016-02-13 15:26:31 -06:00
Jan M. Hochstein 61932a6470 Corrected file copyrights 2016-02-10 16:36:21 +01:00
Andrew Bauer 30a408d08f remove unneeded files 2015-02-21 11:38:51 -06:00
Jan M. Hochstein 2e68fa4b34 Cmdline arg 'script' for zmonvif-trigger.pl 2014-12-13 18:53:43 +01:00
Jan M. Hochstein 4a39b3215b New monitor function 'Extdect' 2014-12-05 09:29:57 +01:00
Jan M. Hochstein 9ab7358e5c Renamed zmonvif-trigger.pl 2014-11-14 17:17:09 +01:00
Jan M. Hochstein 7da7763059 zmonvif-watch.pl zoneminder integration 2014-11-14 17:17:09 +01:00
Jan M. Hochstein 99a4b0c86f Support for ONVIF Analytics and Event handling 2014-11-14 17:17:08 +01:00
Jan M. Hochstein c41148c22c Improved option handling 2014-11-14 17:17:08 +01:00
altaroca fae5e57b15 Add command line option '-v' to zmonvif-script.pl 2014-11-14 17:15:58 +01:00
Jan M. Hochstein a18399af69 Basic support for SOAP 1.1 and 1.2 2014-11-14 17:15:58 +01:00
Jan M. Hochstein 1d1cdaee03 remove temporary and generated files 2014-11-14 17:11:23 +01:00
Jan M. Hochstein 198d537bff Removed hard coded binary path and perl binary location 2014-11-14 17:11:23 +01:00
Jan M. Hochstein 4b896add26 Refactor onvif client code 2014-11-14 17:11:23 +01:00
Jan M. Hochstein b491138057 CMake support for onvif modules 2014-11-14 17:02:45 +01:00
Jan M. Hochstein fb31f7f15f Added basic ONVIF support 2014-11-14 17:00:16 +01:00
Jan M. Hochstein c49ee156ba Improved option handling 2014-09-12 11:02:08 +02:00
altaroca 56bdebc433 Add command line option '-v' to zmonvif-script.pl 2014-08-18 17:46:59 +02:00
Jan M. Hochstein 5f1fda43a0 Basic support for SOAP 1.1 and 1.2 2014-08-17 21:24:27 +02:00
Jan M. Hochstein ca5f83f691 remove temporary and generated files 2014-08-07 18:25:07 +02:00
Jan M. Hochstein 99e794a97b Removed hard coded binary path and perl binary location 2014-08-07 18:25:07 +02:00
Jan M. Hochstein 5ab629856c Refactor onvif client code 2014-08-07 18:25:07 +02:00
Jan M. Hochstein 64827dccbc CMake support for onvif modules 2014-07-15 17:41:05 +02:00
Jan M. Hochstein 0a2515c00e Added basic ONVIF support 2014-07-14 20:36:18 +02:00