Commit Graph

59 Commits

Author SHA1 Message Date
Isaac Connor 96b5af9021 Merge branch 'fix_onvif' into storageareas 2016-10-04 15:00:28 -04:00
Isaac Connor 7561dc00ea be explici about which unnamed array we are access for getopts. Default username and password to '' 2016-10-04 14:33:13 -04:00
Isaac Connor e7eab488c9 password is not required, set it to '' to quiet warnings 2016-10-04 14:28:30 -04:00
Isaac Connor 84a18926d8 password is not required, set it to '' to quiet warnings 2016-10-04 14:28:03 -04:00
Isaac Connor df255d3d5d check for existence of attribute before calling it to break gently 2016-10-04 14:07:11 -04:00
Isaac Connor 866b6fea8c Fall back to getCapabilities if getServices is not supported. 2016-10-04 14:06:23 -04:00
Isaac Connor c1f9c0aff5 also need ProbeMatchesType to inherit get_ProbeMatch 2016-10-04 10:16:01 -04:00
Isaac Connor b742d316b3 apply use strict and fix issues 2016-10-04 10:15:16 -04:00
Isaac Connor e6626cef69 if soap version is specified for probe, don't do both versions 2016-10-04 09:51:20 -04:00
Isaac Connor de22f21813 for soap 1.2 only probe for NetworkVideoTransmitter 2016-10-04 09:36:28 -04:00
Isaac Connor 92d32596cc revert 2016-10-03 21:59:49 -04:00
Isaac Connor 68936b9af9 code style, replace with ' 2016-10-03 21:58:57 -04:00
Dmitry Smirnov f1acc52913 spellcheck/codespell 2016-07-14 00:30:39 +10:00
Andrew Bauer c0b357ec59 Merge pull request #1539 from knnniggett/onvifProbeType
zmonvif-probe - fixes syntax error reported on some (older) Perls
2016-06-18 11:59:05 -05:00
Jan M. Hochstein 2157f22669 Set ->message to prevent undef error 2016-06-18 15:46:05 +02:00
Andrew Bauer 0fd42abd87 fixes syntax error reported on some (older) Perls 2016-06-17 14:12:14 -05:00
Jan M. Hochstein 5d3f5e5a4a WSDiscovery: workaround for SOAP::WSDL QName limitation 2016-04-16 19:06:36 +02:00
Jan M. Hochstein 8b92151a0c WS-Discovery header fixes 2016-04-10 18:19:10 +02:00
Jan M. Hochstein edf3f3c43a Fixed WS-Discovery Probe message header 2016-04-10 15:57:53 +02:00
Jan M. Hochstein 2125faa444 Added header elements to perl WS-Discovery proxy 2016-04-10 09:37:21 +02:00
Jan M. Hochstein 1558353672 Force UTF-8 when sending WS-Discovery Probe 2016-04-10 09:37:21 +02:00
Jon Burgess c1526b8fe5 ONVIF: Fix probe type header and add To header 2016-04-09 17:02:36 +01:00
Jan M. Hochstein a6500bc61e Added XML header in serializer 2016-04-09 16:53:41 +02: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 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
Jan M. Hochstein 2c0c014535 Added Proxies for WSNotification and ONVIF-Analytics 2016-03-13 10:16:20 +01:00
Andrew Bauer facae6cb0d use make "-f" parameter instead of "--makefile" 2016-03-10 13:58:41 -06:00
Isaac Connor 7d346747d6 use Digest::SHA instead of Digest::SHA1. API appears to be the same 2016-03-02 10:18:58 -05: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
Jan M. Hochstein ee48c830d0 Added README and removed WSDL files in onvif folder 2016-02-10 16:25:23 +01:00
Jan M. Hochstein 2b9693748b Added README and removed WSDL files in onvif folder 2016-02-10 16:22:34 +01:00
Andrew Bauer 0cf82a0b71 Allow user to override perl installation. Replace old perl cmake vars with new. 2015-04-10 12:09:01 -05:00
Andrew Bauer e6631ebaf1 Propagate new perl changes to the ONVIF perl modules 2015-04-09 20:11:32 -05:00
Emmanuel Papin c68a325e8e Untrack files modified at compile time 2015-03-14 23:09:36 +01:00
Andrew Bauer 30a408d08f remove unneeded files 2015-02-21 11:38:51 -06: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 c424f5bf45 Events API 2014-08-08 18:56:19 +02:00
Jan M. Hochstein 57498207b2 Analytics API 2014-08-08 18:56:19 +02:00
Jan M. Hochstein e83bdbbef3 Removed references to events 2014-08-08 18:56:18 +02:00